svn commit: r1352287 - /rave/trunk/rave-portal-resources/src/test/javascript/raveSpec.js

[cgeer]

Author: cgeer
Date: Wed Jun 20 20:00:22 2012
New Revision: 1352287

URL: http://svn.apache.org/viewvc?rev=1352287&view=rev
Log:
RAVE-687 Fixed tests for event handlers.

Modified:
    rave/trunk/rave-portal-resources/src/test/javascript/raveSpec.js

Modified: rave/trunk/rave-portal-resources/src/test/javascript/raveSpec.js
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/test/javascript/raveSpec.js?rev=1352287&r1=1352286&r2=1352287&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/test/javascript/raveSpec.js (original)
+++ rave/trunk/rave-portal-resources/src/test/javascript/raveSpec.js Wed Jun 20 
20:00:22 2012
@@ -70,12 +70,12 @@ describe("Rave", function() {
                     // Ignore
                 }
             };
+            spyOn(handler, 'handleProvidersInitEvent');
 
             
rave.registerOnProvidersInitizalizedHandler(handler.handleProvidersInitEvent);
         });
 
         it("initializes all providers", function() {
-            spyOn(handler, 'handleProvidersInitEvent');
             var provider1 = getMockProvider("FOO");
             var provider2 = getMockProvider("BAR");
             rave.registerProvider(provider1);
@@ -83,8 +83,7 @@ describe("Rave", function() {
             rave.initProviders();
             expect(provider1.initWasCalled()).toBeTruthy();
             expect(provider2.initWasCalled()).toBeTruthy();
-            // TODO Figure out why this isn't being called in the test when it 
works in real life
-            //expect(handler.handleProvidersInitEvent).toHaveBeenCalled();
+            expect(handler.handleProvidersInitEvent).toHaveBeenCalled();
         });
     });
 
@@ -107,6 +106,7 @@ describe("Rave", function() {
                     // Ignore
                 }
             };
+            spyOn(handler, 'handleWidgetsInitEvent');
 
             
rave.registerOnWidgetsInitizalizedHandler(handler.handleWidgetsInitEvent);
         });
@@ -154,7 +154,6 @@ describe("Rave", function() {
         }
 
         it("calls the appropriate providers", function() {
-            spyOn(handler, 'handleWidgetsInitEvent');
             var HIDDEN_CLASS = "hidden";
             createMockJQuery();
             $().addClass(HIDDEN_CLASS);
@@ -177,8 +176,7 @@ describe("Rave", function() {
             expect(provider1.initWidgetsWasCalled(2)).toBeTruthy();
             expect(provider2.initWidgetsWasCalled(2)).toBeTruthy();
             expect($().hasClass(HIDDEN_CLASS)).toEqual(true);
-            // TODO Figure out why this isn't being called in the test when it 
works in real life
-            //expect(handler.handleWidgetsInitEvent).toHaveBeenCalled();
+            expect(handler.handleWidgetsInitEvent).toHaveBeenCalled();
         });
 
         it("renders widgets in the appropriate order (first 'row', second 
'row', third 'row', ...)", function() {