nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5325 from gdpelican/feature/fix-change-password-error-message

Browse source 
Show error message on invalid reset password attempt
This commit is contained in:
Jonne Haß 2014-10-14 13:08:16 +02:00
commit b4e4b7f007
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -67,6 +67,7 @@ The keys will still be available in the root level within the 0.5 release. The o
* Only collapse empty comment box [#5328](https://github.com/diaspora/diaspora/pull/5328) * Only collapse empty comment box [#5328](https://github.com/diaspora/diaspora/pull/5328)
* Fix pagination for people/guid/contacts [#5304](https://github.com/diaspora/diaspora/pull/5304) * Fix pagination for people/guid/contacts [#5304](https://github.com/diaspora/diaspora/pull/5304)
* Fix poll creation on Bootstrap pages [#5334](https://github.com/diaspora/diaspora/pull/5334) * Fix poll creation on Bootstrap pages [#5334](https://github.com/diaspora/diaspora/pull/5334)
* Show error message on invalid reset password attempt [#5325](https://github.com/diaspora/diaspora/pull/5325)
## Features ## Features
* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105) * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)

2
app/views/passwords/new.haml
View file

@ -5,6 +5,8 @@
%h1{id: "huge-text"}= AppConfig.settings.pod_name %h1{id: "huge-text"}= AppConfig.settings.pod_name
= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => {:class => "form-horizontal block-form"}, :autocomplete => 'off') do |f| = form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => {:class => "form-horizontal block-form"}, :autocomplete => 'off') do |f|
%legend
%i= t('devise.passwords.new.no_account') unless devise_error_messages!.empty?
%fieldset %fieldset
.control-group .control-group
%label{class: "control-label", for: "user_email", style: "width: 40%; text-align: center; padding: 10px 0; overflow: hidden"} %label{class: "control-label", for: "user_email", style: "width: 40%; text-align: center; padding: 10px 0; overflow: hidden"}

6
features/desktop/change_password.feature
View file

@ -22,3 +22,9 @@ Feature: Change password
When I fill out reset password form with "supersecret" and "supersecret" When I fill out reset password form with "supersecret" and "supersecret"
And I submit reset password form And I submit reset password form
Then I should be on the stream page Then I should be on the stream page
Scenario: Attempt to reset password with invalid email
Given I am on forgot password page
When I fill out forgot password form with "notanemail"
And I submit forgot password form
Then I should see "No account with this email exists"