Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2015-04-29 22:03:24 -05:00
commit 487736a619
1 changed files with 11 additions and 5 deletions

View File

@ -54,6 +54,10 @@ describe Feed do
end
describe "sorting" do
before :each do
ClaimedRecording.delete_all
end
it "sorts by active flag / index (date) DESC" do
claimed_recording = FactoryGirl.create(:claimed_recording)
@ -74,20 +78,22 @@ describe Feed do
FactoryGirl.create(:playable_play, playable: claimed_recording2.recording, claimed_recording: claimed_recording2, user:claimed_recording1.user)
FactoryGirl.create(:playable_play, playable: claimed_recording2.recording, claimed_recording: claimed_recording2, user:claimed_recording2.user)
claimed_recording2.recording.play_count += 2
claimed_recording2.recording.save!
feeds, next_page = Feed.index(user1, :sort => 'plays')
feeds.length.should == 4
feeds[2].recording.should == claimed_recording2.recording
feeds[3].recording.should == claimed_recording1.recording
FactoryGirl.create(:playable_play, playable: claimed_recording1.recording.music_session.music_session, user: user1)
FactoryGirl.create(:playable_play, playable: claimed_recording1.recording.music_session.music_session, user: user2)
FactoryGirl.create(:playable_play, playable: claimed_recording1.recording.music_session.music_session, user: user3)
FactoryGirl.create(:playable_play, playable: claimed_recording2.recording.music_session.music_session, user: user1)
FactoryGirl.create(:playable_play, playable: claimed_recording2.recording.music_session.music_session, user: user2)
FactoryGirl.create(:playable_play, playable: claimed_recording2.recording.music_session.music_session, user: user3)
claimed_recording2.recording.play_count+=3
claimed_recording2.recording.save!
feeds, next_page = Feed.index(user1, :sort => 'plays')
feeds.length.should == 4
feeds[0].music_session.should == claimed_recording1.recording.music_session.music_session
feeds[2].recording.should == claimed_recording2.recording
feeds[3].recording.should == claimed_recording1.recording
end