1 files changed, 37 insertions, 9 deletions

diff --git a/spec/features/groups/group_runners_spec.rb b/spec/features/groups/group_runners_spec.rb
index e9807c487d5..c9d1c69e9e1 100644
--- a/spec/features/groups/group_runners_spec.rb
+++ b/spec/features/groups/group_runners_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe "Group Runners" do
   include Spec::Support::Helpers::Features::RunnersHelpers
+  include Spec::Support::Helpers::ModalHelpers
 
   let_it_be(:group_owner) { create(:user) }
   let_it_be(:group) { create(:group) }
@@ -157,6 +158,19 @@ RSpec.describe "Group Runners" do
       end
     end
 
+    context "with multiple runners" do
+      before do
+        create(:ci_runner, :group, groups: [group], description: 'runner-foo')
+        create(:ci_runner, :group, groups: [group], description: 'runner-bar')
+
+        visit group_runners_path(group)
+      end
+
+      it_behaves_like 'deletes runners in bulk' do
+        let(:runner_count) { '2' }
+      end
+    end
+
     describe 'filtered search' do
       before do
         visit group_runners_path(group)
@@ -201,18 +215,32 @@ RSpec.describe "Group Runners" do
   end
 
   describe "Group runner edit page", :js do
-    let!(:group_runner) do
-      create(:ci_runner, :group, groups: [group])
-    end
+    context 'when updating a group runner' do
+      let_it_be(:group_runner) { create(:ci_runner, :group, groups: [group]) }
 
-    before do
-      visit edit_group_runner_path(group, group_runner)
-      wait_for_requests
+      before do
+        visit edit_group_runner_path(group, group_runner)
+        wait_for_requests
+      end
+
+      it_behaves_like 'submits edit runner form' do
+        let(:runner) { group_runner }
+        let(:runner_page_path) { group_runner_path(group, group_runner) }
+      end
     end
 
-    it_behaves_like 'submits edit runner form' do
-      let(:runner) { group_runner }
-      let(:runner_page_path) { group_runner_path(group, group_runner) }
+    context 'when updating a project runner' do
+      let_it_be(:project_runner) { create(:ci_runner, :project, projects: [project]) }
+
+      before do
+        visit edit_group_runner_path(group, project_runner)
+        wait_for_requests
+      end
+
+      it_behaves_like 'submits edit runner form' do
+        let(:runner) { project_runner }
+        let(:runner_page_path) { group_runner_path(group, project_runner) }
+      end
     end
   end
 end