Add latest changes from gitlab-org/gitlab@master

4 files changed, 6 insertions, 5 deletions

diff --git a/spec/features/clusters/create_agent_spec.rb b/spec/features/clusters/create_agent_spec.rb
index 93a49151978..d90c43f452c 100644
--- a/spec/features/clusters/create_agent_spec.rb
+++ b/spec/features/clusters/create_agent_spec.rb
@@ -27,7 +27,8 @@ RSpec.describe 'Cluster agent registration', :js, feature_category: :deployment_
   end
 
   it 'allows the user to select an agent to install, and displays the resulting agent token' do
-    click_button('Connect a cluster')
+    find('[data-testid="clusters-default-action-button"]').click
+
     expect(page).to have_content('Register')
 
     click_button('Select an agent or enter a name to create new')
diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb
index f9195904ea3..eadcc0e62c4 100644
--- a/spec/features/projects/clusters/gcp_spec.rb
+++ b/spec/features/projects/clusters/gcp_spec.rb
@@ -54,7 +54,7 @@ RSpec.describe 'Gcp Cluster', :js, feature_category: :deployment_management do
         before do
           visit project_clusters_path(project)
 
-          click_button(class: 'dropdown-toggle-split')
+          click_button(class: 'gl-new-dropdown-toggle')
           click_link 'Connect a cluster (certificate - deprecated)'
         end
 
diff --git a/spec/features/projects/clusters/user_spec.rb b/spec/features/projects/clusters/user_spec.rb
index eb2601bb85f..6da8eea687e 100644
--- a/spec/features/projects/clusters/user_spec.rb
+++ b/spec/features/projects/clusters/user_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe 'User Cluster', :js, feature_category: :deployment_management do
     before do
       visit project_clusters_path(project)
 
-      click_button(class: 'dropdown-toggle-split')
+      click_button(class: 'gl-new-dropdown-toggle')
       click_link 'Connect a cluster (certificate - deprecated)'
     end
 
diff --git a/spec/features/projects/clusters_spec.rb b/spec/features/projects/clusters_spec.rb
index e2737d62749..d40f929d0b2 100644
--- a/spec/features/projects/clusters_spec.rb
+++ b/spec/features/projects/clusters_spec.rb
@@ -125,12 +125,12 @@ RSpec.describe 'Clusters', :js, feature_category: :groups_and_projects do
   def visit_create_cluster_page
     visit project_clusters_path(project)
 
-    click_button(class: 'dropdown-toggle-split')
+    click_button(class: 'gl-new-dropdown-toggle')
     click_link 'Create a cluster'
   end
 
   def visit_connect_cluster_page
-    click_button(class: 'dropdown-toggle-split')
+    click_button(class: 'gl-new-dropdown-toggle')
     click_link 'Connect a cluster (certificate - deprecated)'
   end
 end