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

2 files changed, 6 insertions, 3 deletions

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