More tests

Author: Daniel Brain

karma.conf.js

@@ -18,8 +18,8 @@ module.exports = function(config) {
         // list of files / patterns to load in the browser
         files: [
             { pattern: 'test/test.js', included: true, served: true },
-            { pattern: 'test/child.js', included: false, served: true },
-            { pattern: 'test/child.htm', included: false, served: true }
+            { pattern: 'test/*.js', included: false, served: true },
+            { pattern: 'test/*.htm', included: false, served: true },
         ],
 
         plugins: [
@@ -73,7 +73,7 @@ module.exports = function(config) {
                 postLoaders: [
                     {
                         test: /\.js$/,
-                        exclude: /(node_modules|bower_components|dist)/,
+                        exclude: /(node_modules|bower_components|dist|test)/,
                         loader: 'istanbul-instrumenter'
                     }
                 ]

src/conf/config.js

@@ -1,15 +1,22 @@
 
-
+import { CONSTANTS } from './constants';
 
 export let CONFIG = {
 
     ALLOW_POSTMESSAGE_POPUP: true,
 
     DEBUG: false,
 
-    ACK_TIMEOUT: 3000,
+    ACK_TIMEOUT: 1000,
 
     LOG_TO_PAGE: false,
 
-    MOCK_MODE: false
+    MOCK_MODE: false,
+
+    ALLOWED_POST_MESSAGE_METHODS: {
+        [ CONSTANTS.SEND_STRATEGIES.POST_MESSAGE ]: true,
+        [ CONSTANTS.SEND_STRATEGIES.POST_MESSAGE_GLOBAL_METHOD ]: true,
+        [ CONSTANTS.SEND_STRATEGIES.POST_MESSAGE_UP_THROUGH_BRIDGE ]: true,
+        [ CONSTANTS.SEND_STRATEGIES.POST_MESSAGE_DOWN_THROUGH_BRIDGE ]: true
+    }
 };

src/conf/constants.js

@@ -29,5 +29,12 @@ export let CONSTANTS = {
 
     SERIALIZATION_TYPES: {
         METHOD: 'postrobot_method'
+    },
+
+    SEND_STRATEGIES: {
+        POST_MESSAGE: 'postrobot_post_message',
+        POST_MESSAGE_GLOBAL_METHOD: 'postrobot_post_message_global_method',
+        POST_MESSAGE_UP_THROUGH_BRIDGE: 'postrobot_post_message_up_through_bridge',
+        POST_MESSAGE_DOWN_THROUGH_BRIDGE: 'postrobot_post_message_down_through_bridge'
     }
 };

src/drivers/send/index.js

@@ -40,17 +40,25 @@ export let sendMessage = promise.method((win, message, domain, isProxy) => {
 
         util.debug('Running send message strategies', message);
 
-        return promise.Promise.all(util.map(util.keys(SEND_MESSAGE_STRATEGIES), strategyName => {
+        return promise.map(util.keys(SEND_MESSAGE_STRATEGIES), strategyName => {
 
-            return SEND_MESSAGE_STRATEGIES[strategyName](win, message, domain).then(() => {
+            return promise.run(() => {
+
+                if (!CONFIG.ALLOWED_POST_MESSAGE_METHODS[strategyName]) {
+                    throw new Error(`Strategy disallowed: ${strategyName}`);
+                }
+
+                return SEND_MESSAGE_STRATEGIES[strategyName](win, message, domain);
+
+            }).then(() => {
                 util.debug(strategyName, 'success');
                 return true;
             }, err => {
                 util.debugError(strategyName, 'error\n\n', err.stack || err.toString());
                 return false;
             });
 
-        })).then(results => {
+        }).then(results => {
 
             if (!util.some(results)) {
                 throw new Error('No post-message strategy succeeded');

src/drivers/send/strategies.js

@@ -5,14 +5,14 @@ import { emulateIERestrictions, getBridge, getBridgeFor } from '../../compat';
 
 export let SEND_MESSAGE_STRATEGIES = {
 
-    POST_MESSAGE: promise.method((win, message, domain) => {
+    [ CONSTANTS.SEND_STRATEGIES.POST_MESSAGE ]: promise.method((win, message, domain) => {
 
         emulateIERestrictions(window, win);
 
         return win.postMessage(JSON.stringify(message, 0, 2), domain);
     }),
 
-    POST_MESSAGE_GLOBAL_METHOD: promise.method((win, message, domain) => {
+    [ CONSTANTS.SEND_STRATEGIES.POST_MESSAGE_GLOBAL_METHOD ]: promise.method((win, message, domain) => {
 
         if (domain !== '*') {
 
@@ -44,7 +44,7 @@ export let SEND_MESSAGE_STRATEGIES = {
         });
     }),
 
-    POST_MESSAGE_UP_THROUGH_BRIDGE: promise.method((win, message, domain) => {
+    [ CONSTANTS.SEND_STRATEGIES.POST_MESSAGE_UP_THROUGH_BRIDGE ]: promise.method((win, message, domain) => {
 
         let frame = getBridgeFor(win);
 
@@ -59,7 +59,7 @@ export let SEND_MESSAGE_STRATEGIES = {
         return frame[CONSTANTS.WINDOW_PROPS.POSTROBOT].postMessageParent(window, JSON.stringify(message, 0, 2), domain);
     }),
 
-    POST_MESSAGE_DOWN_THROUGH_BRIDGE: promise.method((win, message, domain) => {
+    [ CONSTANTS.SEND_STRATEGIES.POST_MESSAGE_DOWN_THROUGH_BRIDGE ]: promise.method((win, message, domain) => {
 
         let bridge = getBridge();
 

src/interface/config.js

@@ -7,4 +7,6 @@ export function enableMockMode() {
 
 export function disableMockMode() {
     CONFIG.MOCK_MODE = false;
-}
+}
+
+export { CONFIG, CONSTANTS } from '../conf';

src/interface/server.js

@@ -20,7 +20,7 @@ export function listen(options) {
     if (options.once) {
         let handler = options.handler;
         options.handler = util.once(function() {
-            removeRequestListener(options)
+            removeRequestListener(options);
             return handler.apply(this, arguments);
         });
     }

src/lib/promise.js

@@ -47,5 +47,16 @@ export let promise = {
                 return reject(err);
             }
         });
+    },
+
+    map(items, method) {
+
+        let results = [];
+        for (let i = 0; i < items.length; i++) {
+            results.push(promise.run(() => {
+                return method(items[i]);
+            }));
+        }
+        return promise.Promise.all(results);
     }
 };

test/bridge.htm

@@ -0,0 +1 @@
+<script src="/base/test/child.js"></script>

test/child.htm

@@ -1 +1,5 @@
-<script src="/base/test/child.js"></script>
+<script src="/base/test/child.js"></script>
+
+<script>
+    postRobot.openBridge('/base/test/child.htm');
+</script>

test/child.js

@@ -13,12 +13,12 @@ postRobot.on('sendMessageToParent', function(source, data) {
 
 postRobot.on('setupListener', function(source, data) {
     postRobot.once(data.messageName, function() {
-        return data.data;
+        return data.handler ? data.handler() : data.data;
     });
 });
 
 postRobot.on('waitForMessage', function(source, data) {
     return postRobot.once(data.messageName, function() {
-        return data.data;
+        return data.handler ? data.handler() : data.data;
     });
 });