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
10dfa993
Commit
10dfa993
authored
Oct 05, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix protected_branch spec describe block
parent
2e76b8a9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
18 deletions
+17
-18
spec/features/protected_branches_spec.rb
spec/features/protected_branches_spec.rb
+17
-18
No files found.
spec/features/protected_branches_spec.rb
View file @
10dfa993
...
@@ -60,6 +60,23 @@ feature 'Protected Branches', :js do
...
@@ -60,6 +60,23 @@ feature 'Protected Branches', :js do
expect
(
page
).
to
have_content
(
'No branches to show'
)
expect
(
page
).
to
have_content
(
'No branches to show'
)
end
end
end
end
describe
"Saved defaults"
do
it
"keeps the allowed to merge and push dropdowns defaults based on the previous selection"
do
visit
project_protected_branches_path
(
project
)
find
(
".js-allowed-to-merge"
).
trigger
(
'click'
)
click_link
'No one'
find
(
".js-allowed-to-push"
).
trigger
(
'click'
)
click_link
'Developers + Masters'
visit
project_protected_branches_path
(
project
)
page
.
within
(
".js-allowed-to-merge"
)
do
expect
(
page
.
find
(
".dropdown-toggle-text"
)).
to
have_content
(
"No one"
)
end
page
.
within
(
".js-allowed-to-push"
)
do
expect
(
page
.
find
(
".dropdown-toggle-text"
)).
to
have_content
(
"Developers + Masters"
)
end
end
end
end
end
context
'logged in as admin'
do
context
'logged in as admin'
do
...
@@ -150,22 +167,4 @@ feature 'Protected Branches', :js do
...
@@ -150,22 +167,4 @@ feature 'Protected Branches', :js do
find
(
".dropdown-input-field"
).
set
(
branch_name
)
find
(
".dropdown-input-field"
).
set
(
branch_name
)
click_on
(
"Create wildcard
#{
branch_name
}
"
)
click_on
(
"Create wildcard
#{
branch_name
}
"
)
end
end
describe
"saved defaults"
do
it
"keeps the allowed to merge and push dropdowns defaults based on the previous selection"
do
visit
project_protected_branches_path
(
project
)
set_protected_branch_name
(
'some-branch'
)
find
(
".js-allowed-to-merge"
).
trigger
(
'click'
)
click_link
'No one'
find
(
".js-allowed-to-push"
).
trigger
(
'click'
)
click_link
'Developers + Masters'
visit
project_protected_branches_path
(
project
)
page
.
within
(
".js-allowed-to-merge"
)
do
expect
(
page
.
find
(
".dropdown-toggle-text"
)).
to
have_content
(
"No one"
)
end
page
.
within
(
".js-allowed-to-push"
)
do
expect
(
page
.
find
(
".dropdown-toggle-text"
)).
to
have_content
(
"Developers + Masters"
)
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