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
Kazuhiko Shiozaki
gitlab-ce
Commits
89d9319a
Commit
89d9319a
authored
Nov 04, 2012
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rendered action for password change failure
Closes #1912
parent
f8e27b92
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
app/controllers/profile_controller.rb
app/controllers/profile_controller.rb
+1
-1
features/profile/profile.feature
features/profile/profile.feature
+5
-0
features/steps/profile/profile.rb
features/steps/profile/profile.rb
+10
-0
No files found.
app/controllers/profile_controller.rb
View file @
89d9319a
...
...
@@ -22,7 +22,7 @@ class ProfileController < ApplicationController
flash
[
:notice
]
=
"Password was successfully updated. Please login with it"
redirect_to
new_user_session_path
else
render
action:
"password"
render
'account'
end
end
...
...
features/profile/profile.feature
View file @
89d9319a
...
...
@@ -16,6 +16,11 @@ Feature: Profile
Then
I change my password
And
I should be redirected to sign in page
Scenario
:
I
unsuccessfully change my password
Given
I visit profile account page
When
I unsuccessfully change my password
Then
I should see a password error message
Scenario
:
I
reset my token
Given
I visit profile account page
Then
I reset my token
...
...
features/steps/profile/profile.rb
View file @
89d9319a
...
...
@@ -28,6 +28,16 @@ class Profile < Spinach::FeatureSteps
click_button
"Save"
end
When
'I unsuccessfully change my password'
do
fill_in
"user_password"
,
with:
"password"
fill_in
"user_password_confirmation"
,
with:
"confirmation"
click_button
"Save"
end
Then
"I should see a password error message"
do
page
.
should
have_content
"Password doesn't match confirmation"
end
And
'I should be redirected to sign in page'
do
current_path
.
should
==
new_user_session_path
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