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

2 files changed, 8 insertions, 8 deletions

diff --git a/app/views/projects/protected_branches/_create_protected_branch.html.haml b/app/views/projects/protected_branches/_create_protected_branch.html.haml
index 24b53555cdc..ee359a01e74 100644
--- a/app/views/projects/protected_branches/_create_protected_branch.html.haml
+++ b/app/views/projects/protected_branches/_create_protected_branch.html.haml
@@ -2,13 +2,13 @@
   .merge_access_levels-container
     = dropdown_tag('Select',
                     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' }})
 - content_for :push_access_levels do
   .push_access_levels-container
     = dropdown_tag('Select',
                     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' }})
 
 = render 'projects/protected_branches/shared/create_protected_branch'
diff --git a/spec/support/shared_examples/features/protected_branches_access_control_ce.rb b/spec/support/shared_examples/features/protected_branches_access_control_ce.rb
index 867a1774aa9..db83d6f0793 100644
--- a/spec/support/shared_examples/features/protected_branches_access_control_ce.rb
+++ b/spec/support/shared_examples/features/protected_branches_access_control_ce.rb
@@ -8,7 +8,7 @@ shared_examples "protected branches > access control > CE" do
       set_protected_branch_name('master')
 
       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")
         find(:link, 'No one').click
       end
@@ -34,13 +34,13 @@ shared_examples "protected branches > access control > CE" do
       set_protected_branch_name('master')
 
       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")
         find(:link, 'No one').click
       end
 
       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")
         find(:link, 'No one').click
       end
@@ -80,7 +80,7 @@ shared_examples "protected branches > access control > CE" do
       end
 
       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")
         find(:link, 'No one').click
       end
@@ -97,13 +97,13 @@ shared_examples "protected branches > access control > CE" do
       set_protected_branch_name('master')
 
       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")
         find(:link, 'No one').click
       end
 
       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")
         find(:link, 'No one').click
       end