Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

2 files changed, 4 insertions, 4 deletions

diff --git a/spec/features/dashboard/activity_spec.rb b/spec/features/dashboard/activity_spec.rb
index e75e661b513..7390edc3c47 100644
--- a/spec/features/dashboard/activity_spec.rb
+++ b/spec/features/dashboard/activity_spec.rb
@@ -13,19 +13,19 @@ RSpec.describe 'Dashboard > Activity' do
     it 'shows Your Projects' do
       visit activity_dashboard_path
 
-      expect(find('.top-area .nav-tabs li.active')).to have_content('Your projects')
+      expect(find('[data-testid="dashboard-activity-tabs"] a.active')).to have_content('Your projects')
     end
 
     it 'shows Starred Projects' do
       visit activity_dashboard_path(filter: 'starred')
 
-      expect(find('.top-area .nav-tabs li.active')).to have_content('Starred projects')
+      expect(find('[data-testid="dashboard-activity-tabs"] a.active')).to have_content('Starred projects')
     end
 
     it 'shows Followed Projects' do
       visit activity_dashboard_path(filter: 'followed')
 
-      expect(find('.top-area .nav-tabs li.active')).to have_content('Followed users')
+      expect(find('[data-testid="dashboard-activity-tabs"] a.active')).to have_content('Followed users')
     end
   end
 
diff --git a/spec/features/dashboard/issuables_counter_spec.rb b/spec/features/dashboard/issuables_counter_spec.rb
index d4c6b6faa79..8e938fef155 100644
--- a/spec/features/dashboard/issuables_counter_spec.rb
+++ b/spec/features/dashboard/issuables_counter_spec.rb
@@ -55,7 +55,7 @@ RSpec.describe 'Navigation bar counter', :use_clean_rails_memory_store_caching d
   end
 
   def expect_counters(issuable_type, count)
-    dashboard_count = find('.nav-links li.active')
+    dashboard_count = find('.gl-tabs-nav li a.active')
     nav_count = find(".dashboard-shortcuts-#{issuable_type}")
     header_count = find(".header-content .#{issuable_type.tr('_', '-')}-count")