* fixing controller/request tests

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

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

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);
       }

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

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

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