Merge branch 'rs-include-emailhelpers' into 'master'
Only include EmailHelpers in mailer specs and specs using them See merge request !7836
This commit is contained in:
commit
e91afc0dc0
|
@ -1,6 +1,8 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Ci::Pipeline, models: true do
|
||||
include EmailHelpers
|
||||
|
||||
let(:project) { FactoryGirl.create :empty_project }
|
||||
let(:pipeline) { FactoryGirl.create :ci_empty_pipeline, status: 'created', project: project }
|
||||
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe PipelinesEmailService do
|
||||
include EmailHelpers
|
||||
|
||||
let(:pipeline) do
|
||||
create(:ci_pipeline, project: project, sha: project.commit('master').sha)
|
||||
end
|
||||
|
|
|
@ -2,6 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe API::API, api: true do
|
||||
include ApiHelpers
|
||||
include EmailHelpers
|
||||
|
||||
let(:user) { create(:user) }
|
||||
let(:user2) { create(:user) }
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Issues::UpdateService, services: true do
|
||||
include EmailHelpers
|
||||
|
||||
let(:user) { create(:user) }
|
||||
let(:user2) { create(:user) }
|
||||
let(:user3) { create(:user) }
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe MergeRequests::UpdateService, services: true do
|
||||
include EmailHelpers
|
||||
|
||||
let(:project) { create(:project) }
|
||||
let(:user) { create(:user) }
|
||||
let(:user2) { create(:user) }
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe NotificationService, services: true do
|
||||
include EmailHelpers
|
||||
|
||||
let(:notification) { NotificationService.new }
|
||||
|
||||
around(:each) do |example|
|
||||
|
|
|
@ -32,7 +32,7 @@ RSpec.configure do |config|
|
|||
config.include LoginHelpers, type: :feature
|
||||
config.include SearchHelpers, type: :feature
|
||||
config.include StubConfiguration
|
||||
config.include EmailHelpers
|
||||
config.include EmailHelpers, type: :mailer
|
||||
config.include TestEnv
|
||||
config.include ActiveJob::TestHelper
|
||||
config.include ActiveSupport::Testing::TimeHelpers
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe BuildEmailWorker do
|
||||
include EmailHelpers
|
||||
include RepoHelpers
|
||||
|
||||
let(:build) { create(:ci_build) }
|
||||
|
|
|
@ -2,6 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe EmailsOnPushWorker do
|
||||
include RepoHelpers
|
||||
include EmailHelpers
|
||||
include EmailSpec::Matchers
|
||||
|
||||
let(:project) { create(:project) }
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe PipelineNotificationWorker do
|
||||
include EmailHelpers
|
||||
|
||||
let(:pipeline) do
|
||||
create(:ci_pipeline,
|
||||
project: project,
|
||||
|
|
Loading…
Reference in New Issue