Wait for branches to not be present

When testing if branches are deleted, wait for the branch element
to not be present. Do the same for both checks (second and third
branches).

2 files changed, 9 insertions, 14 deletions

diff --git a/qa/qa/page/project/branches/show.rb b/qa/qa/page/project/branches/show.rb
index 922a6ddb086..ba00ecbd535 100644
--- a/qa/qa/page/project/branches/show.rb
+++ b/qa/qa/page/project/branches/show.rb
@@ -27,11 +27,9 @@ module QA
             finished_loading?
           end
 
-          def has_branch_title?(branch_title)
+          def has_no_branch?(branch_name)
             within_element(:all_branches) do
-              within(".item-title") do
-                has_text?(branch_title)
-              end
+              has_no_css?(".js-branch-#{branch_name}")
             end
           end
 
@@ -49,13 +47,12 @@ module QA
             end
           end
 
-          def wait_for_texts_not_to_be_visible(texts)
-            text_not_visible = wait do
-              texts.all? do |text|
-                has_no_text?(text)
-              end
+          def wait_for_branch_not_present(branch_name)
+            branch_not_present = wait(reload: false) do
+              has_no_branch?(branch_name)
             end
-            raise "Expected text(s) #{texts} not to be visible" unless text_not_visible
+
+            raise "Expected branch `#{branch_name}` not to be present" unless branch_not_present
           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 daeee665c93..ac6458385d9 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
@@ -72,10 +72,9 @@ module QA
 
         Page::Project::Branches::Show.perform do |branches_view|
           branches_view.delete_branch(third_branch)
+          branches_view.wait_for_branch_not_present(third_branch)
         end
 
-        expect(page).not_to have_content(third_branch)
-
         Page::Project::Branches::Show.perform(&:delete_merged_branches)
 
         expect(page).to have_content(
@@ -84,8 +83,7 @@ module QA
 
         page.refresh
         Page::Project::Branches::Show.perform do |branches_view|
-          branches_view.wait_for_texts_not_to_be_visible([commit_message_of_second_branch])
-          expect(branches_view).not_to have_branch_title(second_branch)
+          branches_view.wait_for_branch_not_present(second_branch)
         end
       end
     end