diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-12 23:48:38 +0000 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-05-18 20:36:26 -0600 |
| commit | d1ed9640eae8b839b82a99c87d5f2eddbb42b37f (patch) | |
| tree | 56d526430ca9df5cdd594d7ca73087d30ddf5cb6 /features | |
| parent | a72a3cc25140b68f0868e834c2e246982fa9f44d (diff) | |
| download | gitlab-ce-d1ed9640eae8b839b82a99c87d5f2eddbb42b37f.tar.gz | |
Merge branch 'dm-wait-for-requests' into 'master'
Wait for requests after each Spinach scenario instead of feature
See merge request !11349
Diffstat (limited to 'features')
| -rw-r--r-- | features/support/env.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/features/support/env.rb b/features/support/env.rb index 568eeae4479..23a1f702068 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -30,8 +30,8 @@ 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') +Spinach.hooks.after_scenario do |scenario_data, step_definitions| + if scenario_data.tags.include?('javascript') include WaitForRequests wait_for_requests_complete end |