1 files changed, 29 insertions, 21 deletions

diff --git a/spec/workers/gitlab_shell_worker_spec.rb b/spec/workers/gitlab_shell_worker_spec.rb
index c46ef87333a..a5419291d35 100644
--- a/spec/workers/gitlab_shell_worker_spec.rb
+++ b/spec/workers/gitlab_shell_worker_spec.rb
@@ -2,37 +2,45 @@
 
 require 'spec_helper'
 
-RSpec.describe GitlabShellWorker do
-  let(:worker) { described_class.new }
-
+RSpec.describe GitlabShellWorker, :sidekiq_inline do
   describe '#perform' do
-    describe '#add_key' do
-      it 'delegates to Gitlab::AuthorizedKeys' do
-        expect_next_instance_of(Gitlab::AuthorizedKeys) do |instance|
-          expect(instance).to receive(:add_key).with('foo', 'bar')
+    Gitlab::Shell::PERMITTED_ACTIONS.each do |action|
+      describe "with the #{action} action" do
+        it 'forwards the message to Gitlab::Shell' do
+          expect_next_instance_of(Gitlab::Shell) do |instance|
+            expect(instance).to respond_to(action)
+            expect(instance).to receive(action).with('foo', 'bar')
+          end
+
+          described_class.perform_async(action, 'foo', 'bar')
         end
-
-        worker.perform('add_key', 'foo', 'bar')
       end
     end
 
-    describe '#remove_key' do
-      it 'delegates to Gitlab::AuthorizedKeys' do
-        expect_next_instance_of(Gitlab::AuthorizedKeys) do |instance|
-          expect(instance).to receive(:remove_key).with('foo', 'bar')
+    describe 'all other commands' do
+      context 'when verify_gitlab_shell_worker_method_names is enabled' do
+        it 'raises ArgumentError' do
+          allow_next_instance_of(described_class) do |job_instance|
+            expect(job_instance).not_to receive(:gitlab_shell)
+          end
+
+          expect { described_class.perform_async('foo', 'bar', 'baz') }
+            .to raise_error(ArgumentError, 'foo not allowed for GitlabShellWorker')
         end
-
-        worker.perform('remove_key', 'foo', 'bar')
       end
-    end
 
-    describe 'all other commands' do
-      it 'delegates them to Gitlab::Shell' do
-        expect_next_instance_of(Gitlab::Shell) do |instance|
-          expect(instance).to receive(:foo).with('bar', 'baz')
+      context 'when verify_gitlab_shell_worker_method_names is disabled' do
+        before do
+          stub_feature_flags(verify_gitlab_shell_worker_method_names: false)
         end
 
-        worker.perform('foo', 'bar', 'baz')
+        it 'forwards the message to Gitlab::Shell' do
+          expect_next_instance_of(Gitlab::Shell) do |instance|
+            expect(instance).to receive('foo').with('bar', 'baz')
+          end
+
+          described_class.perform_async('foo', 'bar', 'baz')
+        end
       end
     end
   end