summaryrefslogtreecommitdiff
path: root/qa/qa/page/project/branches/show.rb
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2019-01-24 13:11:52 -0500
committerMark Lapierre <mlapierre@gitlab.com>2019-01-25 09:07:55 -0500
commitdbb5324881c04d7abb328a7af25b3c72a4991adf (patch)
tree92fab227ab087a15fdc1e0c336d526de61e9d277 /qa/qa/page/project/branches/show.rb
parenta05cef5b5695136bc8ada2625e500cd114539b2c (diff)
downloadgitlab-ce-dbb5324881c04d7abb328a7af25b3c72a4991adf.tar.gz
Fix failing E2E test
Sometimes add_list_delete_branches_spec.rb would not wait after deleting a branch before checking that the branch was done. It would fail when the UI was still processing. This checks that the loading icon is gone before returning from delete_branch. It also makes sure credentials are added properly after recent changes to QA::Git::Repository
Diffstat (limited to 'qa/qa/page/project/branches/show.rb')
-rw-r--r--qa/qa/page/project/branches/show.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/qa/qa/page/project/branches/show.rb b/qa/qa/page/project/branches/show.rb
index 762a97e2088..922a6ddb086 100644
--- a/qa/qa/page/project/branches/show.rb
+++ b/qa/qa/page/project/branches/show.rb
@@ -19,10 +19,12 @@ module QA
within_element(:all_branches) do
within(".js-branch-#{branch_name}") do
accept_alert do
- find_element(:remove_btn).click
+ click_element(:remove_btn)
end
end
end
+
+ finished_loading?
end
def has_branch_title?(branch_title)