diff --git a/web/app/assets/javascripts/fakeJamClientRecordings.js b/web/app/assets/javascripts/fakeJamClientRecordings.js index 78ff96867..48b8c056d 100644 --- a/web/app/assets/javascripts/fakeJamClientRecordings.js +++ b/web/app/assets/javascripts/fakeJamClientRecordings.js @@ -94,7 +94,7 @@ function onStartRecording(from, payload) { logger.debug("received start recording request from " + from); - if(context.SessionStore.isRecording()) { + if(context.SessionStore.isRecording) { // reject the request to start the recording context.JK.JamServer.sendP2PMessage(from, JSON.stringify(p2pMessageFactory.startRecordingAck(payload.recordingId, false, "already-recording", null))); } diff --git a/web/build b/web/build index 0bf2d9b55..c8c06f392 100755 --- a/web/build +++ b/web/build @@ -30,7 +30,9 @@ cp ../ruby/jam_ruby-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy j cp ../websocket-gateway/jam_websockets-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy websocket-gateway gem"; exit 1; } echo "updating dependencies" +set +e bundle install +set -e bundle install --path vendor/bundle #bundle update diff --git a/web/spec/support/utilities.rb b/web/spec/support/utilities.rb index a57ef4757..999aeff3e 100644 --- a/web/spec/support/utilities.rb +++ b/web/spec/support/utilities.rb @@ -550,6 +550,7 @@ def start_recording_with(creator, joiners=[], genre=nil) page.within_window page.driver.window_handles.last do find('#recording-status', text: 'Start Recording') find('a.control').trigger(:click) + screenshot_and_save_page find('#recording-status', text: 'Stop Recording') end end