diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2016-12-30 20:49:59 +0100 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-01-13 09:16:35 -0500 |
| commit | 557a0bf14c79c02c65196ff8f7a2251ecd77073c (patch) | |
| tree | 36cef1d85fbc5541ec15949d5ea42feb8444c6df /spec/services | |
| parent | aa934c7469372cac7b8cd10b49761d90d8e367fa (diff) | |
| download | gitlab-ce-557a0bf14c79c02c65196ff8f7a2251ecd77073c.tar.gz | |
Address MR comments
Diffstat (limited to 'spec/services')
| -rw-r--r-- | spec/services/merge_requests/update_service_spec.rb | 2 | ||||
| -rw-r--r-- | spec/services/slash_commands/interpret_service_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb index c2f6ae29d62..7d73c0ea5d0 100644 --- a/spec/services/merge_requests/update_service_spec.rb +++ b/spec/services/merge_requests/update_service_spec.rb @@ -179,7 +179,7 @@ describe MergeRequests::UpdateService, services: true do it { service.execute(merge_request) } end - context 'MR can not be merged by non authorised user' do + context 'with a non-authorised user' do let(:visitor) { create(:user) } let(:service) { MergeRequests::UpdateService.new(project, visitor, opts) } diff --git a/spec/services/slash_commands/interpret_service_spec.rb b/spec/services/slash_commands/interpret_service_spec.rb index dfcffcc6131..ffcf02d2c56 100644 --- a/spec/services/slash_commands/interpret_service_spec.rb +++ b/spec/services/slash_commands/interpret_service_spec.rb @@ -283,7 +283,7 @@ describe SlashCommands::InterpretService, services: true do end end - context 'non merge request object cant be merged' do + context 'issue can not be merged' do it_behaves_like 'empty command' do let(:content) { "/merge" } let(:issuable) { issue } |
