Fix tests for web editor

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

spec/support/test_env.rb

@@ -40,9 +40,6 @@ module TestEnv
     # Setup GitLab shell for test instance
     setup_gitlab_shell
 
-    # Skip pre-receive check so we can use web editor
-    disable_pre_receive
-
     # Create repository for FactoryGirl.create(:project)
     setup_factory_repo