From f00286bc0c5aa01431cc2b337e9db374e68a8395 Mon Sep 17 00:00:00 2001
From: Mark Lapierre <mlapierre@gitlab.com>
Date: Tue, 7 May 2019 12:43:10 +1000
Subject: [PATCH] Add branch_name qa selector

Uses the branch_name element to find a branch with a specific
name, instead of using a dynamic CSS class that can't be validated
by the sanity selector test
---
 app/views/projects/branches/_branch.html.haml |  2 +-
 qa/qa/page/base.rb                            |  8 +++----
 qa/qa/page/project/branches/show.rb           |  3 ++-
 qa/qa/support/page/logging.rb                 | 22 +++++++++++--------
 qa/spec/page/logging_spec.rb                  |  9 +++++++-
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index 91c51d5e091..0e15f581ddc 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -10,7 +10,7 @@
   .branch-info
     .branch-title
       = sprite_icon('fork', size: 12)
-      = link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated-100 ref-name prepend-left-8' do
+      = link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated-100 ref-name prepend-left-8 qa-branch-name' do
         = branch.name
       - if branch.name == @repository.root_ref
         %span.badge.badge-primary.prepend-left-5 default
diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb
index 9fabf83e2ce..c395e5f6011 100644
--- a/qa/qa/page/base.rb
+++ b/qa/qa/page/base.rb
@@ -113,8 +113,8 @@ module QA
         has_css?(element_selector_css(name), wait: wait, text: text)
       end
 
-      def has_no_element?(name, wait: Capybara.default_max_wait_time)
-        has_no_css?(element_selector_css(name), wait: wait)
+      def has_no_element?(name, text: nil, wait: Capybara.default_max_wait_time)
+        has_no_css?(element_selector_css(name), wait: wait, text: text)
       end
 
       def has_text?(text)
@@ -129,8 +129,8 @@ module QA
         has_no_css?('.fa-spinner', wait: Capybara.default_max_wait_time)
       end
 
-      def within_element(name)
-        page.within(element_selector_css(name)) do
+      def within_element(name, text: nil)
+        page.within(element_selector_css(name), text: text) do
           yield
         end
       end
diff --git a/qa/qa/page/project/branches/show.rb b/qa/qa/page/project/branches/show.rb
index 368e7ac7448..762eacdab15 100644
--- a/qa/qa/page/project/branches/show.rb
+++ b/qa/qa/page/project/branches/show.rb
@@ -7,6 +7,7 @@ module QA
         class Show < Page::Base
           view 'app/views/projects/branches/_branch.html.haml' do
             element :remove_btn
+            element :branch_name
           end
           view 'app/views/projects/branches/_panel.html.haml' do
             element :all_branches
@@ -29,7 +30,7 @@ module QA
 
           def has_no_branch?(branch_name)
             within_element(:all_branches) do
-              has_no_css?(".js-branch-#{branch_name}", wait: Support::Waiter::DEFAULT_MAX_WAIT_TIME)
+              has_no_element?(:branch_name, text: branch_name, wait: Support::Waiter::DEFAULT_MAX_WAIT_TIME)
             end
           end
 
diff --git a/qa/qa/support/page/logging.rb b/qa/qa/support/page/logging.rb
index 69b6332ecce..ff505fdbddd 100644
--- a/qa/qa/support/page/logging.rb
+++ b/qa/qa/support/page/logging.rb
@@ -76,23 +76,18 @@ module QA
           super
         end
 
-        def has_element?(name, text: nil, wait: Capybara.default_max_wait_time)
+        def has_element?(name, **kwargs)
           found = super
 
-          msg = ["has_element? :#{name}"]
-          msg << %Q(with text "#{text}") if text
-          msg << "(wait: #{wait})"
-          msg << "returned: #{found}"
-
-          log(msg.compact.join(' '))
+          log_has_element_or_not('has_element?', name, found, **kwargs)
 
           found
         end
 
-        def has_no_element?(name, wait: Capybara.default_max_wait_time)
+        def has_no_element?(name, **kwargs)
           found = super
 
-          log("has_no_element? :#{name} returned #{found}")
+          log_has_element_or_not('has_no_element?', name, found, **kwargs)
 
           found
         end
@@ -149,6 +144,15 @@ module QA
         def log(msg)
           QA::Runtime::Logger.debug(msg)
         end
+
+        def log_has_element_or_not(method, name, found, **kwargs)
+          msg = ["#{method} :#{name}"]
+          msg << %Q(with text "#{kwargs[:text]}") if kwargs[:text]
+          msg << "(wait: #{kwargs[:wait] || Capybara.default_max_wait_time})"
+          msg << "returned: #{found}"
+
+          log(msg.compact.join(' '))
+        end
       end
     end
   end
diff --git a/qa/spec/page/logging_spec.rb b/qa/spec/page/logging_spec.rb
index 707a7ff6d98..99e96b81a51 100644
--- a/qa/spec/page/logging_spec.rb
+++ b/qa/spec/page/logging_spec.rb
@@ -93,7 +93,14 @@ describe QA::Support::Page::Logging do
     allow(page).to receive(:has_no_css?).and_return(true)
 
     expect { subject.has_no_element?(:element) }
-      .to output(/has_no_element\? :element returned true/).to_stdout_from_any_process
+      .to output(/has_no_element\? :element \(wait: 2\) returned: true/).to_stdout_from_any_process
+  end
+
+  it 'logs has_no_element? with text' do
+    allow(page).to receive(:has_no_css?).and_return(true)
+
+    expect { subject.has_no_element?(:element, text: "more text") }
+      .to output(/has_no_element\? :element with text \"more text\" \(wait: 2\) returned: true/).to_stdout_from_any_process
   end
 
   it 'logs has_text?' do