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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
357ad44a
Commit
357ad44a
authored
Jul 18, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed Rubocop errors
parent
feeb4893
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
55 additions
and
30 deletions
+55
-30
spec/features/merge_requests/form_spec.rb
spec/features/merge_requests/form_spec.rb
+55
-30
No files found.
spec/features/merge_requests/form_spec.rb
View file @
357ad44a
...
...
@@ -19,7 +19,7 @@ describe 'New/edit merge request', feature: true, js: true do
target_project:
project
,
source_branch:
'fix'
,
target_branch:
'master'
)
)
login_as
(
user
)
...
...
@@ -27,7 +27,36 @@ describe 'New/edit merge request', feature: true, js: true do
end
it
'should update merge request'
do
update_merge_request
click_button
'Assignee'
click_link
user
.
name
page
.
find
'.js-assignee-search'
do
expect
(
page
).
to
have_content
user
.
name
end
click_button
'Milestone'
click_link
milestone
.
title
page
.
find
'.js-milestone-select'
do
expect
(
page
).
to
have_content
milestone
.
title
end
click_button
'Labels'
click_link
label
.
title
click_link
label2
.
title
page
.
find
'.js-label-select'
do
expect
(
page
).
to
have_content
label2
.
title
end
click_button
'Save changes'
page
.
find
'.issuable-sidebar'
do
expect
(
page
).
to
have_content
user
.
name
expect
(
page
).
to
have_content
milestone
.
title
expect
(
page
).
to
have_content
label
.
title
expect
(
page
).
to
have_content
label2
.
title
end
end
end
...
...
@@ -40,7 +69,7 @@ describe 'New/edit merge request', feature: true, js: true do
target_project:
project
,
source_branch:
'fix'
,
target_branch:
'master'
)
)
login_as
(
user
)
...
...
@@ -48,40 +77,36 @@ describe 'New/edit merge request', feature: true, js: true do
end
it
'should update merge request'
do
update_merge_request
end
end
def
update_merge_request
click_button
'Assignee'
click_link
user
.
name
click_button
'Assignee'
click_link
user
.
name
page
.
find
'.js-assignee-search'
do
expect
(
page
).
to
have_content
user
.
name
end
page
.
find
'.js-assignee-search'
do
expect
(
page
).
to
have_content
user
.
name
end
click_button
'Milestone'
click_link
milestone
.
title
click_button
'Milestone'
click_link
milestone
.
title
page
.
find
'.js-milestone-select'
do
expect
(
page
).
to
have_content
milestone
.
title
end
page
.
find
'.js-milestone-select'
do
expect
(
page
).
to
have_content
milestone
.
title
end
click_button
'Labels'
click_link
label
.
title
click_link
label2
.
title
click_button
'Labels'
click_link
label
.
title
click_link
label2
.
title
page
.
find
'.js-label-select'
do
expect
(
page
).
to
have_content
label2
.
title
end
page
.
find
'.js-label-select'
do
expect
(
page
).
to
have_content
label2
.
title
end
click_button
'Save changes'
click_button
'Save changes'
page
.
find
'.issuable-sidebar'
do
expect
(
page
).
to
have_content
user
.
name
expect
(
page
).
to
have_content
milestone
.
title
expect
(
page
).
to
have_content
label
.
title
expect
(
page
).
to
have_content
label2
.
title
page
.
find
'.issuable-sidebar'
do
expect
(
page
).
to
have_content
user
.
name
expect
(
page
).
to
have_content
milestone
.
title
expect
(
page
).
to
have_content
label
.
title
expect
(
page
).
to
have_content
label2
.
title
end
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