From d1ed9640eae8b839b82a99c87d5f2eddbb42b37f Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 12 May 2017 23:48:38 +0000 Subject: Merge branch 'dm-wait-for-requests' into 'master' Wait for requests after each Spinach scenario instead of feature See merge request !11349 --- features/support/env.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'features') 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 -- cgit v1.2.1