Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e9b8f2e4
Commit
e9b8f2e4
authored
Jun 12, 2019
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify spec based on review comments
parent
4c5880b6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
24 deletions
+22
-24
ee/spec/controllers/projects/branches_controller_spec.rb
ee/spec/controllers/projects/branches_controller_spec.rb
+22
-24
No files found.
ee/spec/controllers/projects/branches_controller_spec.rb
View file @
e9b8f2e4
...
...
@@ -3,12 +3,10 @@
require
'spec_helper'
describe
Projects
::
BranchesController
do
l
et
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:user
)
{
create
(
:user
)
}
s
et
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:user
)
{
project
.
owner
}
before
do
project
.
add_maintainer
(
user
)
allow
(
project
).
to
receive
(
:branches
).
and_return
([
'master'
])
controller
.
instance_variable_set
(
:@project
,
project
)
...
...
@@ -16,26 +14,26 @@ describe Projects::BranchesController do
end
describe
'GET #index'
do
let
(
:import_state
)
{
create
(
:import_state
,
next_execution_timestamp:
Time
.
now
,
last_update_at:
Time
.
now
,
last_successful_update_at:
Time
.
now
)
}
render_views
before
do
project
.
update!
(
mirror:
true
,
import_state:
import_state
,
import_url:
'https://import.url'
,
mirror_user:
user
)
allow
(
project
.
repository
).
to
receive
(
:diverged_from_upstream?
)
{
true
}
end
it
'renders the diverged from upstream partial'
do
get
:index
,
format: :html
,
params:
{
namespace_id:
project
.
namespace
,
project_id:
project
,
state:
'all'
}
expect
(
controller
).
to
render_template
(
'projects/branches/_diverged_from_upstream'
)
e
xpect
(
response
.
body
).
to
match
(
/diverged from upstream/
)
context
'for mirrored projects with diverged branch'
do
render_views
before
do
create
(
:import_state
,
:mirror
,
:finished
,
project:
project
,
last_successful_update_at:
Time
.
now
)
allow
(
project
.
repository
).
to
receive
(
:diverged_from_upstream?
)
{
true
}
end
it
'renders the diverged from upstream partial'
do
get
:index
,
format: :html
,
params:
{
namespace_id:
project
.
namespace
,
project_id:
project
,
state:
'all'
}
expect
(
controller
).
to
render_template
(
'projects/branches/_diverged_from_upstream'
)
expect
(
response
.
body
).
to
match
(
/diverged from upstream/
)
e
nd
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment