diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 21:09:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 21:09:25 +0300 |
commit | 967812838c7e7742729a4c7aeb9859f98a509622 (patch) | |
tree | 22db2e6642be51cb12535db7863331457e5523c3 /spec/workers | |
parent | 074d013e1eb3f6e0c27f96a3be8b9361254c8a98 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers')
-rw-r--r-- | spec/workers/authorized_keys_worker_spec.rb | 12 | ||||
-rw-r--r-- | spec/workers/gitlab_shell_worker_spec.rb | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/spec/workers/authorized_keys_worker_spec.rb b/spec/workers/authorized_keys_worker_spec.rb index 2aaa6fb2ddf..4f1dde0bfc0 100644 --- a/spec/workers/authorized_keys_worker_spec.rb +++ b/spec/workers/authorized_keys_worker_spec.rb @@ -17,7 +17,7 @@ describe AuthorizedKeysWorker do expect(instance).to receive(:add_key).with('foo', 'bar') end - worker.perform(:add_key, 'foo', 'bar') + worker.perform('add_key', 'foo', 'bar') end end @@ -27,15 +27,17 @@ describe AuthorizedKeysWorker do expect(instance).to receive(:remove_key).with('foo', 'bar') end - worker.perform(:remove_key, 'foo', 'bar') + worker.perform('remove_key', 'foo', 'bar') end end describe 'all other commands' do - it 'does nothing' do + it 'raises an error' do expect(Gitlab::AuthorizedKeys).not_to receive(:new) - worker.perform(:foo, 'bar', 'baz') + expect do + worker.perform('foo', 'bar', 'baz') + end.to raise_error('Unknown action: "foo"') end end end @@ -48,7 +50,7 @@ describe AuthorizedKeysWorker do it 'does nothing' do expect(Gitlab::AuthorizedKeys).not_to receive(:new) - worker.perform(:add_key, 'foo', 'bar') + worker.perform('add_key', 'foo', 'bar') end end end diff --git a/spec/workers/gitlab_shell_worker_spec.rb b/spec/workers/gitlab_shell_worker_spec.rb index f5884e5e8f8..0e63f48d3e8 100644 --- a/spec/workers/gitlab_shell_worker_spec.rb +++ b/spec/workers/gitlab_shell_worker_spec.rb @@ -12,7 +12,7 @@ describe GitlabShellWorker do expect(instance).to receive(:add_key).with('foo', 'bar') end - worker.perform(:add_key, 'foo', 'bar') + worker.perform('add_key', 'foo', 'bar') end end @@ -22,7 +22,7 @@ describe GitlabShellWorker do expect(instance).to receive(:remove_key).with('foo', 'bar') end - worker.perform(:remove_key, 'foo', 'bar') + worker.perform('remove_key', 'foo', 'bar') end end @@ -32,7 +32,7 @@ describe GitlabShellWorker do expect(instance).to receive(:foo).with('bar', 'baz') end - worker.perform(:foo, 'bar', 'baz') + worker.perform('foo', 'bar', 'baz') end end end |