diff options
Diffstat (limited to 'qa/qa/page/main')
| -rw-r--r-- | qa/qa/page/main/login.rb | 4 | ||||
| -rw-r--r-- | qa/qa/page/main/sign_up.rb | 16 |
2 files changed, 9 insertions, 11 deletions
diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb index 8eb28eb53e7..265e2b7573c 100644 --- a/qa/qa/page/main/login.rb +++ b/qa/qa/page/main/login.rb @@ -125,9 +125,9 @@ module QA click_element :sign_in_tab end - def switch_to_register_tab + def switch_to_register_page set_initial_password_if_present - click_element :register_tab + click_element :register_link end def switch_to_ldap_tab diff --git a/qa/qa/page/main/sign_up.rb b/qa/qa/page/main/sign_up.rb index 98bbbc53027..f8e85798012 100644 --- a/qa/qa/page/main/sign_up.rb +++ b/qa/qa/page/main/sign_up.rb @@ -13,20 +13,18 @@ module QA element :new_user_register_button end - view 'app/views/registrations/welcome.html.haml' do + view 'app/views/registrations/welcome/show.html.haml' do element :get_started_button end def sign_up!(user) - fill_element :new_user_first_name_field, user.first_name - fill_element :new_user_last_name_field, user.last_name - fill_element :new_user_username_field, user.username - fill_element :new_user_email_field, user.email - fill_element :new_user_password_field, user.password - - signed_in = retry_until do + signed_in = retry_until(raise_on_failure: false) do + fill_element :new_user_first_name_field, user.first_name + fill_element :new_user_last_name_field, user.last_name + fill_element :new_user_username_field, user.username + fill_element :new_user_email_field, user.email + fill_element :new_user_password_field, user.password click_element :new_user_register_button if has_element?(:new_user_register_button) - click_element :get_started_button if has_element?(:get_started_button) Page::Main::Menu.perform(&:has_personal_area?) |