split up pick integration tests to avoid cached info

test/integration/pick-tests.js

@@ -7,22 +7,23 @@ const chromeless = new Chromeless();
 const indexHTML = path.resolve(__dirname, 'index.html');
 const testDir = (...args) => path.resolve(__dirname, 'pick-tests', ...args);
 
-const runFile = (file, script) =>
+const runFile = (file, action, script) =>
     // start each test by going to the index.html, and loading the scratch file
     chromeless.goto(`file://${indexHTML}`)
         .setFileInput('#file', testDir(file))
         // the index.html handler for file input will add a #loaded element when it
         // finishes.
         .wait('#loaded')
-        .evaluate(script)
+        .evaluate(`function () {return (${script})(${action});}`)
 ;
 
 // immediately invoked async function to let us wait for each test to finish before starting the next.
 (async () => {
 
-    await test('pick tests', async t => {
+    const testOperation = async function (name, action, expect) {
+        await test(name, async t => {
 
-        const results = await runFile('test-mouse-touch.sb2', () => {
+            const results = await runFile('test-mouse-touch.sb2', action, boundAction => {
                 vm.greenFlag();
                 const sendResults = [];
 
@@ -35,27 +36,65 @@ const runFile = (file, script) =>
                 };
                 const sprite = vm.runtime.targets.find(target => target.sprite.name === 'Sprite1');
 
-            sendResults.push(['center', idToTargetName(render.pick(240, 180))]);
+                boundAction({
-            sendResults.push(['left', idToTargetName(render.pick(200, 180))]);
+                    sendResults,
-            sendResults.push(['over', render.drawableTouching(sprite.drawableID, 240, 180)]);
+                    idToTargetName,
-            sprite.setVisible(false);
+                    render,
-            sendResults.push(['hidden sprite pick center', idToTargetName(render.pick(240, 180))]);
+                    sprite
-            sendResults.push(['hidden over', render.drawableTouching(sprite.drawableID, 240, 180)]);
+                });
                 return sendResults;
             });
-        const expect = [
+
-            ['center', 'Sprite1'],
-            ['left', 'Stage'],
-            ['over', true],
-            ['hidden sprite pick center', 'Stage'],
-            ['hidden over', true]
-        ];
             t.plan(expect.length);
             for (let x = 0; x < expect.length; x++) {
                 t.deepEqual(results[x], expect[x], expect[x][0]);
             }
             t.end();
         });
+    };
+
+    const tests = [
+        {
+            name: 'pick Sprite1',
+            action: ({sendResults, render, idToTargetName}) => {
+                sendResults.push(['center', idToTargetName(render.pick(240, 180))]);
+            },
+            expect: [['center', 'Sprite1']]
+        },
+        {
+            name: 'pick Stage',
+            action: ({sendResults, render, idToTargetName}) => {
+                sendResults.push(['left', idToTargetName(render.pick(200, 180))]);
+            },
+            expect: [['left', 'Stage']]
+        },
+        {
+            name: 'touching Sprite1',
+            action: ({sprite, sendResults, render}) => {
+                sendResults.push(['over', render.drawableTouching(sprite.drawableID, 240, 180)]);
+            },
+            expect: [['over', true]]
+        },
+        {
+            name: 'pick Stage through hidden Sprite1',
+            action: ({sprite, sendResults, render, idToTargetName}) => {
+                sprite.setVisible(false);
+                sendResults.push(['hidden sprite pick center', idToTargetName(render.pick(240, 180))]);
+            },
+            expect: [['hidden sprite pick center', 'Stage']]
+        },
+        {
+            name: 'touching hidden Sprite1',
+            action: ({sprite, sendResults, render}) => {
+                sprite.setVisible(false);
+                sendResults.push(['hidden over', render.drawableTouching(sprite.drawableID, 240, 180)]);
+            },
+            expect: [['hidden over', true]]
+        }
+    ];
+    for (const {name, action, expect} of tests) {
+        await testOperation(name, action, expect);
+    }
 
     // close the browser window we used
     await chromeless.end();