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
Jérome Perrin
gitlab-ce
Commits
c2912b46
Commit
c2912b46
authored
Aug 03, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add custom css class to each dropdown to fix failing spec
parent
e1d86ec9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/views/projects/protected_branches/_protected_branch.html.haml
...s/projects/protected_branches/_protected_branch.html.haml
+2
-2
spec/features/protected_branches_spec.rb
spec/features/protected_branches_spec.rb
+3
-3
No files found.
app/views/projects/protected_branches/_protected_branch.html.haml
View file @
c2912b46
...
@@ -16,12 +16,12 @@
...
@@ -16,12 +16,12 @@
%td
%td
=
hidden_field_tag
"allowed_to_merge_
#{
protected_branch
.
id
}
"
,
protected_branch
.
merge_access_level
.
access_level
=
hidden_field_tag
"allowed_to_merge_
#{
protected_branch
.
id
}
"
,
protected_branch
.
merge_access_level
.
access_level
=
dropdown_tag
(
(
protected_branch
.
merge_access_level
.
humanize
||
'Select'
)
,
=
dropdown_tag
(
(
protected_branch
.
merge_access_level
.
humanize
||
'Select'
)
,
options:
{
toggle_class:
'js-allowed-to-merge'
,
dropdown_class:
'dropdown-menu-selectable'
,
options:
{
toggle_class:
'js-allowed-to-merge'
,
dropdown_class:
'dropdown-menu-selectable
js-allowed-to-merge-container
'
,
data:
{
field_name:
"allowed_to_merge_
#{
protected_branch
.
id
}
"
}})
data:
{
field_name:
"allowed_to_merge_
#{
protected_branch
.
id
}
"
}})
%td
%td
=
hidden_field_tag
"allowed_to_push_
#{
protected_branch
.
id
}
"
,
protected_branch
.
push_access_level
.
access_level
=
hidden_field_tag
"allowed_to_push_
#{
protected_branch
.
id
}
"
,
protected_branch
.
push_access_level
.
access_level
=
dropdown_tag
(
(
protected_branch
.
push_access_level
.
humanize
||
'Select'
)
,
=
dropdown_tag
(
(
protected_branch
.
push_access_level
.
humanize
||
'Select'
)
,
options:
{
toggle_class:
'js-allowed-to-push'
,
dropdown_class:
'dropdown-menu-selectable'
,
options:
{
toggle_class:
'js-allowed-to-push'
,
dropdown_class:
'dropdown-menu-selectable
js-allowed-to-push-container
'
,
data:
{
field_name:
"allowed_to_push_
#{
protected_branch
.
id
}
"
}})
data:
{
field_name:
"allowed_to_push_
#{
protected_branch
.
id
}
"
}})
-
if
can_admin_project
-
if
can_admin_project
%td
%td
...
...
spec/features/protected_branches_spec.rb
View file @
c2912b46
...
@@ -11,7 +11,7 @@ feature 'Projected Branches', feature: true, js: true do
...
@@ -11,7 +11,7 @@ feature 'Projected Branches', feature: true, js: true do
def
set_protected_branch_name
(
branch_name
)
def
set_protected_branch_name
(
branch_name
)
find
(
".js-protected-branch-select"
).
click
find
(
".js-protected-branch-select"
).
click
find
(
".dropdown-input-field"
).
set
(
branch_name
)
find
(
".dropdown-input-field"
).
set
(
branch_name
)
click_on
"Create
Protected Branch:
#{
branch_name
}
"
click_on
"Create
wildcard
#{
branch_name
}
"
end
end
describe
"explicit protected branches"
do
describe
"explicit protected branches"
do
...
@@ -108,7 +108,7 @@ feature 'Projected Branches', feature: true, js: true do
...
@@ -108,7 +108,7 @@ feature 'Projected Branches', feature: true, js: true do
within
(
".protected-branches-list"
)
do
within
(
".protected-branches-list"
)
do
find
(
".js-allowed-to-push"
).
click
find
(
".js-allowed-to-push"
).
click
within
(
'.
dropdown-menu.push
'
)
{
click_on
access_type_name
}
within
(
'.
js-allowed-to-push-container
'
)
{
click_on
access_type_name
}
end
end
wait_for_ajax
wait_for_ajax
...
@@ -139,7 +139,7 @@ feature 'Projected Branches', feature: true, js: true do
...
@@ -139,7 +139,7 @@ feature 'Projected Branches', feature: true, js: true do
within
(
".protected-branches-list"
)
do
within
(
".protected-branches-list"
)
do
find
(
".js-allowed-to-merge"
).
click
find
(
".js-allowed-to-merge"
).
click
within
(
'.
dropdown-menu.merge
'
)
{
click_on
access_type_name
}
within
(
'.
js-allowed-to-merge-container
'
)
{
click_on
access_type_name
}
end
end
wait_for_ajax
wait_for_ajax
...
...
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