From 4ffb46b7557f3fbbb077e0081047a31f435e816a Mon Sep 17 00:00:00 2001 From: Steven Miers Date: Wed, 29 Apr 2015 19:09:30 -0500 Subject: [PATCH] VRFS-3007 : Fix feed spec test failure (was intermittently passing only). --- ruby/spec/jam_ruby/models/feed_spec.rb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/ruby/spec/jam_ruby/models/feed_spec.rb b/ruby/spec/jam_ruby/models/feed_spec.rb index 550802c8b..fa4372a58 100644 --- a/ruby/spec/jam_ruby/models/feed_spec.rb +++ b/ruby/spec/jam_ruby/models/feed_spec.rb @@ -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