diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-08-02 19:43:51 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-08-03 16:55:48 +0300 |
commit | bb5f79d43e0bb20bacd5ecd8b66832d9857bd079 (patch) | |
tree | b480f8496e3e93e5a845e4a710e2d46901871413 /spec/services/merge_requests | |
parent | b0464fa4e19e187adc46ec054ccd68832faec08c (diff) |
Don't include EmailHelpers manually, pick with rspec
`:mailer` is needed to pick it easily, while
`type: :mailer` is needed for picking it automatically for
tests located in spec/mailers/*_spec.rb
It's a bit complicated in spec/services/notification_service_spec.rb
but we'll leave it alone for now.
Diffstat (limited to 'spec/services/merge_requests')
-rw-r--r-- | spec/services/merge_requests/update_service_spec.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb index dd3ac9c4ac6..9368594bc86 100644 --- a/spec/services/merge_requests/update_service_spec.rb +++ b/spec/services/merge_requests/update_service_spec.rb @@ -1,8 +1,6 @@ require 'spec_helper' -describe MergeRequests::UpdateService do - include EmailHelpers - +describe MergeRequests::UpdateService, :mailer do let(:project) { create(:project, :repository) } let(:user) { create(:user) } let(:user2) { create(:user) } |