1 files changed, 18 insertions, 56 deletions

diff --git a/spec/features/groups/group_runners_spec.rb b/spec/features/groups/group_runners_spec.rb
index a129db6cb6f..b98c94b030d 100644
--- a/spec/features/groups/group_runners_spec.rb
+++ b/spec/features/groups/group_runners_spec.rb
@@ -149,77 +149,39 @@ RSpec.describe "Group Runners" do
       create(:ci_runner, :group, groups: [group], description: 'runner-foo', contacted_at: Time.zone.now)
     end
 
-    context 'when group_runner_view_ui is disabled' do
-      before do
-        stub_feature_flags(group_runner_view_ui: false)
-      end
-
-      it 'user edits the runner to be protected' do
-        visit edit_group_runner_path(group, runner)
+    it 'user views runner details' do
+      visit group_runner_path(group, runner)
 
-        expect(page.find_field('runner[access_level]')).not_to be_checked
-
-        check 'runner_access_level'
-        click_button 'Save changes'
-
-        expect(page).to have_content 'Protected Yes'
-      end
-
-      context 'when a runner has a tag' do
-        before do
-          runner.update!(tag_list: ['tag'])
-        end
+      expect(page).to have_content "#{s_('Runners|Description')} runner-foo"
+    end
 
-        it 'user edits runner not to run untagged jobs' do
-          visit edit_group_runner_path(group, runner)
+    it 'user edits the runner to be protected' do
+      visit edit_group_runner_path(group, runner)
 
-          expect(page.find_field('runner[run_untagged]')).to be_checked
+      expect(page.find_field('runner[access_level]')).not_to be_checked
 
-          uncheck 'runner_run_untagged'
-          click_button 'Save changes'
+      check 'runner_access_level'
+      click_button _('Save changes')
 
-          expect(page).to have_content 'Can run untagged jobs No'
-        end
-      end
+      expect(page).to have_content "#{s_('Runners|Configuration')} #{s_('Runners|Protected')}"
     end
 
-    context 'when group_runner_view_ui is enabled' do
+    context 'when a runner has a tag' do
       before do
-        stub_feature_flags(group_runner_view_ui: true)
+        runner.update!(tag_list: ['tag1'])
       end
 
-      it 'user views runner details' do
-        visit group_runner_path(group, runner)
-
-        expect(page).to have_content "#{s_('Runners|Description')} runner-foo"
-      end
-
-      it 'user edits the runner to be protected' do
+      it 'user edits runner not to run untagged jobs' do
         visit edit_group_runner_path(group, runner)
 
-        expect(page.find_field('runner[access_level]')).not_to be_checked
+        page.find_field('runner[tag_list]').set('tag1, tag2')
 
-        check 'runner_access_level'
+        uncheck 'runner_run_untagged'
         click_button _('Save changes')
 
-        expect(page).to have_content "#{s_('Runners|Configuration')} #{s_('Runners|Protected')}"
-      end
-
-      context 'when a runner has a tag' do
-        before do
-          runner.update!(tag_list: ['tag'])
-        end
-
-        it 'user edits runner not to run untagged jobs' do
-          visit edit_group_runner_path(group, runner)
-
-          page.find_field('runner[tag_list]').set('tag, tag2')
-
-          uncheck 'runner_run_untagged'
-          click_button _('Save changes')
-
-          expect(page).to have_content "#{s_('Runners|Tags')} tag tag2"
-        end
+        # Tags can be in any order
+        expect(page).to have_content /#{s_('Runners|Tags')}.*tag1/
+        expect(page).to have_content /#{s_('Runners|Tags')}.*tag2/
       end
     end
   end