Commit e50c0d5c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix spinach profile tests

parent ffec158d
No related merge requests found
class Profiles::PasswordsController < ApplicationController class Profiles::PasswordsController < ApplicationController
layout :determine_layout 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_user
before_filter :set_title before_filter :set_title
...@@ -44,7 +44,7 @@ class Profiles::PasswordsController < ApplicationController ...@@ -44,7 +44,7 @@ class Profiles::PasswordsController < ApplicationController
flash[:notice] = "Password was successfully updated. Please login with it" flash[:notice] = "Password was successfully updated. Please login with it"
redirect_to new_user_session_path redirect_to new_user_session_path
else else
render 'account' render 'edit'
end end
end end
......
...@@ -12,13 +12,13 @@ Feature: Profile ...@@ -12,13 +12,13 @@ Feature: Profile
And I should see new contact info And I should see new contact info
Scenario: I change my password without old one 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 When I try change my password w/o old one
Then I should see a missing password error message 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 Scenario: I change my password
Given I visit profile account page Given I visit profile password page
Then I change my password Then I change my password
And I should be redirected to sign in page And I should be redirected to sign in page
...@@ -30,13 +30,13 @@ Feature: Profile ...@@ -30,13 +30,13 @@ Feature: Profile
Scenario: My password is expired Scenario: My password is expired
Given my password is expired Given my password is expired
And I am not an ldap user 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 Then I redirected to expired password page
And I submit new password And I submit new password
And I redirected to sign in page And I redirected to sign in page
Scenario: I unsuccessfully change my password Scenario: I unsuccessfully change my password
Given I visit profile account page Given I visit profile password page
When I unsuccessfully change my password When I unsuccessfully change my password
Then I should see a password error message Then I should see a password error message
......
...@@ -133,8 +133,12 @@ class Profile < Spinach::FeatureSteps ...@@ -133,8 +133,12 @@ class Profile < Spinach::FeatureSteps
current_path.should == new_user_session_path current_path.should == new_user_session_path
end 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 step 'I should be redirected to account page' do
current_path.should == account_profile_path current_path.should == profile_account_path
end end
step 'I click on my profile picture' do step 'I click on my profile picture' do
......
...@@ -65,8 +65,12 @@ module SharedPaths ...@@ -65,8 +65,12 @@ module SharedPaths
visit profile_path visit profile_path
end end
step 'I visit profile password page' do
visit edit_profile_password_path
end
step 'I visit profile account page' do step 'I visit profile account page' do
visit account_profile_path visit profile_account_path
end end
step 'I visit profile SSH keys page' do step 'I visit profile SSH keys page' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment