nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve merge in notifications controller

Browse source
This commit is contained in:
Maxwell Salzberg 2012-03-14 10:46:59 -07:00
commit 36f9ca6b1a
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
spec/controllers/notifications_controller_spec.rb
View file

@ -57,6 +57,11 @@ describe NotificationsController do
get :read_all, :format => :html get :read_all, :format => :html
response.should redirect_to(stream_path) response.should redirect_to(stream_path)
end end
it "should redirect to the stream in the mobile version" do
Factory(:notification, :recipient => alice)
get :read_all, :format => :mobile
response.should redirect_to(stream_path)
end
it "should return a dummy value in the json version" do it "should return a dummy value in the json version" do
Factory(:notification, :recipient => alice) Factory(:notification, :recipient => alice)
get :read_all, :format => :json get :read_all, :format => :json
@ -76,6 +81,11 @@ describe NotificationsController do
response.body.should =~ /note_html/ response.body.should =~ /note_html/
end end
it 'succeeds on mobile' do
get :index, :format => :mobile
response.should be_success
end
it 'paginates the notifications' do it 'paginates the notifications' do
25.times { Factory(:notification, :recipient => alice, :target => @post) } 25.times { Factory(:notification, :recipient => alice, :target => @post) }
get :index get :index
@ -104,8 +114,6 @@ describe NotificationsController do
Nokogiri(response.body).css('.aspect_membership').should_not be_empty Nokogiri(response.body).css('.aspect_membership').should_not be_empty
end end
end end
end end