diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-14 15:08:31 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-14 15:08:31 +0200 |
| commit | 9649f9387a4ef3c40bc2720053b716c987255363 (patch) | |
| tree | 9a6458ce801cd27dfa96f0971fcd7fd7c8a60df4 | |
| parent | 9011a3223448a68a77a599c6a38fb338ccfa3f1e (diff) | |
| download | gitlab-ce-9649f9387a4ef3c40bc2720053b716c987255363.tar.gz | |
Fix tests for web editor
| -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 |