summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-02-13 17:48:31 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-22 12:12:49 +0200
commitf3d99a1e9c742081148bdb66aa0fa4e19fc20b64 (patch)
tree0450d7bad4a640373fc22f517ce8619ab2c11893 /features
parent75f7a9648ea7b0ad09ab54dc62a925b1733d9c01 (diff)
downloadgitlab-ce-f3d99a1e9c742081148bdb66aa0fa4e19fc20b64.tar.gz
Started on the actual rspec 3 upgrade
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Diffstat (limited to 'features')
-rw-r--r--features/support/env.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/features/support/env.rb b/features/support/env.rb
index d4a878ea4ce..672251af084 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -25,6 +25,7 @@ WebMock.allow_net_connect!
Spinach.hooks.before_run do
include RSpec::Mocks::ExampleMethods
+ RSpec::Mocks.setup
TestEnv.init(mailer: false)
include FactoryGirl::Syntax::Methods