1 files changed, 35 insertions, 17 deletions

diff --git a/spec/features/groups/group_runners_spec.rb b/spec/features/groups/group_runners_spec.rb
index 1d821edefa3..a60b8a60da0 100644
--- a/spec/features/groups/group_runners_spec.rb
+++ b/spec/features/groups/group_runners_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe "Group Runners" do
         visit group_runners_path(group)
       end
 
-      it_behaves_like "shows no runners"
+      it_behaves_like 'shows no runners registered'
 
       it 'shows tabs with total counts equal to 0' do
         expect(page).to have_link('All 0')
@@ -70,6 +70,18 @@ RSpec.describe "Group Runners" do
           expect(find_link('Edit')[:href]).to end_with(edit_group_runner_path(group, group_runner))
         end
       end
+
+      context 'when description does not match' do
+        before do
+          input_filtered_search_keys('runner-baz')
+        end
+
+        it_behaves_like 'shows no runners found'
+
+        it 'shows no runner' do
+          expect(page).not_to have_content 'runner-foo'
+        end
+      end
     end
 
     context "with an online project runner" do
@@ -137,31 +149,37 @@ RSpec.describe "Group Runners" do
       create(:ci_runner, :group, groups: [group], description: 'runner-foo', contacted_at: Time.zone.now)
     end
 
-    it 'user edits the runner to be protected' do
-      visit edit_group_runner_path(group, runner)
+    context 'when group_runner_view_ui is disabled' do
+      before do
+        stub_feature_flags(group_runner_view_ui: false)
+      end
 
-      expect(page.find_field('runner[access_level]')).not_to be_checked
+      it 'user edits the runner to be protected' do
+        visit edit_group_runner_path(group, runner)
 
-      check 'runner_access_level'
-      click_button 'Save changes'
+        expect(page.find_field('runner[access_level]')).not_to be_checked
 
-      expect(page).to have_content 'Protected Yes'
-    end
+        check 'runner_access_level'
+        click_button 'Save changes'
 
-    context 'when a runner has a tag' do
-      before do
-        runner.update!(tag_list: ['tag'])
+        expect(page).to have_content 'Protected Yes'
       end
 
-      it 'user edits runner not to run untagged jobs' do
-        visit edit_group_runner_path(group, runner)
+      context 'when a runner has a tag' do
+        before do
+          runner.update!(tag_list: ['tag'])
+        end
 
-        expect(page.find_field('runner[run_untagged]')).to be_checked
+        it 'user edits runner not to run untagged jobs' do
+          visit edit_group_runner_path(group, runner)
 
-        uncheck 'runner_run_untagged'
-        click_button 'Save changes'
+          expect(page.find_field('runner[run_untagged]')).to be_checked
 
-        expect(page).to have_content 'Can run untagged jobs No'
+          uncheck 'runner_run_untagged'
+          click_button 'Save changes'
+
+          expect(page).to have_content 'Can run untagged jobs No'
+        end
       end
     end
   end