4 files changed, 13 insertions, 32 deletions

diff --git a/spec/features/groups/empty_states_spec.rb b/spec/features/groups/empty_states_spec.rb
index 30074f421e5..97d53db3ef1 100644
--- a/spec/features/groups/empty_states_spec.rb
+++ b/spec/features/groups/empty_states_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe 'Group empty states', feature_category: :groups_and_projects do
             create(issuable, project_relation => project)
 
             visit path
-            expect(page).not_to have_selector('.empty-state')
+            expect(page).not_to have_selector('[data-testid="issuable-empty-state"]')
           end
 
           it "displays link to create new #{issuable} when no open #{issuable} is found", :js do
@@ -40,7 +40,7 @@ RSpec.describe 'Group empty states', feature_category: :groups_and_projects do
 
             wait_for_all_requests
 
-            page.within(find('.empty-state')) do
+            within_testid('issuable-empty-state') do
               expect(page).to have_content(/There are no open #{issuable.to_s.humanize.downcase}/)
               new_issuable_path = issuable == :issue ? 'new_project_issue_path' : 'project_new_merge_request_path'
 
@@ -59,7 +59,7 @@ RSpec.describe 'Group empty states', feature_category: :groups_and_projects do
 
             wait_for_all_requests
 
-            page.within(find('.empty-state')) do
+            within_testid('issuable-empty-state') do
               expect(page).to have_content(/Sorry, your filter produced no results/)
               new_issuable_path = issuable == :issue ? 'new_project_issue_path' : 'project_new_merge_request_path'
 
@@ -78,7 +78,7 @@ RSpec.describe 'Group empty states', feature_category: :groups_and_projects do
 
             wait_for_all_requests
 
-            page.within(find('.empty-state')) do
+            within_testid('issuable-empty-state') do
               expect(page).to have_content(/There are no closed #{issuable.to_s.humanize.downcase}/)
             end
           end
@@ -90,7 +90,7 @@ RSpec.describe 'Group empty states', feature_category: :groups_and_projects do
           end
 
           it 'displays an empty state' do
-            expect(page).to have_selector('.empty-state')
+            expect(page).to have_selector('[data-testid="issuable-empty-state"]')
           end
 
           it "shows a new #{issuable_name} button" do
@@ -107,11 +107,11 @@ RSpec.describe 'Group empty states', feature_category: :groups_and_projects do
 
       shared_examples "no projects" do
         it 'displays an empty state', :js do
-          expect(page).to have_selector('.empty-state')
+          expect(page).to have_selector('[data-testid="issuable-empty-state"]')
         end
 
         it "does not show a new #{issuable_name} button", :js do
-          within '.empty-state' do
+          within_testid('issuable-empty-state') do
             expect(page).not_to have_link("create #{issuable_name}")
           end
         end
@@ -130,7 +130,7 @@ RSpec.describe 'Group empty states', feature_category: :groups_and_projects do
             end
 
             it 'does not display an empty state' do
-              expect(page).not_to have_selector('.empty-state')
+              expect(page).not_to have_selector('[data-testid="issuable-empty-state"]')
             end
           end
 
@@ -140,7 +140,7 @@ RSpec.describe 'Group empty states', feature_category: :groups_and_projects do
             end
 
             it 'displays an empty state', :js do
-              expect(page).to have_selector('.empty-state')
+              expect(page).to have_selector('[data-testid="issuable-empty-state"]')
             end
           end
         end
diff --git a/spec/features/groups/labels/sort_labels_spec.rb b/spec/features/groups/labels/sort_labels_spec.rb
index e177461701e..a8cb49ff2a0 100644
--- a/spec/features/groups/labels/sort_labels_spec.rb
+++ b/spec/features/groups/labels/sort_labels_spec.rb
@@ -22,8 +22,8 @@ RSpec.describe 'Sort labels', :js, feature_category: :team_planning do
 
     # assert default sorting
     within '.other-labels' do
-      expect(page.all('.label-list-item').first.text).to include('Bar')
-      expect(page.all('.label-list-item').last.text).to include('Foo')
+      expect(page.all('.js-label-list-item').first.text).to include('Bar')
+      expect(page.all('.js-label-list-item').last.text).to include('Foo')
     end
   end
 
@@ -43,8 +43,8 @@ RSpec.describe 'Sort labels', :js, feature_category: :team_planning do
 
     # assert default sorting
     within '.other-labels' do
-      expect(page.all('.label-list-item').first.text).to include('Foo')
-      expect(page.all('.label-list-item').last.text).to include('Bar')
+      expect(page.all('.js-label-list-item').first.text).to include('Foo')
+      expect(page.all('.js-label-list-item').last.text).to include('Bar')
     end
   end
 end
diff --git a/spec/features/groups/milestone_spec.rb b/spec/features/groups/milestone_spec.rb
index d870471d646..bb7cc3db452 100644
--- a/spec/features/groups/milestone_spec.rb
+++ b/spec/features/groups/milestone_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe 'Group milestones', feature_category: :groups_and_projects do
-  include ContentEditorHelpers
-
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project_empty_repo, group: group) }
   let_it_be(:user) { create(:group_member, :maintainer, user: create(:user), group: group).user }
@@ -20,7 +18,6 @@ RSpec.describe 'Group milestones', feature_category: :groups_and_projects do
   context 'create a milestone', :js do
     before do
       visit new_group_milestone_path(group)
-      close_rich_text_promo_popover_if_present
     end
 
     it 'renders description preview' do
@@ -69,7 +66,6 @@ RSpec.describe 'Group milestones', feature_category: :groups_and_projects do
     context 'when no milestones' do
       it 'renders no milestones text' do
         visit group_milestones_path(group)
-        close_rich_text_promo_popover_if_present
         expect(page).to have_content('Use milestones to track issues and merge requests')
       end
     end
@@ -99,7 +95,6 @@ RSpec.describe 'Group milestones', feature_category: :groups_and_projects do
 
       before do
         visit group_milestones_path(group)
-        close_rich_text_promo_popover_if_present
       end
 
       it 'counts milestones correctly' do
@@ -175,7 +170,6 @@ RSpec.describe 'Group milestones', feature_category: :groups_and_projects do
 
       before do
         visit group_milestone_path(group, milestone)
-        close_rich_text_promo_popover_if_present
       end
 
       it 'renders the issues tab' do
diff --git a/spec/features/groups/navbar_spec.rb b/spec/features/groups/navbar_spec.rb
index 6a38f0c59a8..76e4e32d138 100644
--- a/spec/features/groups/navbar_spec.rb
+++ b/spec/features/groups/navbar_spec.rb
@@ -18,7 +18,6 @@ RSpec.describe 'Group navbar', :with_license, feature_category: :navigation do
 
     stub_config(dependency_proxy: { enabled: false })
     stub_config(registry: { enabled: false })
-    stub_feature_flags(observability_group_tab: false)
     stub_group_wikis(false)
     group.add_maintainer(user)
     sign_in(user)
@@ -93,16 +92,4 @@ RSpec.describe 'Group navbar', :with_license, feature_category: :navigation do
 
     it_behaves_like 'verified navigation bar'
   end
-
-  context 'when observability tab is enabled' do
-    before do
-      stub_feature_flags(observability_group_tab: true)
-
-      insert_observability_nav
-
-      visit group_path(group)
-    end
-
-    it_behaves_like 'verified navigation bar'
-  end
 end