summaryrefslogtreecommitdiff
path: root/features/support
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-14 15:08:31 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-14 15:08:31 +0200
commit9649f9387a4ef3c40bc2720053b716c987255363 (patch)
tree9a6458ce801cd27dfa96f0971fcd7fd7c8a60df4 /features/support
parent9011a3223448a68a77a599c6a38fb338ccfa3f1e (diff)
downloadgitlab-ce-9649f9387a4ef3c40bc2720053b716c987255363.tar.gz
Fix tests for web editor
Diffstat (limited to 'features/support')
-rw-r--r--features/support/env.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/features/support/env.rb b/features/support/env.rb
index 672251af084..62c80b9c948 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -28,5 +28,9 @@ Spinach.hooks.before_run do
RSpec::Mocks.setup
TestEnv.init(mailer: false)
+ # skip pre-receive hook check so we can use
+ # web editor and merge
+ TestEnv.disable_pre_receive
+
include FactoryGirl::Syntax::Methods
end