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
22e98fd0
Commit
22e98fd0
authored
Apr 12, 2019
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix protected branch example failing on master
Failing due to updates in capybara and selenium driver.
parent
d0af8c32
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/projects/protected_branches/shared/_protected_branch.html.haml
...cts/protected_branches/shared/_protected_branch.html.haml
+1
-1
ee/spec/support/shared_examples/features/protected_branches_access_control.rb
...ed_examples/features/protected_branches_access_control.rb
+3
-3
No files found.
app/views/projects/protected_branches/shared/_protected_branch.html.haml
View file @
22e98fd0
-
can_admin_project
=
can?
(
current_user
,
:admin_project
,
@project
)
-
can_admin_project
=
can?
(
current_user
,
:admin_project
,
@project
)
%tr
.js-protected-branch-edit-form
{
data:
{
url:
namespace_project_protected_branch_path
(
@project
.
namespace
,
@project
,
protected_branch
)
}
}
%tr
.
qa-protected-branch.
js-protected-branch-edit-form
{
data:
{
url:
namespace_project_protected_branch_path
(
@project
.
namespace
,
@project
,
protected_branch
)
}
}
%td
%td
%span
.ref-name
=
protected_branch
.
name
%span
.ref-name
=
protected_branch
.
name
...
...
ee/spec/support/shared_examples/features/protected_branches_access_control.rb
View file @
22e98fd0
...
@@ -177,9 +177,9 @@ shared_examples "protected branches > access control > EE" do
...
@@ -177,9 +177,9 @@ shared_examples "protected branches > access control > EE" do
it
'unprotect/delete can be performed by a maintainer'
do
it
'unprotect/delete can be performed by a maintainer'
do
visit
project_protected_branches_path
(
project
)
visit
project_protected_branches_path
(
project
)
expect
do
expect
(
page
).
to
have_selector
(
'.qa-protected-branch'
)
accept_alert
{
click_on
'Unprotect'
}
accept_alert
{
click_on
'Unprotect'
}
e
nd
.
to
change
(
ProtectedBranch
,
:count
).
to
(
0
)
e
xpect
(
page
).
not_to
have_selector
(
'.qa-protected-branch'
)
end
end
context
'with unprotect access levels'
do
context
'with unprotect access levels'
do
...
...
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