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
7039c986
Commit
7039c986
authored
Oct 22, 2014
by
Patricio Cano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated the IDs of the fields, so that it wouldn't mess with many tests
Updated some tests to match new IDs
parent
10528341
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
app/assets/javascripts/password_strength.js.coffee
app/assets/javascripts/password_strength.js.coffee
+1
-1
app/views/profiles/passwords/edit.html.haml
app/views/profiles/passwords/edit.html.haml
+1
-1
app/views/profiles/passwords/new.html.haml
app/views/profiles/passwords/new.html.haml
+1
-1
features/steps/profile/profile.rb
features/steps/profile/profile.rb
+3
-3
spec/features/users_spec.rb
spec/features/users_spec.rb
+1
-1
No files found.
app/assets/javascripts/password_strength.js.coffee
View file @
7039c986
...
@@ -29,6 +29,6 @@ $(document).ready ->
...
@@ -29,6 +29,6 @@ $(document).ready ->
deviseOptions
.
rules
=
deviseOptions
.
rules
=
activated
:
overwritten_rules
activated
:
overwritten_rules
$
(
"#user_password"
).
pwstrength
profileOptions
$
(
"#user_password
_profile
"
).
pwstrength
profileOptions
$
(
"#user_password_sign_up"
).
pwstrength
deviseOptions
$
(
"#user_password_sign_up"
).
pwstrength
deviseOptions
$
(
"#user_password_recover"
).
pwstrength
deviseOptions
$
(
"#user_password_recover"
).
pwstrength
deviseOptions
app/views/profiles/passwords/edit.html.haml
View file @
7039c986
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
.form-group
#password-strength
.form-group
#password-strength
=
f
.
label
:password
,
'New password'
,
class:
'control-label'
=
f
.
label
:password
,
'New password'
,
class:
'control-label'
.col-sm-10
.col-sm-10
=
f
.
password_field
:password
,
required:
true
,
class:
'form-control'
=
f
.
password_field
:password
,
required:
true
,
class:
'form-control'
,
id:
'user_password_profile'
.form-group
.form-group
=
f
.
label
:password_confirmation
,
class:
'control-label'
=
f
.
label
:password_confirmation
,
class:
'control-label'
.col-sm-10
.col-sm-10
...
...
app/views/profiles/passwords/new.html.haml
View file @
7039c986
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
.col-sm-10
=
f
.
password_field
:current_password
,
required:
true
,
class:
'form-control'
.col-sm-10
=
f
.
password_field
:current_password
,
required:
true
,
class:
'form-control'
.form-group
#password-strength
.form-group
#password-strength
=
f
.
label
:password
,
class:
'control-label'
=
f
.
label
:password
,
class:
'control-label'
.col-sm-10
=
f
.
password_field
:password
,
required:
true
,
class:
'form-control'
.col-sm-10
=
f
.
password_field
:password
,
required:
true
,
class:
'form-control'
,
id:
'user_password_profile'
.form-group
.form-group
=
f
.
label
:password_confirmation
,
class:
'control-label'
=
f
.
label
:password_confirmation
,
class:
'control-label'
.col-sm-10
.col-sm-10
...
...
features/steps/profile/profile.rb
View file @
7039c986
...
@@ -58,7 +58,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
...
@@ -58,7 +58,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
step
'I try change my password w/o old one'
do
step
'I try change my password w/o old one'
do
within
'.update-password'
do
within
'.update-password'
do
fill_in
"user_password"
,
with:
"22233344"
fill_in
"user_password
_profile
"
,
with:
"22233344"
fill_in
"user_password_confirmation"
,
with:
"22233344"
fill_in
"user_password_confirmation"
,
with:
"22233344"
click_button
"Save"
click_button
"Save"
end
end
...
@@ -67,7 +67,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
...
@@ -67,7 +67,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
step
'I change my password'
do
step
'I change my password'
do
within
'.update-password'
do
within
'.update-password'
do
fill_in
"user_current_password"
,
with:
"12345678"
fill_in
"user_current_password"
,
with:
"12345678"
fill_in
"user_password"
,
with:
"22233344"
fill_in
"user_password
_profile
"
,
with:
"22233344"
fill_in
"user_password_confirmation"
,
with:
"22233344"
fill_in
"user_password_confirmation"
,
with:
"22233344"
click_button
"Save"
click_button
"Save"
end
end
...
@@ -76,7 +76,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
...
@@ -76,7 +76,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
step
'I unsuccessfully change my password'
do
step
'I unsuccessfully change my password'
do
within
'.update-password'
do
within
'.update-password'
do
fill_in
"user_current_password"
,
with:
"12345678"
fill_in
"user_current_password"
,
with:
"12345678"
fill_in
"user_password"
,
with:
"password"
fill_in
"user_password
_profile
"
,
with:
"password"
fill_in
"user_password_confirmation"
,
with:
"confirmation"
fill_in
"user_password_confirmation"
,
with:
"confirmation"
click_button
"Save"
click_button
"Save"
end
end
...
...
spec/features/users_spec.rb
View file @
7039c986
...
@@ -11,7 +11,7 @@ describe 'Users', feature: true do
...
@@ -11,7 +11,7 @@ describe 'Users', feature: true do
fill_in
"user_name"
,
with:
"Name Surname"
fill_in
"user_name"
,
with:
"Name Surname"
fill_in
"user_username"
,
with:
"Great"
fill_in
"user_username"
,
with:
"Great"
fill_in
"user_email"
,
with:
"name@mail.com"
fill_in
"user_email"
,
with:
"name@mail.com"
fill_in
"user_password"
,
with:
"password1234"
fill_in
"user_password
_sign_up
"
,
with:
"password1234"
fill_in
"user_password_confirmation"
,
with:
"password1234"
fill_in
"user_password_confirmation"
,
with:
"password1234"
expect
{
click_button
"Sign up"
}.
to
change
{
User
.
count
}.
by
(
1
)
expect
{
click_button
"Sign up"
}.
to
change
{
User
.
count
}.
by
(
1
)
end
end
...
...
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