diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-06-27 09:18:18 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-06-27 09:18:18 +0100 |
| commit | b483a17c13ba8e273949ce4ee8c8c05e66b06647 (patch) | |
| tree | 3e928fa68c3edb90c0666ec52ad8c9982f9dab77 /t/app/controller/alert_new.t | |
| parent | 8deb709fa2d44bcbaba54734f7f4f4385980d8df (diff) | |
| parent | 62ffebc89cc66d32a828ea1de8c850c3e950faa1 (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
perllib/FixMyStreet/DB/Result/Comment.pm
perllib/FixMyStreet/DB/Result/User.pm
web/css/core.css
Diffstat (limited to 't/app/controller/alert_new.t')
| -rw-r--r-- | t/app/controller/alert_new.t | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t index 5bf7e31dd..d0976b4bb 100644 --- a/t/app/controller/alert_new.t +++ b/t/app/controller/alert_new.t @@ -193,8 +193,8 @@ foreach my $test ( foreach my $test ( { desc => 'logged in user signing up', - user => 'test-login@example.com', - email => 'test-login@example.com', + user => 'test-sign-in@example.com', + email => 'test-sign-in@example.com', type => 'council', param1 => 2651, param2 => 2651, @@ -203,7 +203,7 @@ foreach my $test ( { desc => 'logged in user signing up with different email', user => 'loggedin@example.com', - email => 'test-login@example.com', + email => 'test-sign-in@example.com', type => 'council', param1 => 2651, param2 => 2651, |