Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 5 deletions

diff --git a/qa/qa/page/group/new.rb b/qa/qa/page/group/new.rb
index 66afcf7547c..c24712b9418 100644
--- a/qa/qa/page/group/new.rb
+++ b/qa/qa/page/group/new.rb
@@ -21,6 +21,10 @@ module QA
           element :connect_instance_button
         end
 
+        view 'app/assets/javascripts/vue_shared/new_namespace/components/welcome.vue' do
+          element :panel_link
+        end
+
         def set_path(path)
           fill_element(:group_path_field, path)
           fill_element(:group_name_field, path)
@@ -62,7 +66,7 @@ module QA
         end
 
         def switch_to_import_tab
-          click_element("import-group-pane_link")
+          click_element(:panel_link, panel_name: 'import-group-pane')
         end
       end
     end
diff --git a/qa/qa/page/project/new.rb b/qa/qa/page/project/new.rb
index b14afa90442..6e5da450def 100644
--- a/qa/qa/page/project/new.rb
+++ b/qa/qa/page/project/new.rb
@@ -25,16 +25,15 @@ module QA
         end
 
         view 'app/assets/javascripts/vue_shared/new_namespace/components/welcome.vue' do
-          element :blank_project_link, ':data-qa-selector="`${panel.name}_link`"' # rubocop:disable QA/ElementWithPattern
-          element :create_from_template_link, ':data-qa-selector="`${panel.name}_link`"' # rubocop:disable QA/ElementWithPattern
+          element :panel_link
         end
 
         def click_blank_project_link
-          click_element :blank_project_link
+          click_element(:panel_link, panel_name: 'blank_project')
         end
 
         def click_create_from_template_link
-          click_element :create_from_template_link
+          click_element(:panel_link, panel_name: 'create_from_template')
         end
 
         def choose_test_namespace