Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
2b3dab6f
Commit
2b3dab6f
authored
Oct 15, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[QA] Handle sign-up when terms must be accepted
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
5caee568
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
app/views/devise/shared/_signup_box.html.haml
app/views/devise/shared/_signup_box.html.haml
+1
-1
qa/qa/page/main/sign_up.rb
qa/qa/page/main/sign_up.rb
+3
-0
No files found.
app/views/devise/shared/_signup_box.html.haml
View file @
2b3dab6f
...
@@ -24,7 +24,7 @@
...
@@ -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
}
...
...
qa/qa/page/main/sign_up.rb
View file @
2b3dab6f
...
@@ -11,6 +11,7 @@ module QA
...
@@ -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
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment