diff options
| author | Mark Lapierre <mlapierre@gitlab.com> | 2019-05-22 15:04:04 +1000 |
|---|---|---|
| committer | Mark Lapierre <mlapierre@gitlab.com> | 2019-05-24 12:57:22 +1000 |
| commit | a3f88356b533b9991fbf360ded47155050fa49e2 (patch) | |
| tree | c1a409686fa984d96933eadf8f953e7fe167e5f6 | |
| parent | d64e6cabc71beaba5dc726aad76050ae61305016 (diff) | |
| download | gitlab-ce-qa-reload-to-check-branches-deleted.tar.gz | |
Reload page to check if branch is deletedqa-reload-to-check-branches-deleted
When the "Delete merged branches" button is used the UI doesn't
update automatically. So when the page is refreshed it's possible
that the branch will still be present.
This checks for the branch to be gone and reloads if it is not,
repeating until the default timeout (60s).
| -rw-r--r-- | qa/qa/page/project/branches/show.rb | 8 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/qa/qa/page/project/branches/show.rb b/qa/qa/page/project/branches/show.rb index 762eacdab15..480fc7d78cb 100644 --- a/qa/qa/page/project/branches/show.rb +++ b/qa/qa/page/project/branches/show.rb @@ -28,9 +28,11 @@ module QA finished_loading? end - def has_no_branch?(branch_name) - within_element(:all_branches) do - has_no_element?(:branch_name, text: branch_name, wait: Support::Waiter::DEFAULT_MAX_WAIT_TIME) + def has_no_branch?(branch_name, reload: false) + wait(reload: reload) do + within_element(:all_branches) do + has_no_element?(:branch_name, text: branch_name) + end end end diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb index cf6c24fa873..37a784248d4 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb @@ -84,7 +84,7 @@ module QA page.refresh Page::Project::Branches::Show.perform do |branches_view| - expect(branches_view).to have_no_branch(second_branch) + expect(branches_view).to have_no_branch(second_branch, reload: true) end end end |