From aa95dd783b66d200db3f21ae3bba2408803ac508 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Wed, 11 Jun 2014 09:15:03 -0400 Subject: [PATCH] fix tests --- ruby/lib/jam_ruby/models/active_music_session.rb | 4 ++-- web/spec/requests/active_music_sessions_api_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruby/lib/jam_ruby/models/active_music_session.rb b/ruby/lib/jam_ruby/models/active_music_session.rb index 14f475150..75d49e5d0 100644 --- a/ruby/lib/jam_ruby/models/active_music_session.rb +++ b/ruby/lib/jam_ruby/models/active_music_session.rb @@ -326,7 +326,7 @@ module JamRuby active_music_session.with_lock do # VRFS-1297 active_music_session.tick_track_changes - connection = ConnectionManager.new.join_music_session(user, client_id, active_music_session, as_musician, tracks) + connection = ConnectionManager.new.join_music_session(user, client_id, active_music_session, as_musician, tracks, 10) if connection.errors.any? # rollback the transaction to make sure nothing is disturbed in the database @@ -383,7 +383,7 @@ module JamRuby # auto-join this user into the newly created session as_musician = true - connection = ConnectionManager.new.join_music_session(user, client_id, active_music_session, as_musician, tracks) + connection = ConnectionManager.new.join_music_session(user, client_id, active_music_session, as_musician, tracks, 10) unless connection.errors.any? user.update_progression_field(:first_music_session_at) diff --git a/web/spec/requests/active_music_sessions_api_spec.rb b/web/spec/requests/active_music_sessions_api_spec.rb index aac4f1c2a..ca690c98d 100755 --- a/web/spec/requests/active_music_sessions_api_spec.rb +++ b/web/spec/requests/active_music_sessions_api_spec.rb @@ -754,7 +754,7 @@ describe "Active Music Session API ", :type => :api do music_session = FactoryGirl.create(:active_music_session, :creator => user, :musician_access => true) # music_session.connections << connection music_session.save - connection.join_the_session(music_session, true, nil, user) + connection.join_the_session(music_session, true, nil, user, 10) recording = Recording.start(music_session, user) recording.stop recording.reload