diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-26 11:48:35 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-26 11:48:35 +0000 |
| commit | ebccceae8ab17d45a7feef091e1d0172f1474d2d (patch) | |
| tree | 12fb07b9f614bec7e5bd72246fe0a40a283e873d /features | |
| parent | f8f49cf516dd1055b5ee47172bf5997c3f679503 (diff) | |
| parent | ccaf6ea59ab44e917125b411f17404e32f2d735a (diff) | |
| download | gitlab-ce-ebccceae8ab17d45a7feef091e1d0172f1474d2d.tar.gz | |
Merge branch '31439-fix-transient-spinach-failures' into 'master'
Wait for AJAX after steps defined in SharedActiveTab
Closes #31439
See merge request !10935
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/shared/active_tab.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/features/steps/shared/active_tab.rb b/features/steps/shared/active_tab.rb index 4eef7aff213..8bae80a8707 100644 --- a/features/steps/shared/active_tab.rb +++ b/features/steps/shared/active_tab.rb @@ -1,5 +1,10 @@ module SharedActiveTab include Spinach::DSL + include WaitForAjax + + after do + wait_for_ajax if javascript_test? + end def ensure_active_main_tab(content) expect(find('.layout-nav li.active')).to have_content(content) |