From e50c0d5cb7bcdc1131dae8cd5d5de2947732cda8 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 9 Oct 2013 17:01:04 +0300
Subject: [PATCH] Fix spinach profile tests

---
 app/controllers/profiles/passwords_controller.rb |  4 ++--
 features/profile/profile.feature                 | 10 +++++-----
 features/steps/profile/profile.rb                |  6 +++++-
 features/steps/shared/paths.rb                   |  6 +++++-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/controllers/profiles/passwords_controller.rb b/app/controllers/profiles/passwords_controller.rb
index b8d8395a7c4..df6954554ea 100644
--- a/app/controllers/profiles/passwords_controller.rb
+++ b/app/controllers/profiles/passwords_controller.rb
@@ -1,7 +1,7 @@
 class Profiles::PasswordsController < ApplicationController
   layout :determine_layout
 
-  skip_before_filter :check_password_expiration
+  skip_before_filter :check_password_expiration, only: [:new, :create]
 
   before_filter :set_user
   before_filter :set_title
@@ -44,7 +44,7 @@ class Profiles::PasswordsController < ApplicationController
       flash[:notice] = "Password was successfully updated. Please login with it"
       redirect_to new_user_session_path
     else
-      render 'account'
+      render 'edit'
     end
   end
 
diff --git a/features/profile/profile.feature b/features/profile/profile.feature
index 6d210fb4df7..6198fd2b306 100644
--- a/features/profile/profile.feature
+++ b/features/profile/profile.feature
@@ -12,13 +12,13 @@ Feature: Profile
     And I should see new contact info
 
   Scenario: I change my password without old one
-    Given I visit profile account page
+    Given I visit profile password page
     When I try change my password w/o old one
     Then I should see a missing password error message
-    And I should be redirected to account page
+    And I should be redirected to password page
 
   Scenario: I change my password
-    Given I visit profile account page
+    Given I visit profile password page
     Then I change my password
     And I should be redirected to sign in page
 
@@ -30,13 +30,13 @@ Feature: Profile
   Scenario: My password is expired
     Given my password is expired
     And I am not an ldap user
-    And I visit profile account page
+    Given I visit profile password page
     Then I redirected to expired password page
     And I submit new password
     And I redirected to sign in page
 
   Scenario: I unsuccessfully change my password
-    Given I visit profile account page
+    Given I visit profile password page
     When I unsuccessfully change my password
     Then I should see a password error message
 
diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb
index ea7550a6f22..753e2c19bcb 100644
--- a/features/steps/profile/profile.rb
+++ b/features/steps/profile/profile.rb
@@ -133,8 +133,12 @@ class Profile < Spinach::FeatureSteps
     current_path.should == new_user_session_path
   end
 
+  step 'I should be redirected to password page' do
+    current_path.should == edit_profile_password_path
+  end
+
   step 'I should be redirected to account page' do
-    current_path.should == account_profile_path
+    current_path.should == profile_account_path
   end
 
   step 'I click on my profile picture' do
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index c30eccce1c5..156fa5bab4e 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -65,8 +65,12 @@ module SharedPaths
     visit profile_path
   end
 
+  step 'I visit profile password page' do
+    visit edit_profile_password_path
+  end
+
   step 'I visit profile account page' do
-    visit account_profile_path
+    visit profile_account_path
   end
 
   step 'I visit profile SSH keys page' do