diff options
| -rw-r--r-- | features/support/env.rb | 4 | ||||
| -rw-r--r-- | spec/support/test_env.rb | 3 |
2 files changed, 4 insertions, 3 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 diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index a2e8f9054a4..3a678db2dfd 100644 --- a/spec/support/test_env.rb +++ b/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 |