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
67c6d98a
Commit
67c6d98a
authored
Mar 01, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed failing password tests
parent
3806c008
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/profiles/passwords/edit.html.haml
app/views/profiles/passwords/edit.html.haml
+1
-1
features/steps/profile/profile.rb
features/steps/profile/profile.rb
+3
-3
No files found.
app/views/profiles/passwords/edit.html.haml
View file @
67c6d98a
...
...
@@ -12,7 +12,7 @@
Change your password
-
unless
@user
.
password_automatically_set?
or recover your current one
=
form_for
@user
,
url:
profile_password_path
,
method: :put
do
|
f
|
=
form_for
@user
,
url:
profile_password_path
,
method: :put
,
html:
{
class:
"update-password"
}
do
|
f
|
-
if
@user
.
errors
.
any?
.alert.alert-danger
%ul
...
...
features/steps/profile/profile.rb
View file @
67c6d98a
...
...
@@ -64,7 +64,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
page
.
within
'.update-password'
do
fill_in
"user_password"
,
with:
"22233344"
fill_in
"user_password_confirmation"
,
with:
"22233344"
click_button
"Save"
click_button
"Save
password
"
end
end
...
...
@@ -73,7 +73,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
fill_in
"user_current_password"
,
with:
"12345678"
fill_in
"user_password"
,
with:
"22233344"
fill_in
"user_password_confirmation"
,
with:
"22233344"
click_button
"Save"
click_button
"Save
password
"
end
end
...
...
@@ -82,7 +82,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
fill_in
"user_current_password"
,
with:
"12345678"
fill_in
"user_password"
,
with:
"password"
fill_in
"user_password_confirmation"
,
with:
"confirmation"
click_button
"Save"
click_button
"Save
password
"
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