Skip to content

Commit b6d9411

Browse files
committed
Removed unneeded shell scripts and formatting changes
1 parent 76cc3fb commit b6d9411

File tree

4 files changed

+8
-26
lines changed

4 files changed

+8
-26
lines changed

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@
1717
"scripts": {
1818
"build": "mvn -DskipTests",
1919
"build:fast": "mvn -DskipTests -pl externs/pom.xml,pom-main.xml,pom-main-shaded.xml",
20-
"build:runtime_tests": "./utils/runtime_tests_build.sh",
2120
"clean": "mvn clean",
22-
"run:jest": "jest --testRegex .*/utils/js/.* --verbose=true",
23-
"run:runtime_tests": "./utils/runtime_tests_run.sh",
24-
"runtime_tests": "npm run --silent build:runtime_tests && npm run --silent run:runtime_tests",
21+
"runtime_tests:build": "./utils/build_runtime_tests.sh",
22+
"runtime_tests:run": "jest --testRegex .*/utils/js/.* --verbose=true",
23+
"runtime_tests": "npm run --silent runtime_tests:build && npm run --silent runtime_tests:run",
2524
"test": "mvn test"
2625
}
2726
}
File renamed without changes.

utils/js/runtimeTests.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,16 @@ const TEST_FILES = glob.sync(path.resolve(
3434

3535
describe('Runtime tests', () => {
3636
for (const TEST_URL of TEST_FILES) {
37-
const TEST_NAME = path.basename(TEST_URL);
3837
const logs = [];
39-
const logAll = () => console.log(logs.join('\n'));
38+
const allLogs = () => logs.join('\n');
39+
40+
const TEST_NAME = path.basename(TEST_URL);
4041
const TestIsFinished = new FutureEvent();
4142
const virtualConsole = new VirtualConsole()
4243
.on('log', (msg) => {
4344
logs.push(msg);
44-
if (/Tests complete/i.test(msg)) TestIsFinished.ready(logs.join('\n'));
45-
else if (/Tests failed/i.test(msg)) TestIsFinished.cancel(logs.join('\n'));
45+
if (/Tests complete/i.test(msg)) TestIsFinished.ready(allLogs());
46+
else if (/Tests failed/i.test(msg)) TestIsFinished.cancel(allLogs());
4647
});
4748

4849
const TEST_DOC = fs.readFileSync(
@@ -64,7 +65,6 @@ describe('Runtime tests', () => {
6465
try {
6566
await TestIsFinished;
6667
} catch(e) {
67-
// logAll();
6868
fail(`Failed test in suite ${TEST_NAME}: \n\n${e}`);
6969
}
7070
console.log(`Passed all tests in suite ${TEST_NAME}`);

utils/runtime_tests_run.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)