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
68f170a4
Commit
68f170a4
authored
Jul 26, 2019
by
Tanya Pazitny
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change qa-* class references to rspec-*
parent
2219b140
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
app/views/projects/protected_branches/_create_protected_branch.html.haml
...cts/protected_branches/_create_protected_branch.html.haml
+2
-2
spec/support/shared_examples/features/protected_branches_access_control_ce.rb
...examples/features/protected_branches_access_control_ce.rb
+6
-6
No files found.
app/views/projects/protected_branches/_create_protected_branch.html.haml
View file @
68f170a4
...
@@ -2,13 +2,13 @@
...
@@ -2,13 +2,13 @@
.merge_access_levels-container
.merge_access_levels-container
=
dropdown_tag
(
'Select'
,
=
dropdown_tag
(
'Select'
,
options:
{
toggle_class:
'js-allowed-to-merge qa-allowed-to-merge-select wide'
,
options:
{
toggle_class:
'js-allowed-to-merge qa-allowed-to-merge-select wide'
,
dropdown_class:
'dropdown-menu-selectable qa-allowed-to-merge-dropdown capitalize-header'
,
dropdown_class:
'dropdown-menu-selectable qa-allowed-to-merge-dropdown
rspec-allowed-to-merge-dropdown
capitalize-header'
,
data:
{
field_name:
'protected_branch[merge_access_levels_attributes][0][access_level]'
,
input_id:
'merge_access_levels_attributes'
}})
data:
{
field_name:
'protected_branch[merge_access_levels_attributes][0][access_level]'
,
input_id:
'merge_access_levels_attributes'
}})
-
content_for
:push_access_levels
do
-
content_for
:push_access_levels
do
.push_access_levels-container
.push_access_levels-container
=
dropdown_tag
(
'Select'
,
=
dropdown_tag
(
'Select'
,
options:
{
toggle_class:
'js-allowed-to-push qa-allowed-to-push-select wide'
,
options:
{
toggle_class:
'js-allowed-to-push qa-allowed-to-push-select wide'
,
dropdown_class:
'dropdown-menu-selectable qa-allowed-to-push-dropdown capitalize-header'
,
dropdown_class:
'dropdown-menu-selectable qa-allowed-to-push-dropdown
rspec-allowed-to-push-dropdown
capitalize-header'
,
data:
{
field_name:
'protected_branch[push_access_levels_attributes][0][access_level]'
,
input_id:
'push_access_levels_attributes'
}})
data:
{
field_name:
'protected_branch[push_access_levels_attributes][0][access_level]'
,
input_id:
'push_access_levels_attributes'
}})
=
render
'projects/protected_branches/shared/create_protected_branch'
=
render
'projects/protected_branches/shared/create_protected_branch'
spec/support/shared_examples/features/protected_branches_access_control_ce.rb
View file @
68f170a4
...
@@ -8,7 +8,7 @@ shared_examples "protected branches > access control > CE" do
...
@@ -8,7 +8,7 @@ shared_examples "protected branches > access control > CE" do
set_protected_branch_name
(
'master'
)
set_protected_branch_name
(
'master'
)
find
(
".js-allowed-to-merge"
).
click
find
(
".js-allowed-to-merge"
).
click
within
(
'.
qa
-allowed-to-merge-dropdown'
)
do
within
(
'.
rspec
-allowed-to-merge-dropdown'
)
do
expect
(
first
(
"li"
)).
to
have_content
(
"Roles"
)
expect
(
first
(
"li"
)).
to
have_content
(
"Roles"
)
find
(
:link
,
'No one'
).
click
find
(
:link
,
'No one'
).
click
end
end
...
@@ -34,13 +34,13 @@ shared_examples "protected branches > access control > CE" do
...
@@ -34,13 +34,13 @@ shared_examples "protected branches > access control > CE" do
set_protected_branch_name
(
'master'
)
set_protected_branch_name
(
'master'
)
find
(
".js-allowed-to-merge"
).
click
find
(
".js-allowed-to-merge"
).
click
within
(
'.
qa
-allowed-to-merge-dropdown'
)
do
within
(
'.
rspec
-allowed-to-merge-dropdown'
)
do
expect
(
first
(
"li"
)).
to
have_content
(
"Roles"
)
expect
(
first
(
"li"
)).
to
have_content
(
"Roles"
)
find
(
:link
,
'No one'
).
click
find
(
:link
,
'No one'
).
click
end
end
find
(
".js-allowed-to-push"
).
click
find
(
".js-allowed-to-push"
).
click
within
(
'.
qa
-allowed-to-push-dropdown'
)
do
within
(
'.
rspec
-allowed-to-push-dropdown'
)
do
expect
(
first
(
"li"
)).
to
have_content
(
"Roles"
)
expect
(
first
(
"li"
)).
to
have_content
(
"Roles"
)
find
(
:link
,
'No one'
).
click
find
(
:link
,
'No one'
).
click
end
end
...
@@ -80,7 +80,7 @@ shared_examples "protected branches > access control > CE" do
...
@@ -80,7 +80,7 @@ shared_examples "protected branches > access control > CE" do
end
end
find
(
".js-allowed-to-push"
).
click
find
(
".js-allowed-to-push"
).
click
within
(
'.
qa
-allowed-to-push-dropdown'
)
do
within
(
'.
rspec
-allowed-to-push-dropdown'
)
do
expect
(
first
(
"li"
)).
to
have_content
(
"Roles"
)
expect
(
first
(
"li"
)).
to
have_content
(
"Roles"
)
find
(
:link
,
'No one'
).
click
find
(
:link
,
'No one'
).
click
end
end
...
@@ -97,13 +97,13 @@ shared_examples "protected branches > access control > CE" do
...
@@ -97,13 +97,13 @@ shared_examples "protected branches > access control > CE" do
set_protected_branch_name
(
'master'
)
set_protected_branch_name
(
'master'
)
find
(
".js-allowed-to-merge"
).
click
find
(
".js-allowed-to-merge"
).
click
within
(
'.
qa
-allowed-to-merge-dropdown'
)
do
within
(
'.
rspec
-allowed-to-merge-dropdown'
)
do
expect
(
first
(
"li"
)).
to
have_content
(
"Roles"
)
expect
(
first
(
"li"
)).
to
have_content
(
"Roles"
)
find
(
:link
,
'No one'
).
click
find
(
:link
,
'No one'
).
click
end
end
find
(
".js-allowed-to-push"
).
click
find
(
".js-allowed-to-push"
).
click
within
(
'.
qa
-allowed-to-push-dropdown'
)
do
within
(
'.
rspec
-allowed-to-push-dropdown'
)
do
expect
(
first
(
"li"
)).
to
have_content
(
"Roles"
)
expect
(
first
(
"li"
)).
to
have_content
(
"Roles"
)
find
(
:link
,
'No one'
).
click
find
(
:link
,
'No one'
).
click
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