diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-08-20 22:19:19 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-08-20 22:19:19 +0300 |
commit | 3d51a6d4351c6a15c92762f5710a967374d0c59b (patch) | |
tree | 10c5e87e0add51ef0bdcc9be42ac0176907a080c /spec/services | |
parent | 8ec5fb138dde9937814ac138352177399d3e776d (diff) | |
parent | 8819007c83fdf1ac642836640a37cc541f6eddc6 (diff) |
Merge branch 'master' into reply-by-email
Diffstat (limited to 'spec/services')
-rw-r--r-- | spec/services/merge_requests/create_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/services/merge_requests/merge_service_spec.rb | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb index d9bfdf64308..cc64d69361e 100644 --- a/spec/services/merge_requests/create_service_spec.rb +++ b/spec/services/merge_requests/create_service_spec.rb @@ -10,7 +10,7 @@ describe MergeRequests::CreateService do { title: 'Awesome merge_request', description: 'please fix', - source_branch: 'stable', + source_branch: 'feature', target_branch: 'master' } end diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb index 0a25fb12f4e..7b564d34d7b 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -24,11 +24,6 @@ describe MergeRequests::MergeService do it { expect(merge_request).to be_valid } it { expect(merge_request).to be_merged } - it 'should execute hooks with merge action' do - expect(service).to have_received(:execute_hooks). - with(merge_request, 'merge') - end - it 'should send email to user2 about merge of new merge_request' do email = ActionMailer::Base.deliveries.last expect(email.to.first).to eq(user2.email) |