Merge pull request gitlabhq#1915 from tsigo/issue/1912

Fix rendered action for password change failure

Author: vsizov

app/controllers/profile_controller.rb

@@ -22,7 +22,7 @@ def password_update
       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

@@ -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

@@ -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