Merge branch 'qa-project-from-instance-project-template-ce' into 'master'

CE port of "e2e test for creating a project from instance template"

See merge request gitlab-org/gitlab-ce!25760

3 files changed, 7 insertions, 4 deletions

diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml
index 2fdd65f639b..bb2d206ba91 100644
--- a/app/views/layouts/nav/sidebar/_admin.html.haml
+++ b/app/views/layouts/nav/sidebar/_admin.html.haml
@@ -220,7 +220,7 @@
                   = _('Repository')
             - if template_exists?('admin/application_settings/templates')
               = nav_link(path: 'application_settings#templates') do
-                = link_to templates_admin_application_settings_path, title: _('Templates') do
+                = link_to templates_admin_application_settings_path, title: _('Templates'), class: 'qa-admin-settings-template-item' do
                   %span
                     = _('Templates')
             = nav_link(path: 'application_settings#ci_cd') do
diff --git a/qa/qa/page/component/select2.rb b/qa/qa/page/component/select2.rb
index 98bcb96b92c..3c3461d6b20 100644
--- a/qa/qa/page/component/select2.rb
+++ b/qa/qa/page/component/select2.rb
@@ -3,7 +3,7 @@ module QA
     module Component
       module Select2
         def select_item(item_text)
-          find('.select2-result-label', text: item_text).click
+          find('.select2-result-label', text: item_text, match: :prefer_exact).click
         end
 
         def clear_current_selection_if_present
diff --git a/qa/qa/page/project/new.rb b/qa/qa/page/project/new.rb
index eabeae1acc4..552b2293115 100644
--- a/qa/qa/page/project/new.rb
+++ b/qa/qa/page/project/new.rb
@@ -24,11 +24,14 @@ module QA
         end
 
         def choose_test_namespace
+          choose_namespace(Runtime::Namespace.path)
+        end
+
+        def choose_namespace(namespace)
           retry_on_exception do
             click_body
             click_element :project_namespace_select
-
-            search_and_select(Runtime::Namespace.path)
+            search_and_select(namespace)
           end
         end