Incorporate review feedback

cf92079d · Erick Banks · 40078e31 · cf92079d · cf92079d · cf92079d
Commit cf92079d authored 3 years ago by Erick Banks
--- a/qa/qa/page/project/pipeline_editor/show.rb
+++ b/qa/qa/page/project/pipeline_editor/show.rb
@@ -20,17 +20,23 @@ def has_branch_selector_button?

          def click_branch_selector_button
            wait_until(reload: false) do
-              find_element(:branch_selector_button)
+              has_element?(:branch_selector_button)
            end
            click_element(:branch_selector_button, skip_finished_loading_check: true)
          end

          def select_branch_from_dropdown(branch_to_switch_to)
-            click_element(:menu_branch_button, text: branch_to_switch_to, skip_finished_loading_check: true) if has_element?(:menu_branch_button, wait: 2)
+            wait_until(reload: false) do
+              has_element?(:menu_branch_button)
+            end
+            click_element(:menu_branch_button, text: branch_to_switch_to, skip_finished_loading_check: true)
          end

          def target_branch_name
-            find_element(:target_branch_field, skip_finished_loading_check: true).value if has_element?(:target_branch_field, wait: 2)
+            wait_until(reload: false) do
+              has_element?(:target_branch_field)
+            end
+            find_element(:target_branch_field, skip_finished_loading_check: true).value
          end
        end
      end

--- a/qa/qa/page/project/sub_menus/ci_cd.rb
+++ b/qa/qa/page/project/sub_menus/ci_cd.rb
@@ -21,12 +21,6 @@ def click_ci_cd_pipelines
            end
          end

-          def click_pipelines_editor
-            within_sidebar do
-              click_element(:sidebar_menu_item_link, menu_item: 'Editor')
-            end
-          end
-
          def go_to_pipeline_editor
            hover_ci_cd_pipelines do
              within_submenu do

--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_branch_switcher_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_branch_switcher_spec.rb
@@ -5,7 +5,7 @@ module QA
    describe 'Pipeline editor', :requires_admin do
      let(:project) do
        Resource::Project.fabricate_via_api! do |project|
-          project.name = "pipeline-editor-project"
+          project.name = 'pipeline-editor-project'
        end
      end

@@ -75,7 +75,6 @@ module QA
          expect(show).to have_branch_selector_button

          show.click_branch_selector_button
-
          show.select_branch_from_dropdown(production_push.branch_name)

          expect(show.target_branch_name).to eq(production_push.branch_name)