diff --git a/ruby/jt_metadata.json b/ruby/jt_metadata.json index 4c4a165b3..55ddeef8e 100644 --- a/ruby/jt_metadata.json +++ b/ruby/jt_metadata.json @@ -1 +1 @@ -{"container_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-4491-1k0tjwq/jam-track-64.jkz", "version": "0", "coverart": null, "rsa_priv_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-4491-1k0tjwq/skey.pem", "tracks": [{"name": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-4491-1k0tjwq/7fe5e1c3-4c71-456d-a947-751b1c47af5c.ogg", "trackName": "track_00"}], "rsa_pub_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-4491-1k0tjwq/pkey.pem", "jamktrack_info": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/tmpW_pUrM"} \ No newline at end of file +{"container_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-36419-8j9xo3/jam-track-90.jkz", "version": "0", "coverart": null, "rsa_priv_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-36419-8j9xo3/skey.pem", "tracks": [{"name": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-36419-8j9xo3/623cd29a-51fc-4185-89ed-99a88f3c7fb0.ogg", "trackName": "track_00"}], "rsa_pub_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150715-36419-8j9xo3/pkey.pem", "jamktrack_info": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/tmpbM4F2I"} \ No newline at end of file diff --git a/ruby/spec/jam_ruby/models/band_filter_search_spec.rb b/ruby/spec/jam_ruby/models/band_filter_search_spec.rb index 82b5f70eb..71298488c 100644 --- a/ruby/spec/jam_ruby/models/band_filter_search_spec.rb +++ b/ruby/spec/jam_ruby/models/band_filter_search_spec.rb @@ -2,6 +2,10 @@ require 'spec_helper' describe 'Band search' do + before(:all) do + Band.delete_all + end + before(:each) do @bands = [] @bands << @band1 = FactoryGirl.create(:band) diff --git a/ruby/spec/jam_ruby/models/band_search_spec.rb b/ruby/spec/jam_ruby/models/band_search_spec.rb index b4062cc4e..e71a0b021 100644 --- a/ruby/spec/jam_ruby/models/band_search_spec.rb +++ b/ruby/spec/jam_ruby/models/band_search_spec.rb @@ -15,6 +15,10 @@ describe "Band Search" do } } + before(:all) do + Band.delete_all + end + before(:each) do @user = FactoryGirl.create(:user) band.touch diff --git a/ruby/spec/jam_ruby/models/band_spec.rb b/ruby/spec/jam_ruby/models/band_spec.rb index 947602223..6fed8ac1e 100644 --- a/ruby/spec/jam_ruby/models/band_spec.rb +++ b/ruby/spec/jam_ruby/models/band_spec.rb @@ -58,7 +58,7 @@ describe Band do new_band.save.should be_false new_band.errors[:genres].should == [ValidationMessages::BAND_GENRE_MINIMUM_NOT_MET] - new_band.genres = Genre.first + new_band.genres = [Genre.first] new_band.save.should be_true end diff --git a/ruby/spec/jam_ruby/models/feed_spec.rb b/ruby/spec/jam_ruby/models/feed_spec.rb index fa4372a58..f24445637 100644 --- a/ruby/spec/jam_ruby/models/feed_spec.rb +++ b/ruby/spec/jam_ruby/models/feed_spec.rb @@ -2,6 +2,13 @@ require 'spec_helper' describe Feed do + before(:all) do + MusicSession.delete_all + Recording.delete_all + IcecastMount.delete_all + end + + let (:user1) { FactoryGirl.create(:user) } let (:user2) { FactoryGirl.create(:user) } let (:user3) { FactoryGirl.create(:user) } diff --git a/ruby/spec/jam_ruby/resque/active_music_session_cleaner_spec.rb b/ruby/spec/jam_ruby/resque/active_music_session_cleaner_spec.rb index 7bae67c59..2b9196f6f 100644 --- a/ruby/spec/jam_ruby/resque/active_music_session_cleaner_spec.rb +++ b/ruby/spec/jam_ruby/resque/active_music_session_cleaner_spec.rb @@ -3,6 +3,8 @@ require 'spec_helper' describe "ActiveMusicSessionCleaner" do before(:all) do + MusicSession.delete_all + ActiveMusicSession.delete_all @cleaner = ActiveMusicSessionCleaner.new @cleaner.interval = "INTERVAL '1 second'" end diff --git a/ruby/spec/jam_ruby/resque/scheduled_music_session_cleaner_spec.rb b/ruby/spec/jam_ruby/resque/scheduled_music_session_cleaner_spec.rb index 0913561ac..6d08c366e 100644 --- a/ruby/spec/jam_ruby/resque/scheduled_music_session_cleaner_spec.rb +++ b/ruby/spec/jam_ruby/resque/scheduled_music_session_cleaner_spec.rb @@ -2,14 +2,18 @@ require 'spec_helper' describe 'ScheduledMusicSessionCleaner' do + before(:all) { + MusicSession.delete_all + } + it "purges old music sessions" do [MusicSession::UNSTARTED_INTERVAL_DAYS_PURGE, MusicSession::UNSTARTED_INTERVAL_DAYS_PURGE_RECUR].each do |interval| dd = Time.now - (interval.to_i + 1).days - Timecop.travel(dd) + Timecop.travel(dd) FactoryGirl.create(:music_session, scheduled_start: dd) Timecop.return - end + end msess2 = FactoryGirl.create(:music_session, scheduled_start: Time.now) expect(MusicSession.count).to be(3)