diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-15 10:12:06 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-15 10:12:06 +0000 |
commit | 659ec83b845e85c27acf70764f95203aff2075ab (patch) | |
tree | 535e0078ebd8697838d82347d822aaaa0c532554 /features | |
parent | 2b3313697f370d31abdda4177701ba20b66ba3e6 (diff) | |
parent | d73458bbc51acf98bc2a2d4d86e10136ab75ca31 (diff) | |
download | gitlab-ce-659ec83b845e85c27acf70764f95203aff2075ab.tar.gz |
Merge branch 'ce-rc/move-more-ee-only-spec-files' into 'master'
Port some changes from gitlab-ee!4532 back to CE
See merge request gitlab-org/gitlab-ce!17120
Diffstat (limited to 'features')
-rw-r--r-- | features/support/env.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/features/support/env.rb b/features/support/env.rb index 7f5b4c1c11b..15211995918 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -20,15 +20,16 @@ Dir["#{Rails.root}/features/steps/shared/*.rb"].each { |file| require file } Spinach.hooks.before_run do include RSpec::Mocks::ExampleMethods + include ActiveJob::TestHelper + include FactoryBot::Syntax::Methods + include GitlabRoutingHelper + 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 FactoryBot::Syntax::Methods - include GitlabRoutingHelper end Spinach.hooks.after_scenario do |scenario_data, step_definitions| |