diff options
author | danielgrippi <danielgrippi@gmail.com> | 2011-10-24 06:18:54 +0400 |
---|---|---|
committer | danielgrippi <danielgrippi@gmail.com> | 2011-10-24 06:20:13 +0400 |
commit | cff3f6ea49371c074072a253333fe1fb5d75f8db (patch) | |
tree | ffdcddec0c7f177ad01bdcfe932eb730ee03ede8 /spec | |
parent | 06ad78f0262fca6c30354ac03b17fafcf0eb61a6 (diff) |
green specs
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/registrations_controller_spec.rb | 2 | ||||
-rw-r--r-- | spec/controllers/sessions_controller_spec.rb | 8 | ||||
-rw-r--r-- | spec/helpers/notifications_helper_spec.rb | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb index 26c6079f9..b647895fd 100644 --- a/spec/controllers/registrations_controller_spec.rb +++ b/spec/controllers/registrations_controller_spec.rb @@ -67,7 +67,7 @@ describe RegistrationsController do it "redirects to the home path" do get :create, @valid_params response.should be_redirect - response.location.should match /^#{aspects_url}\??$/ + response.location.should match /^#{multi_url}\??$/ end end diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb index a7fd5503e..cabf39664 100644 --- a/spec/controllers/sessions_controller_spec.rb +++ b/spec/controllers/sessions_controller_spec.rb @@ -24,17 +24,17 @@ describe SessionsController do end describe "#create" do - it "redirects to /aspects for a non-mobile user" do + it "redirects to /stream for a non-mobile user" do post :create, {"user" => {"remember_me" => "0", "username" => @user.username, "password" => "evankorth"}} response.should be_redirect - response.location.should match /^#{aspects_url}\??$/ + response.location.should match /^#{multi_url}\??$/ end - it "redirects to /aspects for a mobile user" do + it "redirects to /stream for a mobile user" do @request.env['HTTP_USER_AGENT'] = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7' post :create, {"user" => {"remember_me" => "0", "username" => @user.username, "password" => "evankorth"}} response.should be_redirect - response.location.should match /^#{aspects_url}\??$/ + response.location.should match /^#{multi_url}\??$/ end it 'queues up an update job' do diff --git a/spec/helpers/notifications_helper_spec.rb b/spec/helpers/notifications_helper_spec.rb index 59a9e827f..3cdb465e1 100644 --- a/spec/helpers/notifications_helper_spec.rb +++ b/spec/helpers/notifications_helper_spec.rb @@ -72,8 +72,8 @@ describe NotificationsHelper do end it 'includes the boilerplate translation' do - output = object_link(@notification, notification_people_link(@notification)) - output.should include t("#{@notification.popup_translation_key}.one", + output = object_link(@notification, notification_people_link(@notification)) + output.should include t("#{@notification.popup_translation_key}.two", :actors => notification_people_link(@notification), :post_link => "<a href=\"#{post_path(@post)}\" class=\"hard_object_link\" data-ref=\"#{@post.id}\">#{t('notifications.post')}</a>") end |