diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-06-28 18:02:52 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-06-28 18:02:52 +0100 |
| commit | 3773cf3459d023ed3515afbd4ff7b3e1253dc4d0 (patch) | |
| tree | ab4d4f6e1b99b93f9b916b64a99aa198e2ece20b /t/app/controller/auth.t | |
| parent | e2414d30dd673ecea38e2a40d187b835bd076ac3 (diff) | |
| parent | 70cbebec7bb2fd412c6a9fbfb694357401916372 (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
perllib/FixMyStreet/App/Controller/Report/Update.pm
templates/web/default/report/display.html
Diffstat (limited to 't/app/controller/auth.t')
| -rw-r--r-- | t/app/controller/auth.t | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/t/app/controller/auth.t b/t/app/controller/auth.t index 8fbc413ec..1a16457f9 100644 --- a/t/app/controller/auth.t +++ b/t/app/controller/auth.t @@ -128,8 +128,7 @@ $mech->not_logged_in_ok; $mech->get_ok($link); is $mech->uri->path, '/faq', "redirected to the Help page"; - $mech->get_ok('/my'); - $mech->follow_link_ok( { url => '/auth/change_password' } ); + $mech->get_ok('/auth/change_password'); ok my $form = $mech->form_name('change_password'), "found change password form"; @@ -224,7 +223,7 @@ $mech->submit_form_ok( "sign in with '$test_email' & '$test_password" ); is $mech->uri->path, '/auth', "redirected to correct page"; -$mech->content_contains( 'Email or password wrong', 'found error message' ); +$mech->content_contains( 'problem with your email/password combination', 'found error message' ); # more test: # TODO: test that email are always lowercased |