diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-06 17:09:47 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-06 17:09:47 +0000 |
commit | b1ad5c186066f11c21ef165957f6e6c8350b4275 (patch) | |
tree | 5e11a94e60e6d1c28590e0cbed3ffc49799e709f /features/support/env.rb | |
parent | 739e797575d47ec796206865c4d82917cb2ad93d (diff) | |
parent | b7c480d7c010ec9dd8e0aa470f8a8010f1f4e6ba (diff) | |
download | gitlab-ce-b1ad5c186066f11c21ef165957f6e6c8350b4275.tar.gz |
Merge branch 'master' into 'add-index-for-auto_canceled_by_id-mysql'add-index-for-auto_canceled_by_id-mysql
# Conflicts:
# db/schema.rb
Diffstat (limited to 'features/support/env.rb')
-rw-r--r-- | features/support/env.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/features/support/env.rb b/features/support/env.rb index 06c804b1db7..92d13bea4b6 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -10,7 +10,7 @@ if ENV['CI'] Knapsack::Adapters::SpinachAdapter.bind end -%w(select2_helper test_env repo_helpers wait_for_ajax sidekiq).each do |f| +%w(select2_helper test_env repo_helpers wait_for_ajax wait_for_requests sidekiq).each do |f| require Rails.root.join('spec', 'support', f) end @@ -30,6 +30,13 @@ Spinach.hooks.before_run do include FactoryGirl::Syntax::Methods end +Spinach.hooks.after_feature do |feature_data| + if feature_data.scenarios.flat_map(&:tags).include?('javascript') + include WaitForRequests + wait_for_requests_complete + end +end + module StdoutReporterWithScenarioLocation # Override the standard reporter to show filename and line number next to each # scenario for easy, focused re-runs |