Skip to content

Commit bafdf8d

Browse files
author
Ray Schamp
committed
Use ES6 linting rules in the project root
Update all tests for `no-var` and `prefer-arrow-callback` (using `--fix`)
1 parent 5f59d1e commit bafdf8d

36 files changed

+666
-666
lines changed

‎.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
extends: ['scratch', 'scratch/node']
2+
extends: ['scratch', 'scratch/node', 'scratch/es6']
33
};

‎test/fixtures/attach-test-storage.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
var ScratchStorage = require('scratch-storage');
1+
const ScratchStorage = require('scratch-storage');
22

3-
var ASSET_SERVER = 'https://cdn.assets.scratch.mit.edu/';
4-
var PROJECT_SERVER = 'https://cdn.projects.scratch.mit.edu/';
3+
const ASSET_SERVER = 'https://cdn.assets.scratch.mit.edu/';
4+
const PROJECT_SERVER = 'https://cdn.projects.scratch.mit.edu/';
55

66
/**
77
* @param {Asset} asset - calculate a URL for this asset.
88
* @returns {string} a URL to download a project file.
99
*/
10-
var getProjectUrl = function (asset) {
11-
var assetIdParts = asset.assetId.split('.');
12-
var assetUrlParts = [PROJECT_SERVER, 'internalapi/project/', assetIdParts[0], '/get/'];
10+
const getProjectUrl = function (asset) {
11+
const assetIdParts = asset.assetId.split('.');
12+
const assetUrlParts = [PROJECT_SERVER, 'internalapi/project/', assetIdParts[0], '/get/'];
1313
if (assetIdParts[1]) {
1414
assetUrlParts.push(assetIdParts[1]);
1515
}
@@ -20,8 +20,8 @@ var getProjectUrl = function (asset) {
2020
* @param {Asset} asset - calculate a URL for this asset.
2121
* @returns {string} a URL to download a project asset (PNG, WAV, etc.)
2222
*/
23-
var getAssetUrl = function (asset) {
24-
var assetUrlParts = [
23+
const getAssetUrl = function (asset) {
24+
const assetUrlParts = [
2525
ASSET_SERVER,
2626
'internalapi/asset/',
2727
asset.assetId,
@@ -36,9 +36,9 @@ var getAssetUrl = function (asset) {
3636
* Construct a new instance of ScratchStorage, provide it with default web sources, and attach it to the provided VM.
3737
* @param {VirtualMachine} vm - the VM which will own the new ScratchStorage instance.
3838
*/
39-
var attachTestStorage = function (vm) {
40-
var storage = new ScratchStorage();
41-
var AssetType = storage.AssetType;
39+
const attachTestStorage = function (vm) {
40+
const storage = new ScratchStorage();
41+
const AssetType = storage.AssetType;
4242
storage.addWebSource([AssetType.Project], getProjectUrl);
4343
storage.addWebSource([AssetType.ImageVector, AssetType.ImageBitmap, AssetType.Sound], getAssetUrl);
4444
vm.attachStorage(storage);

‎test/fixtures/extract.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
var AdmZip = require('adm-zip');
1+
const AdmZip = require('adm-zip');
22

33
module.exports = function (path) {
4-
var zip = new AdmZip(path);
4+
const zip = new AdmZip(path);
55
return zip.readAsText('project.json', 'utf8');
66
};

‎test/fixtures/fake-renderer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var FakeRenderer = function () {
1+
const FakeRenderer = function () {
22
this.unused = '';
33
this.x = 0;
44
this.y = 0;

‎test/integration/complex.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
var fs = require('fs');
2-
var path = require('path');
3-
var test = require('tap').test;
4-
var attachTestStorage = require('../fixtures/attach-test-storage');
5-
var extract = require('../fixtures/extract');
6-
var VirtualMachine = require('../../src/index');
1+
const fs = require('fs');
2+
const path = require('path');
3+
const test = require('tap').test;
4+
const attachTestStorage = require('../fixtures/attach-test-storage');
5+
const extract = require('../fixtures/extract');
6+
const VirtualMachine = require('../../src/index');
77

8-
var projectUri = path.resolve(__dirname, '../fixtures/complex.sb2');
9-
var project = extract(projectUri);
8+
const projectUri = path.resolve(__dirname, '../fixtures/complex.sb2');
9+
const project = extract(projectUri);
1010

11-
var spriteUri = path.resolve(__dirname, '../fixtures/sprite.json');
12-
var sprite = fs.readFileSync(spriteUri, 'utf8');
11+
const spriteUri = path.resolve(__dirname, '../fixtures/sprite.json');
12+
const sprite = fs.readFileSync(spriteUri, 'utf8');
1313

14-
test('complex', function (t) {
15-
var vm = new VirtualMachine();
14+
test('complex', t => {
15+
const vm = new VirtualMachine();
1616
attachTestStorage(vm);
1717

1818
// Evaluate playground data and exit
19-
vm.on('playgroundData', function (e) {
20-
var threads = JSON.parse(e.threads);
19+
vm.on('playgroundData', e => {
20+
const threads = JSON.parse(e.threads);
2121
t.ok(threads.length === 0);
2222
t.end();
2323
process.nextTick(process.exit);
2424
});
2525

2626
// Manipulate each target
27-
vm.on('targetsUpdate', function (data) {
28-
var targets = data.targetList;
29-
for (var i in targets) {
27+
vm.on('targetsUpdate', data => {
28+
const targets = data.targetList;
29+
for (const i in targets) {
3030
if (targets[i].isStage === true) continue;
3131
if (targets[i].name.match(/test/)) continue;
3232

@@ -55,12 +55,12 @@ test('complex', function (t) {
5555
});
5656

5757
// Start VM, load project, and run
58-
t.doesNotThrow(function () {
58+
t.doesNotThrow(() => {
5959
vm.start();
6060
vm.clear();
6161
vm.setCompatibilityMode(false);
6262
vm.setTurboMode(false);
63-
vm.loadProject(project).then(function () {
63+
vm.loadProject(project).then(() => {
6464
vm.greenFlag();
6565

6666
// Post IO data
@@ -89,7 +89,7 @@ test('complex', function (t) {
8989
);
9090

9191
// After two seconds, get playground data and stop
92-
setTimeout(function () {
92+
setTimeout(() => {
9393
vm.getPlaygroundData();
9494
vm.stopAll();
9595
}, 2000);

‎test/integration/control.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
var path = require('path');
2-
var test = require('tap').test;
3-
var attachTestStorage = require('../fixtures/attach-test-storage');
4-
var extract = require('../fixtures/extract');
5-
var VirtualMachine = require('../../src/index');
1+
const path = require('path');
2+
const test = require('tap').test;
3+
const attachTestStorage = require('../fixtures/attach-test-storage');
4+
const extract = require('../fixtures/extract');
5+
const VirtualMachine = require('../../src/index');
66

7-
var uri = path.resolve(__dirname, '../fixtures/control.sb2');
8-
var project = extract(uri);
7+
const uri = path.resolve(__dirname, '../fixtures/control.sb2');
8+
const project = extract(uri);
99

10-
test('control', function (t) {
11-
var vm = new VirtualMachine();
10+
test('control', t => {
11+
const vm = new VirtualMachine();
1212
attachTestStorage(vm);
1313

1414
// Evaluate playground data and exit
15-
vm.on('playgroundData', function (e) {
16-
var threads = JSON.parse(e.threads);
15+
vm.on('playgroundData', e => {
16+
const threads = JSON.parse(e.threads);
1717
t.ok(threads.length > 0);
1818
t.end();
1919
process.nextTick(process.exit);
2020
});
2121

2222
// Start VM, load project, and run
23-
t.doesNotThrow(function () {
23+
t.doesNotThrow(() => {
2424
vm.start();
2525
vm.clear();
2626
vm.setCompatibilityMode(false);
2727
vm.setTurboMode(false);
28-
vm.loadProject(project).then(function () {
28+
vm.loadProject(project).then(() => {
2929
vm.greenFlag();
3030
});
3131
});
3232

3333
// After two seconds, get playground data and stop
34-
setTimeout(function () {
34+
setTimeout(() => {
3535
vm.getPlaygroundData();
3636
vm.stopAll();
3737
}, 2000);

‎test/integration/data.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
var path = require('path');
2-
var test = require('tap').test;
3-
var attachTestStorage = require('../fixtures/attach-test-storage');
4-
var extract = require('../fixtures/extract');
5-
var VirtualMachine = require('../../src/index');
1+
const path = require('path');
2+
const test = require('tap').test;
3+
const attachTestStorage = require('../fixtures/attach-test-storage');
4+
const extract = require('../fixtures/extract');
5+
const VirtualMachine = require('../../src/index');
66

7-
var uri = path.resolve(__dirname, '../fixtures/data.sb2');
8-
var project = extract(uri);
7+
const uri = path.resolve(__dirname, '../fixtures/data.sb2');
8+
const project = extract(uri);
99

10-
test('data', function (t) {
11-
var vm = new VirtualMachine();
10+
test('data', t => {
11+
const vm = new VirtualMachine();
1212
attachTestStorage(vm);
1313

1414
// Evaluate playground data and exit
15-
vm.on('playgroundData', function () {
15+
vm.on('playgroundData', () => {
1616
// @todo Additional tests
1717
t.end();
1818
process.nextTick(process.exit);
1919
});
2020

2121
// Start VM, load project, and run
22-
t.doesNotThrow(function () {
22+
t.doesNotThrow(() => {
2323
vm.start();
2424
vm.clear();
2525
vm.setCompatibilityMode(false);
2626
vm.setTurboMode(false);
27-
vm.loadProject(project).then(function () {
27+
vm.loadProject(project).then(() => {
2828
vm.greenFlag();
2929

3030
// After two seconds, get playground data and stop
31-
setTimeout(function () {
31+
setTimeout(() => {
3232
vm.getPlaygroundData();
3333
vm.stopAll();
3434
}, 2000);

‎test/integration/event.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
var path = require('path');
2-
var test = require('tap').test;
3-
var attachTestStorage = require('../fixtures/attach-test-storage');
4-
var extract = require('../fixtures/extract');
5-
var VirtualMachine = require('../../src/index');
1+
const path = require('path');
2+
const test = require('tap').test;
3+
const attachTestStorage = require('../fixtures/attach-test-storage');
4+
const extract = require('../fixtures/extract');
5+
const VirtualMachine = require('../../src/index');
66

7-
var uri = path.resolve(__dirname, '../fixtures/event.sb2');
8-
var project = extract(uri);
7+
const uri = path.resolve(__dirname, '../fixtures/event.sb2');
8+
const project = extract(uri);
99

10-
test('event', function (t) {
11-
var vm = new VirtualMachine();
10+
test('event', t => {
11+
const vm = new VirtualMachine();
1212
attachTestStorage(vm);
1313

1414
// Evaluate playground data and exit
15-
vm.on('playgroundData', function (e) {
16-
var threads = JSON.parse(e.threads);
15+
vm.on('playgroundData', e => {
16+
const threads = JSON.parse(e.threads);
1717
t.ok(threads.length > 0);
1818
t.end();
1919
process.nextTick(process.exit);
2020
});
2121

2222
// Start VM, load project, and run
23-
t.doesNotThrow(function () {
23+
t.doesNotThrow(() => {
2424
vm.start();
2525
vm.clear();
2626
vm.setCompatibilityMode(false);
2727
vm.setTurboMode(false);
28-
vm.loadProject(project).then(function () {
28+
vm.loadProject(project).then(() => {
2929
vm.greenFlag();
3030

3131
// After two seconds, get playground data and stop
32-
setTimeout(function () {
32+
setTimeout(() => {
3333
vm.getPlaygroundData();
3434
vm.stopAll();
3535
}, 2000);

‎test/integration/hat-execution-order.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
var path = require('path');
2-
var test = require('tap').test;
3-
var attachTestStorage = require('../fixtures/attach-test-storage');
4-
var extract = require('../fixtures/extract');
5-
var VirtualMachine = require('../../src/index');
1+
const path = require('path');
2+
const test = require('tap').test;
3+
const attachTestStorage = require('../fixtures/attach-test-storage');
4+
const extract = require('../fixtures/extract');
5+
const VirtualMachine = require('../../src/index');
66

7-
var projectUri = path.resolve(__dirname, '../fixtures/hat-execution-order.sb2');
8-
var project = extract(projectUri);
7+
const projectUri = path.resolve(__dirname, '../fixtures/hat-execution-order.sb2');
8+
const project = extract(projectUri);
99

10-
test('complex', function (t) {
11-
var vm = new VirtualMachine();
10+
test('complex', t => {
11+
const vm = new VirtualMachine();
1212
attachTestStorage(vm);
1313

1414
// Evaluate playground data and exit
15-
vm.on('playgroundData', function (e) {
16-
var threads = JSON.parse(e.threads);
15+
vm.on('playgroundData', e => {
16+
const threads = JSON.parse(e.threads);
1717
t.ok(threads.length === 0);
1818

19-
var results = vm.runtime.targets[0].lists.results.contents;
19+
const results = vm.runtime.targets[0].lists.results.contents;
2020
t.deepEqual(results, ['3', '2', '1', 'stage']);
2121

2222
t.end();
2323
process.nextTick(process.exit);
2424
});
2525

2626
// Start VM, load project, and run
27-
t.doesNotThrow(function () {
27+
t.doesNotThrow(() => {
2828
vm.start();
2929
vm.clear();
3030
vm.setCompatibilityMode(false);
3131
vm.setTurboMode(false);
32-
vm.loadProject(project).then(function () {
32+
vm.loadProject(project).then(() => {
3333
vm.greenFlag();
3434

3535
// After two seconds, get playground data and stop
36-
setTimeout(function () {
36+
setTimeout(() => {
3737
vm.getPlaygroundData();
3838
vm.stopAll();
3939
}, 2000);

‎test/integration/import_sb2.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
var path = require('path');
2-
var test = require('tap').test;
3-
var attachTestStorage = require('../fixtures/attach-test-storage');
4-
var extract = require('../fixtures/extract');
1+
const path = require('path');
2+
const test = require('tap').test;
3+
const attachTestStorage = require('../fixtures/attach-test-storage');
4+
const extract = require('../fixtures/extract');
55

6-
var renderedTarget = require('../../src/sprites/rendered-target');
7-
var runtime = require('../../src/engine/runtime');
8-
var sb2 = require('../../src/import/sb2import');
6+
const renderedTarget = require('../../src/sprites/rendered-target');
7+
const runtime = require('../../src/engine/runtime');
8+
const sb2 = require('../../src/import/sb2import');
99

10-
test('spec', function (t) {
10+
test('spec', t => {
1111
t.type(sb2, 'function');
1212
t.end();
1313
});
1414

15-
test('default', function (t) {
15+
test('default', t => {
1616
// Get SB2 JSON (string)
17-
var uri = path.resolve(__dirname, '../fixtures/default.sb2');
18-
var file = extract(uri);
17+
const uri = path.resolve(__dirname, '../fixtures/default.sb2');
18+
const file = extract(uri);
1919

2020
// Create runtime instance & load SB2 into it
21-
var rt = new runtime();
21+
const rt = new runtime();
2222
attachTestStorage(rt);
23-
sb2(file, rt).then(function (targets) {
23+
sb2(file, rt).then(targets => {
2424
// Test
2525
t.type(file, 'string');
2626
t.type(rt, 'object');

0 commit comments

Comments
 (0)