From 34681a15d70c8b7812f28a9dc256ad8730e168a3 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 10 Jun 2013 22:19:11 +0200 Subject: [PATCH] Improved browser tests. --- .../javascripts/app/lib/app_post/task_manager.js.coffee | 8 ++++---- .../javascripts/app/lib/app_post/websocket.js.coffee | 2 +- app/controllers/long_polling_controller.rb | 4 ++-- test/browser/taskbar_session_test.rb | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee b/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee index badb9cc5f..9d0f53ada 100644 --- a/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee @@ -252,10 +252,6 @@ class _Singleton extends App.Controller # reopen tasks App.Event.trigger 'taskbar:init' -# App.Taskbar.fetch() - tasks = @all() - return if !tasks - # check if we have different # broadcast to other browser instance @@ -269,6 +265,10 @@ class _Singleton extends App.Controller client_id: @clientId() ) +# App.Taskbar.fetch() + tasks = @all() + return if !tasks + task_count = 0 for task in tasks task_count += 1 diff --git a/app/assets/javascripts/app/lib/app_post/websocket.js.coffee b/app/assets/javascripts/app/lib/app_post/websocket.js.coffee index 22cfb7cee..a381bd7d0 100644 --- a/app/assets/javascripts/app/lib/app_post/websocket.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/websocket.js.coffee @@ -77,7 +77,7 @@ class _Singleton extends App.Controller # A value of 1 indicates that the connection is established and communication is possible. # A value of 2 indicates that the connection is going through the closing handshake. # A value of 3 indicates that the connection has been closed or could not be opened. - if @ws.readyState is 0 + if @ws.readyState isnt 1 @queue.push data else string = JSON.stringify( data ) diff --git a/app/controllers/long_polling_controller.rb b/app/controllers/long_polling_controller.rb index 1a08657ad..6e91827f7 100644 --- a/app/controllers/long_polling_controller.rb +++ b/app/controllers/long_polling_controller.rb @@ -67,8 +67,8 @@ class LongPollingController < ApplicationController if local_client_id.to_s != client_id.to_s # broadcast to recipient list - if params['data']['recipient'] && params['data']['recipient']['user_id'] - params['data']['recipient']['user_id'].each { |user_id| + if params['data']['data']['recipient'] && params['data']['data']['recipient']['user_id'] + params['data']['data']['recipient']['user_id'].each { |user_id| if local_client[:user][:id] == user_id log 'notice', "send broadcast (user_id #{user_id})", local_client_id Session.send( local_client_id, params['data'] ) diff --git a/test/browser/taskbar_session_test.rb b/test/browser/taskbar_session_test.rb index b07cd6e44..ef23f85a6 100644 --- a/test/browser/taskbar_session_test.rb +++ b/test/browser/taskbar_session_test.rb @@ -8,9 +8,9 @@ class TaskbarSessionTest < TestCase :name => 'start', :instance1 => browser_instance, :instance2 => browser_instance, - :instance1_username => 'master@example.com', + :instance1_username => 'agent1@example.com', :instance1_password => 'test', - :instance2_username => 'master@example.com', + :instance2_username => 'agent1@example.com', :instance2_password => 'test', :url => browser_url, :action => [ @@ -28,7 +28,7 @@ class TaskbarSessionTest < TestCase }, { :execute => 'wait', - :value => 5, + :value => 10, }, { :where => :instance1, @@ -80,7 +80,7 @@ class TaskbarSessionTest < TestCase }, { :execute => 'wait', - :value => 5, + :value => 10, }, { :where => :instance1,