diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 13:40:32 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 13:40:32 +0100 |
| commit | 926c3bef9fbda49d5cab268bcd83355142e945c1 (patch) | |
| tree | 1dc2b7eb13485f0fc656cc913ca56e57b672b62a /spec/support | |
| parent | 1a10945066d0da1801bb4cf89ce5f54996f1756f (diff) | |
| parent | f5430e48b42227f1c1874ca27c6907f0f704be28 (diff) | |
| download | gitlab-ce-reference-pipeline-and-caching.tar.gz | |
Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-caching
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/test_env.rb | 3 | ||||
| -rw-r--r-- | spec/support/wait_for_ajax.rb | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 787670e9297..78b9a0f42fa 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -21,7 +21,8 @@ module TestEnv # We currently only need a subset of the branches FORKED_BRANCH_SHA = { 'add-submodule-version-bump' => '3f547c08', - 'master' => '5937ac0' + 'master' => '5937ac0', + 'remove-submodule' => '2a33e0c0' } # Test environment diff --git a/spec/support/wait_for_ajax.rb b/spec/support/wait_for_ajax.rb new file mode 100644 index 00000000000..692d219e9f1 --- /dev/null +++ b/spec/support/wait_for_ajax.rb @@ -0,0 +1,11 @@ +module WaitForAjax + def wait_for_ajax + Timeout.timeout(Capybara.default_wait_time) do + loop until finished_all_ajax_requests? + end + end + + def finished_all_ajax_requests? + page.evaluate_script('jQuery.active').zero? + end +end |