Commit 3bc8a2fe authored by Dan Davison's avatar Dan Davison

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
parents 2e341629 3ca67328
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
= _('Repository') = _('Repository')
- if template_exists?('admin/application_settings/templates') - if template_exists?('admin/application_settings/templates')
= nav_link(path: 'application_settings#templates') do = 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 %span
= _('Templates') = _('Templates')
= nav_link(path: 'application_settings#ci_cd') do = nav_link(path: 'application_settings#ci_cd') do
......
...@@ -3,7 +3,7 @@ module QA ...@@ -3,7 +3,7 @@ module QA
module Component module Component
module Select2 module Select2
def select_item(item_text) 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 end
def clear_current_selection_if_present def clear_current_selection_if_present
......
...@@ -24,11 +24,14 @@ module QA ...@@ -24,11 +24,14 @@ module QA
end end
def choose_test_namespace def choose_test_namespace
choose_namespace(Runtime::Namespace.path)
end
def choose_namespace(namespace)
retry_on_exception do retry_on_exception do
click_body click_body
click_element :project_namespace_select click_element :project_namespace_select
search_and_select(namespace)
search_and_select(Runtime::Namespace.path)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment