diff options
Diffstat (limited to 'spec/services')
| -rw-r--r-- | spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb | 2 | ||||
| -rw-r--r-- | spec/services/users/set_status_service_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb index 8838742a637..52bbd4e794d 100644 --- a/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb +++ b/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb @@ -95,7 +95,7 @@ describe MergeRequests::MergeWhenPipelineSucceedsService do sha: '1234abcdef', status: 'success') end - it 'it does not merge merge request' do + it 'it does not merge request' do expect(MergeWorker).not_to receive(:perform_async) service.trigger(old_pipeline) end diff --git a/spec/services/users/set_status_service_spec.rb b/spec/services/users/set_status_service_spec.rb index 8a8458ab9de..7c26be48345 100644 --- a/spec/services/users/set_status_service_spec.rb +++ b/spec/services/users/set_status_service_spec.rb @@ -7,7 +7,7 @@ describe Users::SetStatusService do subject(:service) { described_class.new(current_user, params) } describe '#execute' do - context 'when when params are set' do + context 'when params are set' do let(:params) { { emoji: 'taurus', message: 'a random status' } } it 'creates a status' do |