summaryrefslogtreecommitdiff
path: root/features/support/env.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-12 16:47:06 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-12 16:47:06 -0800
commit1343b2dfac288eb60d536cc3d1a94de1eb178b51 (patch)
tree9b593febf0ca24c2ae4c68fa4a44e058dd512f94 /features/support/env.rb
parentf9880c11f754c278cbd00eb34ea65e90160571db (diff)
parent686000446639fbf0756733c822a1ebb19e09e121 (diff)
downloadgitlab-ce-1343b2dfac288eb60d536cc3d1a94de1eb178b51.tar.gz
Merge pull request #8785 from jvanbaarsen/rspec-upgrade
Rspec upgrade
Diffstat (limited to 'features/support/env.rb')
-rw-r--r--features/support/env.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/support/env.rb b/features/support/env.rb
index 67660777842..be17065ccfd 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -47,8 +47,8 @@ Spinach.hooks.after_scenario do
end
Spinach.hooks.before_run do
+ include RSpec::Mocks::ExampleMethods
TestEnv.init(mailer: false)
- RSpec::Mocks::setup self
include FactoryGirl::Syntax::Methods
end