Commit a8b29b78 authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'tp-qtt182-2' into 'master'

Change qa-* class references to rspec-* for `allowed-to-{push|merge}-dropdown`

Closes gitlab-org/quality/team-tasks#182

See merge request gitlab-org/gitlab-ce!31203
parents 5e24f02f 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'
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment