1 files changed, 9 insertions, 11 deletions
diff --git a/spec/features/projects/user_sorts_projects_spec.rb b/spec/features/projects/user_sorts_projects_spec.rb
index b9b28398279..c40f01f3aa1 100644
--- a/spec/features/projects/user_sorts_projects_spec.rb
+++ b/spec/features/projects/user_sorts_projects_spec.rb
@@ -24,7 +24,6 @@ RSpec.describe 'User sorts projects and order persists' do
     end
 
     it "is set on the group_canonical_path" do
-      stub_feature_flags(group_overview_tabs_vue: false)
       visit(group_canonical_path(group))
 
       within '[data-testid=group_sort_by_dropdown]' do
@@ -33,7 +32,6 @@ RSpec.describe 'User sorts projects and order persists' do
     end
 
     it "is set on the details_group_path" do
-      stub_feature_flags(group_overview_tabs_vue: false)
       visit(details_group_path(group))
 
       within '[data-testid=group_sort_by_dropdown]' do
@@ -42,7 +40,7 @@ RSpec.describe 'User sorts projects and order persists' do
     end
   end
 
-  context "from explore projects" do
+  context "from explore projects", :js do
     before do
       sign_in(user)
       visit(explore_projects_path)
@@ -50,10 +48,10 @@ RSpec.describe 'User sorts projects and order persists' do
       first(:link, 'Updated date').click
     end
 
-    it_behaves_like "sort order persists across all views", 'Updated date', 'Updated date'
+    it_behaves_like "sort order persists across all views", 'Updated date', 'Updated'
   end
 
-  context 'from dashboard projects' do
+  context 'from dashboard projects', :js do
     before do
       sign_in(user)
       visit(dashboard_projects_path)
@@ -66,29 +64,29 @@ RSpec.describe 'User sorts projects and order persists' do
 
   context 'from group homepage', :js do
     before do
-      stub_feature_flags(group_overview_tabs_vue: false)
       sign_in(user)
       visit(group_canonical_path(group))
       within '[data-testid=group_sort_by_dropdown]' do
         find('button.gl-dropdown-toggle').click
-        first(:button, 'Last created').click
+        first(:button, 'Created').click
+        wait_for_requests
       end
     end
 
-    it_behaves_like "sort order persists across all views", "Created date", "Last created"
+    it_behaves_like "sort order persists across all views", "Created date", "Created"
   end
 
   context 'from group details', :js do
     before do
-      stub_feature_flags(group_overview_tabs_vue: false)
       sign_in(user)
       visit(details_group_path(group))
       within '[data-testid=group_sort_by_dropdown]' do
         find('button.gl-dropdown-toggle').click
-        first(:button, 'Most stars').click
+        first(:button, 'Stars').click
+        wait_for_requests
       end
     end
 
-    it_behaves_like "sort order persists across all views", "Stars", "Most stars"
+    it_behaves_like "sort order persists across all views", "Stars", "Stars"
   end
 end