diff options
| author | Desiree Chevalier <dchevalier@gitlab.com> | 2019-08-28 12:32:05 -0400 |
|---|---|---|
| committer | Desiree Chevalier <dchevalier@gitlab.com> | 2019-08-30 15:18:07 -0400 |
| commit | d3293e49e82183d96f637fd5683c5790ba4db236 (patch) | |
| tree | b6bd68fc3c06fffcd7603e4e48bb2011d85e2d19 | |
| parent | a0a6a2fd89bcc9bd16c9d00dee2076eb2169968e (diff) | |
| download | gitlab-ce-d3293e49e82183d96f637fd5683c5790ba4db236.tar.gz | |
Backport EE changes for built-in project template testqa-add-built-in-project-template-test-ce
| -rw-r--r-- | app/views/projects/project_templates/_built_in_templates.html.haml | 4 | ||||
| -rw-r--r-- | qa/qa/page/project/show.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/project_templates/_built_in_templates.html.haml b/app/views/projects/project_templates/_built_in_templates.html.haml index d1c09e83fd3..a583eb39eb3 100644 --- a/app/views/projects/project_templates/_built_in_templates.html.haml +++ b/app/views/projects/project_templates/_built_in_templates.html.haml @@ -1,5 +1,5 @@ - Gitlab::ProjectTemplate.all.each do |template| - .template-option.d-flex.align-items-center + .template-option.d-flex.align-items-center{ data: { qa_selector: 'template_option_row' } } .logo.append-right-10.px-1 = image_tag template.logo, size: 32, class: "btn-template-icon icon-#{template.name}" .description @@ -13,5 +13,5 @@ = _("Preview") %label.btn.btn-success.template-button.choose-template.append-bottom-0{ for: template.name } %input{ type: "radio", autocomplete: "off", name: "project[template_name]", id: template.name, value: template.name, data: { track_label: "template_use", track_property: template.name, track_event: "click_button", track_value: "" } } - %span + %span{ data: { qa_selector: 'use_template_button' } } = _("Use template") diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb index 850a96d87b0..549992f271b 100644 --- a/qa/qa/page/project/show.rb +++ b/qa/qa/page/project/show.rb @@ -132,4 +132,4 @@ module QA end end -QA::Page::Project.prepend_if_ee('QA::EE::Page::Project::Show') +QA::Page::Project::Show.prepend_if_ee('QA::EE::Page::Project::Show') |