Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 7 deletions

diff --git a/spec/features/projects/settings/registry_settings_spec.rb b/spec/features/projects/settings/registry_settings_spec.rb
index 6e4082d1391..bc60cdd2f8e 100644
--- a/spec/features/projects/settings/registry_settings_spec.rb
+++ b/spec/features/projects/settings/registry_settings_spec.rb
@@ -39,7 +39,7 @@ RSpec.describe 'Project > Settings > CI/CD > Container registry tag expiration p
         select('7 days', from: 'Remove tags older than:')
         fill_in('Remove tags matching:', with: '.*-production')
 
-        submit_button = find('.btn.gl-button.btn-success')
+        submit_button = find('[data-testid="save-button"')
         expect(submit_button).not_to be_disabled
         submit_button.click
       end
@@ -53,7 +53,7 @@ RSpec.describe 'Project > Settings > CI/CD > Container registry tag expiration p
       within '#js-registry-policies' do
         fill_in('Remove tags matching:', with: '*-production')
 
-        submit_button = find('.btn.gl-button.btn-success')
+        submit_button = find('[data-testid="save-button"')
         expect(submit_button).not_to be_disabled
         submit_button.click
       end
diff --git a/spec/features/projects/sub_group_issuables_spec.rb b/spec/features/projects/sub_group_issuables_spec.rb
index 8c1d88276df..d7614201740 100644
--- a/spec/features/projects/sub_group_issuables_spec.rb
+++ b/spec/features/projects/sub_group_issuables_spec.rb
@@ -16,18 +16,18 @@ RSpec.describe 'Subgroup Issuables', :js do
   it 'shows the full subgroup title when issues index page is empty' do
     visit project_issues_path(project)
 
-    expect_to_have_full_subgroup_title
+    expect_to_have_breadcrumb_links
   end
 
   it 'shows the full subgroup title when merge requests index page is empty' do
     visit project_merge_requests_path(project)
 
-    expect_to_have_full_subgroup_title
+    expect_to_have_breadcrumb_links
   end
 
-  def expect_to_have_full_subgroup_title
-    title = find('.breadcrumbs-links')
+  def expect_to_have_breadcrumb_links
+    links = find('[data-testid="breadcrumb-links"]')
 
-    expect(title).to have_content 'group subgroup project'
+    expect(links).to have_content 'group subgroup project'
   end
 end