diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-08-03 00:43:51 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-08-03 21:55:48 +0800 |
commit | bb5f79d43e0bb20bacd5ecd8b66832d9857bd079 (patch) | |
tree | b480f8496e3e93e5a845e4a710e2d46901871413 /spec/requests/api | |
parent | b0464fa4e19e187adc46ec054ccd68832faec08c (diff) | |
download | gitlab-ce-bb5f79d43e0bb20bacd5ecd8b66832d9857bd079.tar.gz |
Don't include EmailHelpers manually, pick with rspecuse-rspec-support-helper
`: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/requests/api')
-rw-r--r-- | spec/requests/api/issues_spec.rb | 4 | ||||
-rw-r--r-- | spec/requests/api/v3/issues_spec.rb | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb index 60687db9316..7d120e4a234 100644 --- a/spec/requests/api/issues_spec.rb +++ b/spec/requests/api/issues_spec.rb @@ -1,8 +1,6 @@ require 'spec_helper' -describe API::Issues do - include EmailHelpers - +describe API::Issues, :mailer do set(:user) { create(:user) } set(:project) do create(:project, :public, creator_id: user.id, namespace: user.namespace) diff --git a/spec/requests/api/v3/issues_spec.rb b/spec/requests/api/v3/issues_spec.rb index b092c863c8a..9eb538c4b09 100644 --- a/spec/requests/api/v3/issues_spec.rb +++ b/spec/requests/api/v3/issues_spec.rb @@ -1,8 +1,6 @@ require 'spec_helper' -describe API::V3::Issues do - include EmailHelpers - +describe API::V3::Issues, :mailer do let(:user) { create(:user) } let(:user2) { create(:user) } let(:non_member) { create(:user) } |