diff options
Diffstat (limited to 'spec/support/test_env.rb')
-rw-r--r-- | spec/support/test_env.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 24fee7c0379..1c150cbfe25 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -19,8 +19,6 @@ module TestEnv # See gitlab.yml.example test section for paths # def init(opts = {}) - RSpec::Mocks::setup(self) - # Disable mailer for spinach tests disable_mailer if opts[:mailer] == false @@ -49,7 +47,7 @@ module TestEnv end def enable_mailer - NotificationService.any_instance.unstub(:mailer) + allow_any_instance_of(NotificationService).to receive(:mailer).and_call_original end def setup_gitlab_shell |