Skip to content

Commit 0e13400

Browse files
DZakhDZakh
authored
[chore] Prettify test files (#6357)
* Update prettierignore to include test input.js files * Format test files
1 parent 61c5592 commit 0e13400

File tree

18 files changed

+134
-120
lines changed

18 files changed

+134
-120
lines changed

‎.prettierignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
jscomp/
1+
jscomp/*
2+
!jscomp/build_tests
3+
jscomp/build_tests/*/**
4+
!jscomp/build_tests/*/input.js
25
lib/
36
vendor/
47
ninja/

‎jscomp/build_tests/case/input.js‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1+
var p = require("child_process");
2+
var assert = require("assert");
3+
var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
4+
var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
15

2-
3-
var p = require('child_process')
4-
var assert = require('assert')
5-
var rescript_exe = require("../../../scripts/bin_path").rescript_exe
6-
var o = p.spawnSync(rescript_exe,{encoding: 'utf8',cwd : __dirname})
7-
8-
9-
assert.ok(o.stderr.match(/different cases/).length > 0 )
6+
assert.ok(o.stderr.match(/different cases/).length > 0);

‎jscomp/build_tests/cmd/input.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function evalCode(code) {
3434
{
3535
encoding: "utf8",
3636
shell: true,
37-
cwd: __dirname
37+
cwd: __dirname,
3838
}
3939
);
4040

‎jscomp/build_tests/cycle/input.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
//@ts-check
22
const cp = require("child_process");
33
const assert = require("assert");
4-
const fs = require('fs')
5-
const path = require('path')
4+
const fs = require("fs");
5+
const path = require("path");
66
var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
77

88
var output = cp.spawnSync(rescript_exe, { encoding: "utf8", shell: true });
99

1010
assert(/dependency cycle/.test(output.stdout));
1111

12-
var compilerLogFile = path.join(__dirname, 'lib', 'bs', '.compiler.log');
13-
var compilerLog = fs.readFileSync(compilerLogFile, 'utf8');
12+
var compilerLogFile = path.join(__dirname, "lib", "bs", ".compiler.log");
13+
var compilerLog = fs.readFileSync(compilerLogFile, "utf8");
1414
assert(/dependency cycle/.test(compilerLog));

‎jscomp/build_tests/cycle1/input.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
//@ts-check
22
const cp = require("child_process");
33
const assert = require("assert");
4-
const fs = require('fs')
5-
const path = require('path')
6-
var rescript_exe = require("../../../scripts/bin_path").rescript_exe
4+
const fs = require("fs");
5+
const path = require("path");
6+
var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
77

8-
cp.execSync(`${rescript_exe} clean`, { cwd: __dirname, });
8+
cp.execSync(`${rescript_exe} clean`, { cwd: __dirname });
99

1010
var output = cp.spawnSync(rescript_exe, { encoding: "utf8", shell: true });
1111

1212
assert(/is dangling/.test(output.stdout));
1313

14-
var compilerLogFile = path.join(__dirname, 'lib', 'bs', '.compiler.log');
15-
var compilerLog = fs.readFileSync(compilerLogFile, 'utf8');
14+
var compilerLogFile = path.join(__dirname, "lib", "bs", ".compiler.log");
15+
var compilerLog = fs.readFileSync(compilerLogFile, "utf8");
1616
assert(/is dangling/.test(compilerLog));

‎jscomp/build_tests/devonly/input.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//@ts-check
22
var cp = require("child_process");
3-
var rescript_exe = require("../../../scripts/bin_path").rescript_exe
3+
var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
44

55
cp.execSync(rescript_exe, { cwd: __dirname, encoding: "utf8" });

‎jscomp/build_tests/duplicated_symlinked_packages/input.js‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
const fs = require('fs')
2-
const path = require('path')
3-
const child_process = require('child_process')
4-
const rescript_exe = require("../../../scripts/bin_path").rescript_exe
1+
const fs = require("fs");
2+
const path = require("path");
3+
const child_process = require("child_process");
4+
const rescript_exe = require("../../../scripts/bin_path").rescript_exe;
55

6-
const expectedFilePath = path.join(__dirname, 'out.expected')
6+
const expectedFilePath = path.join(__dirname, "out.expected");
77

8-
const updateTests = process.argv[2] === 'update'
8+
const updateTests = process.argv[2] === "update";
99

10-
function postProcessErrorOutput (output) {
11-
output = output.trimRight()
12-
output = output.replace(new RegExp(__dirname, 'gi'), '.')
13-
return output
10+
function postProcessErrorOutput(output) {
11+
output = output.trimRight();
12+
output = output.replace(new RegExp(__dirname, "gi"), ".");
13+
return output;
1414
}
15-
child_process.execSync(`${rescript_exe} clean`,{cwd:__dirname})
16-
child_process.exec(rescript_exe, {cwd: __dirname}, (err, stdout, stderr) => {
17-
const actualErrorOutput = postProcessErrorOutput(stderr.toString())
15+
child_process.execSync(`${rescript_exe} clean`, { cwd: __dirname });
16+
child_process.exec(rescript_exe, { cwd: __dirname }, (err, stdout, stderr) => {
17+
const actualErrorOutput = postProcessErrorOutput(stderr.toString());
1818
if (updateTests) {
19-
fs.writeFileSync(expectedFilePath, actualErrorOutput)
19+
fs.writeFileSync(expectedFilePath, actualErrorOutput);
2020
} else {
21-
const expectedErrorOutput = postProcessErrorOutput(fs.readFileSync(expectedFilePath, {encoding: 'utf-8'}))
21+
const expectedErrorOutput = postProcessErrorOutput(
22+
fs.readFileSync(expectedFilePath, { encoding: "utf-8" })
23+
);
2224
if (expectedErrorOutput !== actualErrorOutput) {
23-
console.error(`The old and new error output aren't the same`)
24-
console.error('\n=== Old:')
25-
console.error(expectedErrorOutput)
26-
console.error('\n=== New:')
27-
console.error(actualErrorOutput)
28-
process.exit(1)
25+
console.error(`The old and new error output aren't the same`);
26+
console.error("\n=== Old:");
27+
console.error(expectedErrorOutput);
28+
console.error("\n=== New:");
29+
console.error(actualErrorOutput);
30+
process.exit(1);
2931
}
3032
}
31-
})
32-
33-
33+
});

‎jscomp/build_tests/in_source/input.js‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
1-
var child_process = require('child_process')
1+
var child_process = require("child_process");
22

3-
var assert = require('assert')
4-
5-
var rescript_exe = require("../../../scripts/bin_path").rescript_exe
3+
var assert = require("assert");
64

5+
var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
76

87
assert.throws(
9-
() => {
10-
var output = child_process.execSync(`${rescript_exe} build -regen`,
11-
{ cwd: __dirname, encoding: 'utf8' }
12-
)
13-
}
14-
,
15-
function (err){
16-
if (err.message.match(/detected two module formats/)){
17-
return true
18-
}
19-
return false
8+
() => {
9+
var output = child_process.execSync(`${rescript_exe} build -regen`, {
10+
cwd: __dirname,
11+
encoding: "utf8",
12+
});
13+
},
14+
function (err) {
15+
if (err.message.match(/detected two module formats/)) {
16+
return true;
2017
}
21-
22-
)
23-
18+
return false;
19+
}
20+
);
2421

2522
// assert.throws(()=>{
2623
// throw new Error('Wrong value')

‎jscomp/build_tests/install/input.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ p.spawnSync(rescript_exe, [`clean`], {
88
encoding: "utf8",
99
cwd: __dirname,
1010
});
11-
p.spawnSync(rescript_exe, [`build`,`-install`], {
11+
p.spawnSync(rescript_exe, [`build`, `-install`], {
1212
encoding: "utf8",
1313
cwd: __dirname,
1414
});
@@ -20,7 +20,7 @@ p.spawnSync(rescript_exe, {
2020
encoding: "utf8",
2121
cwd: __dirname,
2222
});
23-
p.spawnSync(rescript_exe ,[`build`,`-install`], {
23+
p.spawnSync(rescript_exe, [`build`, `-install`], {
2424
encoding: "utf8",
2525
cwd: __dirname,
2626
});

‎jscomp/build_tests/rerror/input.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var u = o.stdout.match(/=>/g);
1616

1717
var lines = o.stdout
1818
.split("\n")
19-
.map((x) => x.trim())
19+
.map(x => x.trim())
2020
.filter(Boolean);
2121
// console.log(`lines: \n${lines}`)
2222
// console.log(lines[4])

0 commit comments

Comments
 (0)