Merge 5f619f4 into ad14cde

referral/static/js/referral/app.js

@@ -32,9 +32,9 @@ app.config(function($routeProvider){
         .when('/:route', {
             controller: 'ReferralCtrl',
             resolve: {
-                referral_route: function(referralLoader){ return referralLoader() },
-            	referencedata : function(Referencedata) { return Referencedata; },
-            	recordFields  : function(recordLoader) { return recordLoader; },
+              referral_route: function(referralLoader){ return referralLoader() },
+            	referencedata : function(Referencedata) { return Referencedata.load(); },
+            	recordFields  : function(recordLoader) { return recordLoader.load(); },
             },
             templateUrl: function(params){
                 return '/referral/templates/' + params.route + '.html'

referral/static/js/test/app.test.js

@@ -0,0 +1,35 @@
+describe('should configure our routes correctly!', function(){
+    "use strict";
+
+    var route, opalTestHelper;
+
+    beforeEach(function(){
+        module('opal.referral');
+        module('opal.test');
+
+        inject(function($injector){
+            route = $injector.get('$route');
+            opalTestHelper = $injector.get('opalTestHelper');
+        });
+    });
+
+    it('Detail view should resolve data', function(){
+        var result;
+        var resolve = route.routes['/:route'].resolve;
+        var recordLoader = opalTestHelper.getRecordLoader();
+        var referenceDataLoader = opalTestHelper.getReferenceDataLoader();
+        var referralLoader = jasmin.createSpy();
+        referralLoader.and.returnValue = "as";
+
+        expect(resolve.referral_route(referralLoader)).toBe("as");
+        expect(referralLoader).toHaveBeenCalled();
+
+        result = resolve.referencedata(referenceDataLoader);
+        expect(referenceDataLoader.load()).toHaveBeenCalled();
+        expect(!!result.then).toBe(true);
+
+        result = resolve.recordFields(recordLoader);
+        expect(recordLoader.load()).toHaveBeenCalled();
+        expect(!!result.then).toBe(true);
+    });
+});