From 20e4a39a61398eb4a2d3025f07a8f151c7b8909b Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 25 Jun 2014 17:44:14 -0500 Subject: [PATCH] * oopms. fixing something I just broke; you couldn't start a session that you were only scheduling --- web/app/assets/javascripts/scheduled_session.js | 5 +++++ web/app/assets/javascripts/utils.js | 1 + web/spec/support/utilities.rb | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/web/app/assets/javascripts/scheduled_session.js b/web/app/assets/javascripts/scheduled_session.js index 136ea47a9..6766b51cf 100644 --- a/web/app/assets/javascripts/scheduled_session.js +++ b/web/app/assets/javascripts/scheduled_session.js @@ -505,6 +505,9 @@ startSession(); }); } + else { + startSession(); + } } function startSession() { @@ -623,6 +626,7 @@ else { rest.createScheduledSession(data) .done(function(response) { + logger.debug("created session on server"); $('#create-session-buttons .btn-next').off('click'); var newSessionId = response.id; @@ -635,6 +639,7 @@ } }) .fail(function(jqXHR){ + logger.debug("unable to schedule a session") app.notifyServerError(jqXHR, "Unable to schedule a session"); }); } diff --git a/web/app/assets/javascripts/utils.js b/web/app/assets/javascripts/utils.js index 302d5be57..592c06b06 100644 --- a/web/app/assets/javascripts/utils.js +++ b/web/app/assets/javascripts/utils.js @@ -936,6 +936,7 @@ context.JK.guardAgainstBrowser = function(app, args) { if(!gon.isNativeClient) { + logger.debug("guarding against normal browser on screen thaht requires native client") app.layout.showDialog('launch-app-dialog', args) return false; } diff --git a/web/spec/support/utilities.rb b/web/spec/support/utilities.rb index 081cca030..ee1af02bd 100644 --- a/web/spec/support/utilities.rb +++ b/web/spec/support/utilities.rb @@ -344,7 +344,7 @@ def schedule_session(options = {}) find('.btn-next', text: 'PUBLISH SESSION').trigger(:click) find('h2', text: 'create session') - + sleep 1 # to get rid of this, we need to verify that the URL is /client#/home.. otherwise intermittent fails end end