Commit 49f538c7 authored by Mark Lapierre's avatar Mark Lapierre

Merge branch '6861-group-level-project-templates-QA-tests-take-2-ce' into 'master'

CE port of "e2e QA tests for Group level project templates"

See merge request gitlab-org/gitlab-ce!23987
parents abe4e325 a1ca9ad0
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
%span.d-block.d-sm-none Blank %span.d-block.d-sm-none Blank
%li.nav-item{ role: 'presentation' } %li.nav-item{ role: 'presentation' }
%a.nav-link{ href: '#create-from-template-pane', id: 'create-from-template-tab', data: { toggle: 'tab', track_label: 'create_from_template', track_event: "click_tab" }, role: 'tab' } %a.nav-link{ href: '#create-from-template-pane', id: 'create-from-template-tab', data: { toggle: 'tab', track_label: 'create_from_template', track_event: "click_tab" }, role: 'tab' }
%span.d-none.d-sm-block Create from template %span.d-none.d-sm-block.qa-project-create-from-template-tab Create from template
%span.d-block.d-sm-none Template %span.d-block.d-sm-none Template
%li.nav-item{ role: 'presentation' } %li.nav-item{ role: 'presentation' }
%a.nav-link{ href: '#import-project-pane', id: 'import-project-tab', data: { toggle: 'tab', track_label: 'import_project', track_event: "click_tab" }, role: 'tab' } %a.nav-link{ href: '#import-project-pane', id: 'import-project-tab', data: { toggle: 'tab', track_label: 'import_project', track_event: "click_tab" }, role: 'tab' }
......
...@@ -6,6 +6,12 @@ module QA ...@@ -6,6 +6,12 @@ module QA
find('.select2-result-label', text: item_text).click find('.select2-result-label', text: item_text).click
end end
def clear_current_selection_if_present
if has_css?('a > abbr.select2-search-choice-close', wait: 1.0)
find('a > abbr.select2-search-choice-close').click
end
end
def search_and_select(item_text) def search_and_select(item_text)
find('.select2-input').set(item_text) find('.select2-input').set(item_text)
select_item(item_text) select_item(item_text)
......
...@@ -5,6 +5,7 @@ module QA ...@@ -5,6 +5,7 @@ module QA
include Page::Component::Select2 include Page::Component::Select2
view 'app/views/projects/new.html.haml' do view 'app/views/projects/new.html.haml' do
element :project_create_from_template_tab
element :import_project_tab, "Import project" # rubocop:disable QA/ElementWithPattern element :import_project_tab, "Import project" # rubocop:disable QA/ElementWithPattern
end end
...@@ -44,6 +45,10 @@ module QA ...@@ -44,6 +45,10 @@ module QA
click_on 'Create project' click_on 'Create project'
end end
def go_to_create_from_template
click_element(:project_create_from_template_tab)
end
def set_visibility(visibility) def set_visibility(visibility)
choose visibility choose visibility
end end
......
...@@ -11,7 +11,7 @@ module QA ...@@ -11,7 +11,7 @@ module QA
wait(reload: false) do wait(reload: false) do
click_button 'Expand' unless first('button', text: 'Collapse') click_button 'Expand' unless first('button', text: 'Collapse')
page.has_content?('Collapse') has_content?('Collapse')
end end
yield if block_given? yield if block_given?
......
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