github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-01-11 16:18:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

two cukes failed because the local files were changed?

Browse Source
This commit is contained in:
Maxwell Salzberg
2012-03-14 18:44:10 -07:00
parent 70cc9c5c96
commit 2d3df3e374
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/devise/devise.en.yml
View File

@@ -16,7 +16,7 @@ en:
inactive: 'Your account was not activated yet.'
sessions:
new:
login: 'Login'
login: 'Log in'
username: 'Username'
password: 'Password'
sign_in: 'Sign in'

2
features/change_password.feature
View File

@@ -20,7 +20,7 @@ Feature: Change password
And I press "Send me reset password instructions"
Then I should see "You will receive an email with instructions"
And I follow the "Change my password" link from the last sent email
Then I should see "Change your password"
Then I should see "Change my password"
And I fill in "Password" with "supersecret"
And I fill in "Password confirmation" with "supersecret"
And I press "Change my password"