* adding better error reporting to session errors

web/app/assets/javascripts/jamkazam.js

@@ -198,12 +198,13 @@
      * Generic error handler for Ajax calls.
      */
     function ajaxError(jqXHR, textStatus, errorMessage) {
-      logger.error("Unexpected ajax error: " + textStatus);
 
       if (jqXHR.status == 404) {
+        logger.error("Unexpected ajax error: " + textStatus + ", msg:" + errorMessage);
         app.notify({title: "Oops!", text: "What you were looking for is gone now."});
       }
       else if (jqXHR.status = 422) {
+        logger.error("Unexpected ajax error: " + textStatus + ", msg: " + errorMessage + ", response: " + jqXHR.responseText);
         // present a nicer message
         try {
           var text = "<ul>";

web/app/assets/javascripts/sessionModel.js

@@ -74,7 +74,6 @@
             deferred
                 .done(function(){
                     logger.debug("calling jamClient.JoinSession");
-
                     if(!alreadyInSession()) {
                         // on temporary disconnect scenarios, a user may already be in a session when they enter this path
                         // so we avoid double counting
@@ -198,7 +197,7 @@
                             callback();
                         }
                     },
-                    error: ajaxError,
+                    error: function(jqXHR) { app.notifyServerError(jqXHR, "Unable to refresh session data") },
                     complete: function() {
                         requestingSessionRefresh = false;
                         if(pendingSessionRefresh) {
@@ -301,7 +300,7 @@
                     logger.debug("successfully updated tracks on the server");
                     //refreshCurrentSession();
                 },
-                error: ajaxError
+                error: function(jqXHR) { app.notifyServerError(jqXHR, "Unable to refresh session data") }
             });
         }
 
@@ -318,7 +317,7 @@
                 success: function(response) {
                     logger.debug("Successfully updated track info (" + JSON.stringify(data) + ")");
                 },
-                error: ajaxError
+              error: function(jqXHR) { app.notifyServerError(jqXHR, "Unable to refresh session data") }
             });
         }
 
@@ -447,10 +446,6 @@
             }
         }
 
-        function ajaxError(jqXHR, textStatus, errorMessage) {
-            logger.error("Unexpected ajax error: " + textStatus);
-        }
-
         // returns a deferred object
         function findUserBy(finder) {
             if(finder.clientId) {

web/app/views/clients/_session.html.erb

@@ -1,5 +1,5 @@
 <!-- Actual Session Screen -->
-<div layout="screen" layout-id="session" layout-arg="id" class="screen secondary">
+<div layout="screen" layout-id="session" layout-arg="id" class="screen secondary" id="session-screen">
     <div class="content-head">
         <div class="content-icon">
             <%= image_tag "shared/icon_session.png", {:height => 19, :width => 19} %>

web/spec/support/utilities.rb

@@ -174,6 +174,7 @@ def create_session(creator = FactoryGirl.create(:user), unique_session_desc = ni
 
     # verify that the in-session page is showing
     expect(page).to have_selector('h2',    text: 'my tracks')
+    find('#session-screen .session-mytracks .session-track')
   end
 
   return creator, unique_session_desc, genre
@@ -195,6 +196,7 @@ def join_session(joiner, unique_session_desc)
     find('.join-link').trigger(:click)
     find('#btn-accept-terms').trigger(:click)
     expect(page).to have_selector('h2',    text: 'my tracks')
+    find('#session-screen .session-mytracks .session-track')
   end
 end
 
@@ -336,7 +338,7 @@ def assert_all_tracks_seen(users=[])
   users.each do |user|
     in_client(user) do
       users.reject {|u| u==user}.each do |other|
-        expect(page).to have_selector('div.track-label',  text: other.name)
+        find('div.track-label',  text: other.name)
         #puts user.name + " is able to see " + other.name + "\'s track"
       end
     end