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
3e5aab5d
Commit
3e5aab5d
authored
Dec 19, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update spec for consistent approver number required.
parent
4381eab6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
spec/features/merge_requests/approvals_spec.rb
spec/features/merge_requests/approvals_spec.rb
+4
-4
No files found.
spec/features/merge_requests/approvals_spec.rb
View file @
3e5aab5d
...
@@ -75,7 +75,7 @@ feature 'Merge request approvals', js: true, feature: true do
...
@@ -75,7 +75,7 @@ feature 'Merge request approvals', js: true, feature: true do
find
(
'.select2-results'
).
click
find
(
'.select2-results'
).
click
click_on
(
"Submit merge request"
)
click_on
(
"Submit merge request"
)
expect
(
page
).
to
have_content
(
"Requires
one
more approval (from
#{
other_user
.
name
}
)"
)
expect
(
page
).
to
have_content
(
"Requires
1
more approval (from
#{
other_user
.
name
}
)"
)
end
end
it
'allows delete approvers group when it is set in project'
do
it
'allows delete approvers group when it is set in project'
do
...
@@ -94,7 +94,7 @@ feature 'Merge request approvals', js: true, feature: true do
...
@@ -94,7 +94,7 @@ feature 'Merge request approvals', js: true, feature: true do
expect
(
page
).
to
have_css
(
'.approver-list li'
,
count:
1
)
expect
(
page
).
to
have_css
(
'.approver-list li'
,
count:
1
)
click_on
(
"Submit merge request"
)
click_on
(
"Submit merge request"
)
expect
(
page
).
not_to
have_content
(
"Requires
one
more approval (from
#{
other_user
.
name
}
)"
)
expect
(
page
).
not_to
have_content
(
"Requires
1
more approval (from
#{
other_user
.
name
}
)"
)
end
end
end
end
...
@@ -123,7 +123,7 @@ feature 'Merge request approvals', js: true, feature: true do
...
@@ -123,7 +123,7 @@ feature 'Merge request approvals', js: true, feature: true do
find
(
'.select2-results'
).
click
find
(
'.select2-results'
).
click
click_on
(
"Save changes"
)
click_on
(
"Save changes"
)
expect
(
page
).
to
have_content
(
"Requires
one
more approval"
)
expect
(
page
).
to
have_content
(
"Requires
1
more approval"
)
end
end
it
'allows delete approvers group when it`s set in project'
do
it
'allows delete approvers group when it`s set in project'
do
...
@@ -142,7 +142,7 @@ feature 'Merge request approvals', js: true, feature: true do
...
@@ -142,7 +142,7 @@ feature 'Merge request approvals', js: true, feature: true do
expect
(
page
).
to
have_css
(
'.approver-list li'
,
count:
1
)
expect
(
page
).
to
have_css
(
'.approver-list li'
,
count:
1
)
click_on
(
"Save changes"
)
click_on
(
"Save changes"
)
expect
(
page
).
to
have_content
(
"Requires
one
more approval (from
#{
approver
.
name
}
)"
)
expect
(
page
).
to
have_content
(
"Requires
1
more approval (from
#{
approver
.
name
}
)"
)
end
end
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