Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

ruby/lib/jam_ruby/amqp/amqp_connection_manager.rb

@@ -64,7 +64,7 @@ module JamRuby
     def on_recovery(conn, settings)
       @connected = true
 
-      @log.debug "reconnected #{conn} #{settings}"
+      @log.warn "reconnected #{conn} #{settings}"
 
       #puts "#channel before #{@channel}"
       #puts "recovered channel: #{@channel.reuse}"

ruby/lib/jam_ruby/models/user.rb

@@ -1020,6 +1020,8 @@ module JamRuby
 
         user.save
 
+        user.errors.add("recaptcha", "verification failed") if recaptcha_failed
+
         if user.errors.any?
           raise ActiveRecord::Rollback
         else
@@ -1036,16 +1038,9 @@ module JamRuby
             UserMailer.confirm_email(user, signup_confirm_url.nil? ? nil : (signup_confirm_url + "/" + user.signup_token) ).deliver
           end
         end
-
-        if recaptcha_failed
-          user.errors.add "recaptcha", "verification failed"
-          raise ActiveRecord::Rollback
-        end
-
       end
-
-      return user
-    end
+      user
+    end # def signup
 
     # this is intended to be development-mode or test-mode only; VRFS-149
     # it creates or updates one user per developer, so that we aren't in the business

web/app/assets/javascripts/sessionList.js

@@ -165,9 +165,9 @@
         sessionVals.listen_link_text = 'Listen';
       }
       else {
-        sessionVals.listen_link_text = 'Broadcasting Offline';
+        sessionVals.listen_link_text = '';
       }
-    
+
 
 
       var $row = $(context.JK.fillTemplate($activeSessionTemplate.html(), sessionVals));

web/spec/managers/user_manager_spec.rb

@@ -666,6 +666,7 @@ describe UserManager do
     before(:each) do
       @old_recaptcha=Rails.application.config.recaptcha_enable
       Rails.application.config.recaptcha_enable=true
+      UserMailer.deliveries.clear
     end
 
     after(:each) do
@@ -687,6 +688,7 @@ describe UserManager do
                                   signup_confirm_url: "http://localhost:3000/confirm")
 
       user.errors.any?.should be_true      
+      UserMailer.deliveries.should have(0).items
     end
 
     it "passes when facebook signup" do

websocket-gateway/lib/jam_websockets/router.rb

@@ -804,7 +804,7 @@ module JamWebsockets
       id = subscribe.id
       type = subscribe.type
       if id && id.length > 0 && type && type.length > 0
-        register_subscription(client, type, id)
+        #register_subscription(client, type, id)
       else
         @log.error("handle_subscribe: empty data #{subscribe}")
       end
@@ -814,7 +814,7 @@ module JamWebsockets
       id = unsubscribe.id
       type = unsubscribe.type
       if id && id.length > 0 && type && type.length > 0
-        unregister_subscription(client, type, id)
+        #unregister_subscription(client, type, id)
       else
         @log.error("handle_subscribe: empty data #{unsubscribe}")
       end