kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

[QA] Handle sign-up when terms must be accepted

Browse source 
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Rémy Coutable 2018-10-15 17:06:18 +02:00
parent 5caee568ce
commit 2b3dab6f83
No known key found for this signature in database
GPG key ID: 98DFFD1C0C62B70B
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/devise/shared/_signup_box.html.haml
View file

@ -24,7 +24,7 @@
%p.gl-field-hint.text-secondary Minimum length is #{@minimum_password_length} characters %p.gl-field-hint.text-secondary Minimum length is #{@minimum_password_length} characters
- if Gitlab::CurrentSettings.current_application_settings.enforce_terms? - if Gitlab::CurrentSettings.current_application_settings.enforce_terms?
.form-group .form-group
= check_box_tag :terms_opt_in, '1', false, required: true = check_box_tag :terms_opt_in, '1', false, required: true, class: 'qa-new-user-accept-terms'
= label_tag :terms_opt_in do = label_tag :terms_opt_in do
- terms_link = link_to s_("I accept the|Terms of Service and Privacy Policy"), terms_path, target: "_blank" - terms_link = link_to s_("I accept the|Terms of Service and Privacy Policy"), terms_path, target: "_blank"
- accept_terms_label = _("I accept the %{terms_link}") % { terms_link: terms_link } - accept_terms_label = _("I accept the %{terms_link}") % { terms_link: terms_link }

3
qa/qa/page/main/sign_up.rb
View file

@ -11,6 +11,7 @@ module QA
element :new_user_email_confirmation element :new_user_email_confirmation
element :new_user_password element :new_user_password
element :new_user_register_button element :new_user_register_button
element :new_user_accept_terms
end end
def sign_up!(user) def sign_up!(user)
@ -20,6 +21,8 @@ module QA
fill_element :new_user_email_confirmation, user.email fill_element :new_user_email_confirmation, user.email
fill_element :new_user_password, user.password fill_element :new_user_password, user.password
check_element :new_user_accept_terms if has_element?(:new_user_accept_terms)
signed_in = with_retry do signed_in = with_retry do
click_element :new_user_register_button click_element :new_user_register_button