diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-13 02:48:38 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-13 02:48:38 +0300 |
| commit | 040fc99177eb620db41940f0c36b731ed612708b (patch) | |
| tree | 7491aafba761fd472dd62fc4e2a1b0a518de79cc /features | |
| parent | cec971b68388834f42749a9c0cb53e4d6c4fc096 (diff) | |
| parent | 718350dc9fbfea4836f0cfb2955d3d8653ba7901 (diff) | |
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 |