seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix tests

This commit is contained in:
Brian Smith 2014-06-11 09:15:03 -04:00
parent 5fc9696d01
commit aa95dd783b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruby/lib/jam_ruby/models/active_music_session.rb
View File

@ -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)

2
web/spec/requests/active_music_sessions_api_spec.rb
View File

@ -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