diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-21 15:05:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-21 15:05:58 +0000 |
commit | ad1e4b8fb8104b642fa79ed34fd144bc2bed8a19 (patch) | |
tree | 78f95d63d4ea5ed0b1a8b3c83c38d9cbd682f884 /qa | |
parent | 664c4c7b49c6056136299817eb79e9f1de83e567 (diff) | |
download | gitlab-ce-ad1e4b8fb8104b642fa79ed34fd144bc2bed8a19.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/page/component/select2.rb | 8 | ||||
-rw-r--r-- | qa/qa/page/file/shared/commit_button.rb | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/qa/qa/page/component/select2.rb b/qa/qa/page/component/select2.rb index d05c44d22b2..8fe6a4a75b3 100644 --- a/qa/qa/page/component/select2.rb +++ b/qa/qa/page/component/select2.rb @@ -20,12 +20,20 @@ module QA def search_and_select(item_text) find('.select2-input').set(item_text) + + wait_for_search_to_complete + select_item(item_text) end def expand_select_list find('span.select2-arrow').click end + + def wait_for_search_to_complete + has_css?('.select2-active') + has_no_css?('.select2-active', wait: 30) + end end end end diff --git a/qa/qa/page/file/shared/commit_button.rb b/qa/qa/page/file/shared/commit_button.rb index d8e751dd7b6..559b4c6ceea 100644 --- a/qa/qa/page/file/shared/commit_button.rb +++ b/qa/qa/page/file/shared/commit_button.rb @@ -13,6 +13,10 @@ module QA def commit_changes click_element(:commit_button) + + wait(reload: false, max: 60) do + finished_loading? + end end end end |