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
1301572a
Commit
1301572a
authored
Aug 13, 2016
by
Ruben Davila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken 'Edit Merge Request' spec.
parent
6cb2559a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
spec/features/merge_requests/edit_mr_spec.rb
spec/features/merge_requests/edit_mr_spec.rb
+8
-8
No files found.
spec/features/merge_requests/edit_mr_spec.rb
View file @
1301572a
...
...
@@ -9,13 +9,9 @@ feature 'Edit Merge Request', feature: true do
before
do
project
.
team
<<
[
user
,
:master
]
login_as
user
visit
edit_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
visit_edit_mr_page
end
end
context
'editing a MR'
do
it
'has class js-quick-submit in form'
do
expect
(
page
).
to
have_selector
(
'.js-quick-submit'
)
end
...
...
@@ -26,9 +22,7 @@ feature 'Edit Merge Request', feature: true do
project
.
team
<<
[
user
,
:master
]
project
.
update_attributes
(
approvals_before_merge:
2
)
login_as
user
visit
edit_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
visit_edit_mr_page
end
it
'shows the saved MR'
do
...
...
@@ -37,4 +31,10 @@ feature 'Edit Merge Request', feature: true do
expect
(
page
).
to
have_link
(
'Close merge request'
)
end
end
def
visit_edit_mr_page
login_as
user
visit
edit_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
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