mirror of
https://github.com/scratchfoundation/scratch-render.git
synced 2025-06-03 09:04:16 -04:00
Quick example of a collision test integration test (#265)
* Quick example of a collision test integration test * Add a test for ghost and hidden sprites * enable scratch/es6 which then had my lint error for `(param) => {}` arrows * cleanup npm test command * an a was an an but should have been an a * 2space tabs for the html doc * Add some comments in the integration index html * Add a few more comments about intentionally leaking variables into the global scope * add some more comments for the integration helper and add a timeout * 4 space tabs are actually correct * adding even more comments and improving readability a little * fix lint no-shadow rule * fix indentation on comment
This commit is contained in:
parent
a153a72e5b
commit
e5d1516b1b
8 changed files with 167 additions and 3 deletions
|
@ -1,4 +1,4 @@
|
||||||
module.exports = {
|
module.exports = {
|
||||||
root: true,
|
root: true,
|
||||||
extends: ['scratch', 'scratch/node']
|
extends: ['scratch', 'scratch/node', 'scratch/es6']
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,9 +1,14 @@
|
||||||
language: node_js
|
language: node_js
|
||||||
|
dist: trusty
|
||||||
|
addons:
|
||||||
|
chrome: stable
|
||||||
node_js:
|
node_js:
|
||||||
- 8
|
- 8
|
||||||
- node
|
- node
|
||||||
env:
|
env:
|
||||||
- NODE_ENV=production
|
- NODE_ENV=production
|
||||||
|
before_install:
|
||||||
|
- google-chrome-stable --headless --no-sandbox --remote-debugging-port=9222 &
|
||||||
install:
|
install:
|
||||||
- npm --production=false install
|
- npm --production=false install
|
||||||
- npm --production=false update
|
- npm --production=false update
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
"prepublish": "npm run build",
|
"prepublish": "npm run build",
|
||||||
"prepublish-watch": "npm run watch",
|
"prepublish-watch": "npm run watch",
|
||||||
"start": "webpack-dev-server",
|
"start": "webpack-dev-server",
|
||||||
"tap": "./node_modules/.bin/tap ./test/unit/*.js",
|
"tap": "tap test/unit test/integration",
|
||||||
"test": "npm run lint && npm run docs && npm run tap",
|
"test": "npm run lint && npm run docs && npm run build && npm run tap",
|
||||||
"version": "json -f package.json -I -e \"this.repository.sha = '$(git log -n1 --pretty=format:%H)'\"",
|
"version": "json -f package.json -I -e \"this.repository.sha = '$(git log -n1 --pretty=format:%H)'\"",
|
||||||
"watch": "webpack --progress --colors --watch --watch-poll"
|
"watch": "webpack --progress --colors --watch --watch-poll"
|
||||||
},
|
},
|
||||||
|
@ -30,6 +30,7 @@
|
||||||
"babel-polyfill": "^6.22.0",
|
"babel-polyfill": "^6.22.0",
|
||||||
"babel-preset-es2015": "^6.22.0",
|
"babel-preset-es2015": "^6.22.0",
|
||||||
"base64-loader": "^1.0.0",
|
"base64-loader": "^1.0.0",
|
||||||
|
"chromeless": "^1.5.1",
|
||||||
"copy-webpack-plugin": "^4.0.1",
|
"copy-webpack-plugin": "^4.0.1",
|
||||||
"docdash": "^0.4.0",
|
"docdash": "^0.4.0",
|
||||||
"eslint": "^4.6.1",
|
"eslint": "^4.6.1",
|
||||||
|
@ -42,7 +43,9 @@
|
||||||
"json": "^9.0.4",
|
"json": "^9.0.4",
|
||||||
"linebreak": "0.3.0",
|
"linebreak": "0.3.0",
|
||||||
"raw-loader": "^0.5.1",
|
"raw-loader": "^0.5.1",
|
||||||
|
"scratch-storage": "^0.4.0",
|
||||||
"scratch-svg-renderer": "0.1.0-prerelease.20180423193917",
|
"scratch-svg-renderer": "0.1.0-prerelease.20180423193917",
|
||||||
|
"scratch-vm": "0.1.0-prerelease.1524520946",
|
||||||
"tap": "^11.0.0",
|
"tap": "^11.0.0",
|
||||||
"travis-after-all": "^1.4.4",
|
"travis-after-all": "^1.4.4",
|
||||||
"twgl.js": "4.4.0",
|
"twgl.js": "4.4.0",
|
||||||
|
|
43
test/integration/index.html
Normal file
43
test/integration/index.html
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
<body>
|
||||||
|
<script src="../../node_modules/scratch-vm/dist/web/scratch-vm.js"></script>
|
||||||
|
<script src="../../node_modules/scratch-storage/dist/web/scratch-storage.js"></script>
|
||||||
|
<!-- note: this uses the BUILT version of scratch-render! make sure to npm run build -->
|
||||||
|
<script src="../../dist/web/scratch-render.js"></script>
|
||||||
|
|
||||||
|
<canvas id="test" width="480" height="360"></canvas>
|
||||||
|
<input type="file" id="file" name="file">
|
||||||
|
|
||||||
|
<script>
|
||||||
|
// These variables are going to be available in the "window global" intentionally.
|
||||||
|
// Allows you easy access to debug with `vm.greenFlag()` etc.
|
||||||
|
|
||||||
|
var render = new ScratchRender(document.getElementById('test'));
|
||||||
|
var vm = new VirtualMachine();
|
||||||
|
var storage = new ScratchStorage();
|
||||||
|
|
||||||
|
vm.attachStorage(storage);
|
||||||
|
vm.attachRenderer(render);
|
||||||
|
|
||||||
|
document.getElementById('file').addEventListener('click', e => {
|
||||||
|
document.body.removeChild(document.getElementById('loaded'));
|
||||||
|
});
|
||||||
|
|
||||||
|
document.getElementById('file').addEventListener('change', e => {
|
||||||
|
const reader = new FileReader();
|
||||||
|
const thisFileInput = e.target;
|
||||||
|
reader.onload = () => {
|
||||||
|
vm.start();
|
||||||
|
vm.loadProject(reader.result)
|
||||||
|
.then(() => {
|
||||||
|
// we add a `#loaded` div to our document, the integration suite
|
||||||
|
// waits for that element to show up to assume the vm is ready
|
||||||
|
// to play!
|
||||||
|
const div = document.createElement('div');
|
||||||
|
div.id='loaded';
|
||||||
|
document.body.appendChild(div);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
reader.readAsArrayBuffer(thisFileInput.files[0]);
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
</body>
|
113
test/integration/scratch-tests.js
Normal file
113
test/integration/scratch-tests.js
Normal file
|
@ -0,0 +1,113 @@
|
||||||
|
/* global vm, Promise */
|
||||||
|
const {Chromeless} = require('chromeless');
|
||||||
|
const test = require('tap').test;
|
||||||
|
const path = require('path');
|
||||||
|
const fs = require('fs');
|
||||||
|
const chromeless = new Chromeless();
|
||||||
|
|
||||||
|
const indexHTML = path.resolve(__dirname, 'index.html');
|
||||||
|
const testDir = (...args) => path.resolve(__dirname, 'scratch-tests', ...args);
|
||||||
|
|
||||||
|
const testFile = file => test(file, async t => {
|
||||||
|
// start each test by going to the index.html, and loading the scratch file
|
||||||
|
const says = await 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(() => {
|
||||||
|
// This function is run INSIDE the integration chrome browser via some
|
||||||
|
// injection and .toString() magic. We can return some "simple data"
|
||||||
|
// back across as a promise, so we will just log all the says that happen
|
||||||
|
// for parsing after.
|
||||||
|
|
||||||
|
// this becomes the `says` in the outer scope
|
||||||
|
const messages = [];
|
||||||
|
const TIMEOUT = 5000;
|
||||||
|
|
||||||
|
vm.runtime.on('SAY', (_, __, message) => {
|
||||||
|
messages.push(message);
|
||||||
|
});
|
||||||
|
|
||||||
|
vm.greenFlag();
|
||||||
|
const startTime = Date.now();
|
||||||
|
|
||||||
|
return Promise.resolve()
|
||||||
|
.then(async () => {
|
||||||
|
// waiting for all threads to complete, then we return
|
||||||
|
while (vm.runtime.threads.length > 0) {
|
||||||
|
if ((Date.now() - startTime) >= TIMEOUT) {
|
||||||
|
messages.push(`fail Threads still running after ${TIMEOUT}ms`);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 50));
|
||||||
|
}
|
||||||
|
|
||||||
|
return messages;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Map string messages to tap reporting methods. This will be used
|
||||||
|
// with events from scratch's runtime emitted on block instructions.
|
||||||
|
let didPlan = false;
|
||||||
|
let didEnd = false;
|
||||||
|
const reporters = {
|
||||||
|
comment (message) {
|
||||||
|
t.comment(message);
|
||||||
|
},
|
||||||
|
pass (reason) {
|
||||||
|
t.pass(reason);
|
||||||
|
},
|
||||||
|
fail (reason) {
|
||||||
|
t.fail(reason);
|
||||||
|
},
|
||||||
|
plan (count) {
|
||||||
|
didPlan = true;
|
||||||
|
t.plan(Number(count));
|
||||||
|
},
|
||||||
|
end () {
|
||||||
|
didEnd = true;
|
||||||
|
t.end();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// loop over each "SAY" we caught from the VM and use the reporters
|
||||||
|
says.forEach(text => {
|
||||||
|
// first word of the say is going to be a "command"
|
||||||
|
const command = text.split(/\s+/, 1)[0].toLowerCase();
|
||||||
|
if (reporters[command]) {
|
||||||
|
return reporters[command](text.substring(command.length).trim());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Default to a comment with the full text if we didn't match
|
||||||
|
// any command prefix
|
||||||
|
return reporters.comment(text);
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!didPlan) {
|
||||||
|
t.comment('did not say "plan NUMBER_OF_TESTS"');
|
||||||
|
}
|
||||||
|
|
||||||
|
// End must be called so that tap knows the test is done. If
|
||||||
|
// the test has a SAY "end" block but that block did not
|
||||||
|
// execute, this explicit failure will raise that issue so
|
||||||
|
// it can be resolved.
|
||||||
|
if (!didEnd) {
|
||||||
|
t.fail('did not say "end"');
|
||||||
|
t.end();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// immediately invoked async function to let us wait for each test to finish before starting the next.
|
||||||
|
(async () => {
|
||||||
|
const files = fs.readdirSync(testDir())
|
||||||
|
.filter(uri => uri.endsWith('.sb2') || uri.endsWidth('.sb3'));
|
||||||
|
|
||||||
|
for (const file of files) {
|
||||||
|
await testFile(file);
|
||||||
|
}
|
||||||
|
|
||||||
|
// close the browser window we used
|
||||||
|
await chromeless.end();
|
||||||
|
})();
|
BIN
test/integration/scratch-tests/cat-touches-box.sb2
Normal file
BIN
test/integration/scratch-tests/cat-touches-box.sb2
Normal file
Binary file not shown.
BIN
test/integration/scratch-tests/ghost-hidden-collide.sb2
Normal file
BIN
test/integration/scratch-tests/ghost-hidden-collide.sb2
Normal file
Binary file not shown.
BIN
test/integration/scratch-tests/tippy-toe-collision.sb2
Normal file
BIN
test/integration/scratch-tests/tippy-toe-collision.sb2
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue