testing password reset happy paths

[adelevie]

tests:

• presence of a reset link
• presence of an initial reset form
• the sending of the email
• the content of the email
• follows the link in the email
• tests the reset form

[pui]

This can't be merged due to Gemfile.lock conflicts @jgrevich has recreated the lock file in pull #56 which I just merged, so hopefully rebasing will fix the problem.

[adelevie]

sure thing, thanks!

On Wed, Jun 4, 2014 at 3:05 PM, Erica Kwan notifications@github.com wrote:

This can't be merged due to Gemfile.lock conflicts @jgrevich https://github.com/jgrevich has recreated the lock file in pull #56 https://github.com/codeforamerica/oakland_answers/pull/56 which I just merged, so hopefully rebasing will fix the problem.

— Reply to this email directly or view it on GitHub https://github.com/codeforamerica/oakland_answers/pull/60#issuecomment-45136915 .

[adelevie]

rebased

[pui]

Build failed, can you fix it?

[adelevie]

Rebased, but build's gonna fail again with the same rails_nlp errors as https://github.com/codeforamerica/oakland_answers/pull/71

[migurski]

Hi, thanks for this. It's going to be a few days before we can look at it again!