diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:02:25 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:02:25 -0700 |
| commit | b394b67663916c865452cc784d8642f72a305be5 (patch) | |
| tree | 63c92172fe7813e6354da0ead628ed2192ef0ee2 /spec/controllers/track_controller_spec.rb | |
| parent | 8d21293461ce4b564261686ab8d6460f5fe51259 (diff) | |
| parent | f83b917ec2c59da0ce7c27da19b740366da58419 (diff) | |
Merge branch 'release/0.8' into wdtk
Conflicts:
app/controllers/admin_request_controller.rb
app/views/contact_mailer/from_admin_message.rhtml
Diffstat (limited to 'spec/controllers/track_controller_spec.rb')
| -rw-r--r-- | spec/controllers/track_controller_spec.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb index c785960b5..5505afe59 100644 --- a/spec/controllers/track_controller_spec.rb +++ b/spec/controllers/track_controller_spec.rb @@ -57,7 +57,6 @@ end describe TrackController, "when sending alerts for a track" do integrate_views - include LinkToHelper # for main_url before(:each) do load_raw_emails_data @@ -105,7 +104,7 @@ describe TrackController, "when sending alerts for a track" do # Given we can't click the link, check the token is right instead post_redirect = PostRedirect.find_by_email_token(mail_token) - expected_url = main_url("/user/" + users(:silly_name_user).url_name + "#email_subscriptions") # XXX can't call URL making functions here, what is correct way to do this? + expected_url = show_user_url(:url_name => users(:silly_name_user).url_name, :anchor => "email_subscriptions") post_redirect.uri.should == expected_url # Check nothing more is delivered if we try again |