Commit 1c72c599 authored by Dan Davison's avatar Dan Davison

Merge branch '247891-qa-page-main-signup-missing-view-partial' into 'master'

Resolve "QA::Page::Main::SignUp - Missing view partial" [RUN AS-IF-FOSS]

Closes #247891

See merge request gitlab-org/gitlab!42087
parents a6dde030 9e52a3c6
...@@ -512,6 +512,7 @@ ...@@ -512,6 +512,7 @@
- <<: *if-security-merge-request - <<: *if-security-merge-request
changes: *db-patterns changes: *db-patterns
- <<: *if-merge-request-title-as-if-foss - <<: *if-merge-request-title-as-if-foss
changes: *db-patterns
- <<: *if-merge-request - <<: *if-merge-request
changes: *ci-patterns changes: *ci-patterns
...@@ -522,6 +523,7 @@ ...@@ -522,6 +523,7 @@
- <<: *if-security-merge-request - <<: *if-security-merge-request
changes: *backend-patterns changes: *backend-patterns
- <<: *if-merge-request-title-as-if-foss - <<: *if-merge-request-title-as-if-foss
changes: *backend-patterns
- <<: *if-merge-request - <<: *if-merge-request
changes: *ci-patterns changes: *ci-patterns
...@@ -532,6 +534,7 @@ ...@@ -532,6 +534,7 @@
- <<: *if-security-merge-request - <<: *if-security-merge-request
changes: *backend-patterns changes: *backend-patterns
- <<: *if-merge-request-title-as-if-foss - <<: *if-merge-request-title-as-if-foss
changes: *backend-patterns
- <<: *if-merge-request - <<: *if-merge-request
changes: *ci-patterns changes: *ci-patterns
...@@ -542,6 +545,7 @@ ...@@ -542,6 +545,7 @@
- <<: *if-security-merge-request - <<: *if-security-merge-request
changes: *code-backstage-patterns changes: *code-backstage-patterns
- <<: *if-merge-request-title-as-if-foss - <<: *if-merge-request-title-as-if-foss
changes: *code-backstage-patterns
- <<: *if-merge-request - <<: *if-merge-request
changes: *ci-patterns changes: *ci-patterns
......
...@@ -58,6 +58,7 @@ module QA ...@@ -58,6 +58,7 @@ module QA
module Main module Main
autoload :Banner, 'qa/ee/page/main/banner' autoload :Banner, 'qa/ee/page/main/banner'
autoload :Menu, 'qa/ee/page/main/menu' autoload :Menu, 'qa/ee/page/main/menu'
autoload :SignUp, 'qa/ee/page/main/sign_up'
end end
module Admin module Admin
......
# frozen_string_literal: true
module QA
module EE
module Page
module Main
module SignUp
extend QA::Page::PageConcern
def self.included(base)
super
base.view 'ee/app/views/registrations/welcome/_button.html.haml' do
element :get_started_button
end
end
private
# override FOSS
def click_get_started_button
click_element :get_started_button if has_element?(:get_started_button)
end
end
end
end
end
end
...@@ -14,10 +14,6 @@ module QA ...@@ -14,10 +14,6 @@ module QA
element :new_user_accept_terms_checkbox element :new_user_accept_terms_checkbox
end end
view 'ee/app/views/registrations/welcome/_button.html.haml' do
element :get_started_button
end
def sign_up!(user) def sign_up!(user)
fill_element :new_user_name_field, user.name fill_element :new_user_name_field, user.name
fill_element :new_user_username_field, user.username fill_element :new_user_username_field, user.username
...@@ -30,14 +26,22 @@ module QA ...@@ -30,14 +26,22 @@ module QA
signed_in = retry_until do signed_in = retry_until do
click_element :new_user_register_button if has_element?(:new_user_register_button) click_element :new_user_register_button if has_element?(:new_user_register_button)
click_element :get_started_button if has_element?(:get_started_button) click_get_started_button
Page::Main::Menu.perform(&:has_personal_area?) Page::Main::Menu.perform(&:has_personal_area?)
end end
raise "Failed to register and sign in" unless signed_in raise "Failed to register and sign in" unless signed_in
end end
private
# overridden in EE
def click_get_started_button
end
end end
end end
end end
end end
QA::Page::Main::SignUp.prepend_if_ee('QA::EE::Page::Main::SignUp')
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