From 464c595d6b0fedcbef68dd837d359919373c0a1b Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 24 Jun 2014 10:33:31 -0500 Subject: [PATCH] * fixing controller/request tests --- ruby/lib/jam_ruby/models/music_session.rb | 7 +++---- ruby/spec/factories.rb | 1 + web/app/assets/javascripts/scheduled_session.js | 1 - web/spec/factories.rb | 1 + web/spec/requests/active_music_sessions_api_spec.rb | 6 +++++- web/spec/requests/music_sessions_api_spec.rb | 3 ++- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index 3e1744738..a910472b4 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -225,14 +225,13 @@ module JamRuby end def self.scheduled user - current_time = Time.now query = MusicSession.where("music_sessions.user_id = '#{user.id}'") - query = query.where("music_sessions.scheduled_start IS NOT NULL AND music_sessions.scheduled_start < '#{current_time + 12.hours}'") - query = query.where("music_sessions.scheduled_start > '#{current_time - 12.hours}'") + query = query.where("music_sessions.scheduled_start IS NOT NULL AND music_sessions.scheduled_start < NOW() + '12 hour'::INTERVAL") + query = query.where("music_sessions.scheduled_start > NOW() - '12 hour'::INTERVAL") query = query.where("music_session_id IS NULL") query = query.order("music_sessions.scheduled_start ASC") - return query + query end def self.create user, options diff --git a/ruby/spec/factories.rb b/ruby/spec/factories.rb index 41143748a..0513e8f68 100644 --- a/ruby/spec/factories.rb +++ b/ruby/spec/factories.rb @@ -487,6 +487,7 @@ FactoryGirl.define do factory :rsvp_slot, class: JamRuby::RsvpSlot do proficiency_level 'beginner' + instrument { Instrument.find('electric guitar') } factory :chosen_rsvp_slot do ignore do diff --git a/web/app/assets/javascripts/scheduled_session.js b/web/app/assets/javascripts/scheduled_session.js index 45361fdbd..a34114dd5 100644 --- a/web/app/assets/javascripts/scheduled_session.js +++ b/web/app/assets/javascripts/scheduled_session.js @@ -215,7 +215,6 @@ var sessionNotations = []; for (var i = 0; i < createSessionSettings.notations.length; i++) { - console.log(createSessionSettings.notations[i]) var name = createSessionSettings.notations[i].file_name; sessionNotations.push(name); } diff --git a/web/spec/factories.rb b/web/spec/factories.rb index 2a378db9a..06710e39d 100644 --- a/web/spec/factories.rb +++ b/web/spec/factories.rb @@ -486,6 +486,7 @@ FactoryGirl.define do factory :rsvp_slot, class: JamRuby::RsvpSlot do proficiency_level 'beginner' + instrument { Instrument.find('electric guitar') } factory :chosen_rsvp_slot do ignore do diff --git a/web/spec/requests/active_music_sessions_api_spec.rb b/web/spec/requests/active_music_sessions_api_spec.rb index 2ae03887d..595d39ab3 100755 --- a/web/spec/requests/active_music_sessions_api_spec.rb +++ b/web/spec/requests/active_music_sessions_api_spec.rb @@ -27,7 +27,10 @@ describe "Active Music Session API ", :type => :api do :genres => ["classical"], :musician_access => true, :approval_required => false, :fan_chat => true, :fan_access => true, :legal_policy => true, :language => 'eng', - :timezone => "utc"} } + :timezone => "utc", + :rsvp_slots => [{proficiency_level: 1, instrument_id: 'other', approve:true}] + } } + let(:defpart) { { :as_musician => true, :tracks => [{"instrument_id" => "electric guitar", "sound" => "mono", @@ -47,6 +50,7 @@ describe "Active Music Session API ", :type => :api do it "should create session" do client = FactoryGirl.create(:connection, :user => user, :ip_address => "1.1.1.1", :client_id => "1") post '/api/sessions.json', defopts.to_json, "CONTENT_TYPE" => 'application/json' + puts last_response.body last_response.status.should eql(201) # now fetch it's data diff --git a/web/spec/requests/music_sessions_api_spec.rb b/web/spec/requests/music_sessions_api_spec.rb index 1e2b14e07..ba172afbb 100644 --- a/web/spec/requests/music_sessions_api_spec.rb +++ b/web/spec/requests/music_sessions_api_spec.rb @@ -23,7 +23,8 @@ describe "Scheduled Music Session API ", :type => :api do :genres => ["classical"], :musician_access => true, :approval_required => false, :fan_chat => true, :fan_access => true, :legal_policy => true, :language => 'eng', - :timezone => "utc"} } + :timezone => "utc", + :rsvp_slots => [{proficiency_level: 1, instrument_id: 'other', approve:true}] } } before(:all) do ActiveMusicSession.delete_all