Merge branch '41922-simplify-runner-registration-token-resetting' into 'master'

Simplify runner registration token resetting

Closes #41922

See merge request gitlab-org/gitlab-ce!21658

5 files changed, 108 insertions, 0 deletions

diff --git a/spec/controllers/admin/application_settings_controller_spec.rb b/spec/controllers/admin/application_settings_controller_spec.rb
index 10e1bfc30f9..2e0f79cd313 100644
--- a/spec/controllers/admin/application_settings_controller_spec.rb
+++ b/spec/controllers/admin/application_settings_controller_spec.rb
@@ -86,4 +86,22 @@ describe Admin::ApplicationSettingsController do
       expect(ApplicationSetting.current.receive_max_input_size).to eq(1024)
     end
   end
+
+  describe 'PUT #reset_registration_token' do
+    before do
+      sign_in(admin)
+    end
+
+    subject { put :reset_registration_token }
+
+    it 'resets runner registration token' do
+      expect { subject }.to change { ApplicationSetting.current.runners_registration_token }
+    end
+
+    it 'redirects the user to admin runners page' do
+      subject
+
+      expect(response).to redirect_to(admin_runners_path)
+    end
+  end
 end
diff --git a/spec/controllers/groups/settings/ci_cd_controller_spec.rb b/spec/controllers/groups/settings/ci_cd_controller_spec.rb
index ea18122e0c3..06ccace8242 100644
--- a/spec/controllers/groups/settings/ci_cd_controller_spec.rb
+++ b/spec/controllers/groups/settings/ci_cd_controller_spec.rb
@@ -17,4 +17,18 @@ describe Groups::Settings::CiCdController do
       expect(response).to render_template(:show)
     end
   end
+
+  describe 'PUT #reset_registration_token' do
+    subject { put :reset_registration_token, group_id: group }
+
+    it 'resets runner registration token' do
+      expect { subject }.to change { group.reload.runners_token }
+    end
+
+    it 'redirects the user to admin runners page' do
+      subject
+
+      expect(response).to redirect_to(group_settings_ci_cd_path)
+    end
+  end
 end
diff --git a/spec/controllers/projects/settings/ci_cd_controller_spec.rb b/spec/controllers/projects/settings/ci_cd_controller_spec.rb
index 1f14a0cc381..4629929f9af 100644
--- a/spec/controllers/projects/settings/ci_cd_controller_spec.rb
+++ b/spec/controllers/projects/settings/ci_cd_controller_spec.rb
@@ -74,6 +74,19 @@ describe Projects::Settings::CiCdController do
     end
   end
 
+  describe 'PUT #reset_registration_token' do
+    subject { put :reset_registration_token, namespace_id: project.namespace, project_id: project }
+    it 'resets runner registration token' do
+      expect { subject }.to change { project.reload.runners_token }
+    end
+
+    it 'redirects the user to admin runners page' do
+      subject
+
+      expect(response).to redirect_to(namespace_project_settings_ci_cd_path)
+    end
+  end
+
   describe 'PATCH update' do
     let(:params) { { ci_config_path: '' } }
 
diff --git a/spec/features/groups/settings/ci_cd_spec.rb b/spec/features/groups/settings/ci_cd_spec.rb
new file mode 100644
index 00000000000..d422fd18346
--- /dev/null
+++ b/spec/features/groups/settings/ci_cd_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Group CI/CD settings' do
+  include WaitForRequests
+
+  let(:user) {create(:user)}
+  let(:group) {create(:group)}
+
+  before do
+    group.add_owner(user)
+    sign_in(user)
+  end
+
+  describe 'runners registration token' do
+    let!(:token) { group.runners_token }
+
+    before do
+      visit group_settings_ci_cd_path(group)
+    end
+
+    it 'has a registration token' do
+      expect(page.find('#registration_token')).to have_content(token)
+    end
+
+    describe 'reload registration token' do
+      let(:page_token) { find('#registration_token').text }
+
+      before do
+        click_button 'Reset runners registration token'
+      end
+
+      it 'changes registration token' do
+        expect(page_token).not_to eq token
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb
index 30b0a5578ea..6f8ec0015ad 100644
--- a/spec/features/projects/settings/pipelines_settings_spec.rb
+++ b/spec/features/projects/settings/pipelines_settings_spec.rb
@@ -137,5 +137,29 @@ describe "Projects > Settings > Pipelines settings" do
         end
       end
     end
+
+    describe 'runners registration token' do
+      let!(:token) { project.runners_token }
+
+      before do
+        visit project_settings_ci_cd_path(project)
+      end
+
+      it 'has a registration token' do
+        expect(page.find('#registration_token')).to have_content(token)
+      end
+
+      describe 'reload registration token' do
+        let(:page_token) { find('#registration_token').text }
+
+        before do
+          click_button 'Reset runners registration token'
+        end
+
+        it 'changes registration token' do
+          expect(page_token).not_to eq token
+        end
+      end
+    end
   end
 end