diff --git a/.eslintrc b/.eslintrc index eb3058129..d2b9b756b 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,7 +4,7 @@ }, "extends": ["airbnb-base", "prettier"], "globals": { - "run_spec": false + "runFormatTest": "readonly" }, "parserOptions": { "ecmaVersion": "latest", diff --git a/jest.config.js b/jest.config.js index 23447fdac..2feb5fb4a 100644 --- a/jest.config.js +++ b/jest.config.js @@ -11,7 +11,7 @@ if (TEST_STANDALONE) { export default { runner: 'jest-light-runner', - setupFiles: ['/tests/config/setup.js'], + setupFiles: ['/tests/config/format-test-setup.js'], snapshotSerializers: [ 'jest-snapshot-serializer-raw', 'jest-snapshot-serializer-ansi' diff --git a/tests/config/format-test-setup.js b/tests/config/format-test-setup.js new file mode 100644 index 000000000..98222ffc2 --- /dev/null +++ b/tests/config/format-test-setup.js @@ -0,0 +1,3 @@ +import runFormatTest from "./run-format-test.js"; + +globalThis.runFormatTest = runFormatTest; diff --git a/tests/config/require-standalone.cjs b/tests/config/require-standalone.cjs index 2f2c10bbc..8b9d52d3a 100644 --- a/tests/config/require-standalone.cjs +++ b/tests/config/require-standalone.cjs @@ -35,7 +35,7 @@ module.exports = { }; prettier.formatWithCursor($$$input, options); `, - { $$$input: input, $$$options: options, ...sandbox } + { $$$input: input, $$$options: options, ...sandbox }, ); }, @@ -57,7 +57,7 @@ module.exports = { $$$options: options, $$$devOptions: devOptions, ...sandbox, - } + }, ); }, }, diff --git a/tests/config/format-test.js b/tests/config/run-format-test.js similarity index 98% rename from tests/config/format-test.js rename to tests/config/run-format-test.js index 8e51830fe..afaa40686 100644 --- a/tests/config/format-test.js +++ b/tests/config/run-format-test.js @@ -1,13 +1,15 @@ import fs from "node:fs"; import path from "node:path"; import url from "node:url"; + import createEsmUtils from "esm-utils"; + import getPrettier from "./get-prettier.js"; import compileContract from "./utils/compile-contract.js"; -import createSnapshot from "./utils/create-snapshot.js"; -import visualizeEndOfLine from "./utils/visualize-end-of-line.js"; import consistentEndOfLine from "./utils/consistent-end-of-line.js"; +import createSnapshot from "./utils/create-snapshot.js"; import stringifyOptionsForTitle from "./utils/stringify-options-for-title.js"; +import visualizeEndOfLine from "./utils/visualize-end-of-line.js"; const { __dirname } = createEsmUtils(import.meta); @@ -112,7 +114,7 @@ const isTestDirectory = (dirname, name) => path.join(__dirname, "../format", name) + path.sep, ); -function runSpec(fixtures, parsers, options) { +function runFormatTest(fixtures, parsers, options) { let { importMeta, snippets = [] } = fixtures.importMeta ? fixtures : { importMeta: fixtures }; @@ -326,7 +328,7 @@ async function runTest({ if (!shouldSkipEolTest(code, formatResult.options)) { for (const eol of ["\r\n", "\r"]) { const { eolVisualizedOutput: output } = await format( - code.replace(/\n/g, eol), + code.replace(/\n/gu, eol), formatOptions, ); // Only if `endOfLine: "auto"` the result will be different @@ -334,7 +336,7 @@ async function runTest({ formatOptions.endOfLine === "auto" ? visualizeEndOfLine( // All `code` use `LF`, so the `eol` of result is always `LF` - formatResult.outputWithCursor.replace(/\n/g, eol), + formatResult.outputWithCursor.replace(/\n/gu, eol), ) : formatResult.eolVisualizedOutput; expect(output).toEqual(expected); @@ -452,4 +454,4 @@ async function format(originalText, originalOptions) { }; } -export default runSpec; +export default runFormatTest; diff --git a/tests/config/setup.js b/tests/config/setup.js deleted file mode 100644 index 3d3b8b4c7..000000000 --- a/tests/config/setup.js +++ /dev/null @@ -1,3 +0,0 @@ -import runSpec from "./format-test.js"; - -globalThis.run_spec = runSpec; diff --git a/tests/format/AddressPayable/format.test.js b/tests/format/AddressPayable/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/AddressPayable/format.test.js +++ b/tests/format/AddressPayable/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/AllSolidityFeatures/format.test.js b/tests/format/AllSolidityFeatures/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/AllSolidityFeatures/format.test.js +++ b/tests/format/AllSolidityFeatures/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/AllSolidityFeaturesV0.4.26/format.test.js b/tests/format/AllSolidityFeaturesV0.4.26/format.test.js index fb953582e..94898ac13 100644 --- a/tests/format/AllSolidityFeaturesV0.4.26/format.test.js +++ b/tests/format/AllSolidityFeaturesV0.4.26/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse'], { compiler: '0.4.26' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.4.26' }); diff --git a/tests/format/Arrays/format.test.js b/tests/format/Arrays/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/Arrays/format.test.js +++ b/tests/format/Arrays/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/Assembly/format.test.js b/tests/format/Assembly/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/Assembly/format.test.js +++ b/tests/format/Assembly/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/AssemblyV0.4.26/format.test.js b/tests/format/AssemblyV0.4.26/format.test.js index fb953582e..94898ac13 100644 --- a/tests/format/AssemblyV0.4.26/format.test.js +++ b/tests/format/AssemblyV0.4.26/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse'], { compiler: '0.4.26' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.4.26' }); diff --git a/tests/format/BasicIterator/format.test.js b/tests/format/BasicIterator/format.test.js index fb953582e..94898ac13 100644 --- a/tests/format/BasicIterator/format.test.js +++ b/tests/format/BasicIterator/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse'], { compiler: '0.4.26' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.4.26' }); diff --git a/tests/format/BinaryOperators/format.test.js b/tests/format/BinaryOperators/format.test.js index 946858815..b7b0a5e6d 100644 --- a/tests/format/BinaryOperators/format.test.js +++ b/tests/format/BinaryOperators/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse'], { compiler: '0.5.8' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.5.8' }); diff --git a/tests/format/BreakingChangesV0.7.4/format.test.js b/tests/format/BreakingChangesV0.7.4/format.test.js index b64637462..057f5b05d 100644 --- a/tests/format/BreakingChangesV0.7.4/format.test.js +++ b/tests/format/BreakingChangesV0.7.4/format.test.js @@ -1,14 +1,14 @@ -run_spec(import.meta, ['solidity-parse'], { compiler: '0.7.4' }); -run_spec(import.meta, ['solidity-parse'], { +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.7.4' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.7.4', bracketSpacing: true }); -run_spec(import.meta, ['solidity-parse'], { compiler: '0.7.3' }); -run_spec(import.meta, ['solidity-parse'], { +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.7.3' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.7.3', bracketSpacing: true }); -run_spec(import.meta, ['solidity-parse']); -run_spec(import.meta, ['solidity-parse'], { +runFormatTest(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse'], { bracketSpacing: true }); diff --git a/tests/format/BreakingChangesV0.8.0/format.test.js b/tests/format/BreakingChangesV0.8.0/format.test.js index 037d673ba..288dc45a8 100644 --- a/tests/format/BreakingChangesV0.8.0/format.test.js +++ b/tests/format/BreakingChangesV0.8.0/format.test.js @@ -1,3 +1,3 @@ -run_spec(import.meta, ['solidity-parse']); -run_spec(import.meta, ['solidity-parse'], { compiler: '0.8.0' }); -run_spec(import.meta, ['solidity-parse'], { compiler: '0.7.0' }); +runFormatTest(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.8.0' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.7.0' }); diff --git a/tests/format/Comments/format.test.js b/tests/format/Comments/format.test.js index daacfb24c..109c063bb 100644 --- a/tests/format/Comments/format.test.js +++ b/tests/format/Comments/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse'], { compiler: '0.4.24' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.4.24' }); diff --git a/tests/format/Conditional/format.test.js b/tests/format/Conditional/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/Conditional/format.test.js +++ b/tests/format/Conditional/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/Constructors/format.test.js b/tests/format/Constructors/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/Constructors/format.test.js +++ b/tests/format/Constructors/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/ContractDefinitions/format.test.js b/tests/format/ContractDefinitions/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/ContractDefinitions/format.test.js +++ b/tests/format/ContractDefinitions/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/CustomErrors/format.test.js b/tests/format/CustomErrors/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/CustomErrors/format.test.js +++ b/tests/format/CustomErrors/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/EnumDefinitions/format.test.js b/tests/format/EnumDefinitions/format.test.js index 993a81764..7bed92968 100644 --- a/tests/format/EnumDefinitions/format.test.js +++ b/tests/format/EnumDefinitions/format.test.js @@ -1,2 +1,2 @@ -run_spec(import.meta, ['solidity-parse']); -run_spec(import.meta, ['solidity-parse'], { bracketSpacing: true }); +runFormatTest(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse'], { bracketSpacing: true }); diff --git a/tests/format/Etc/format.test.js b/tests/format/Etc/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/Etc/format.test.js +++ b/tests/format/Etc/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/ExperimentalTernaries/format.test.js b/tests/format/ExperimentalTernaries/format.test.js index c79991703..d12aeb806 100644 --- a/tests/format/ExperimentalTernaries/format.test.js +++ b/tests/format/ExperimentalTernaries/format.test.js @@ -1,10 +1,10 @@ -run_spec(import.meta, ['solidity-parse']); -run_spec(import.meta, ['solidity-parse'], { experimentalTernaries: true }); -run_spec(import.meta, ['solidity-parse'], { +runFormatTest(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse'], { experimentalTernaries: true }); +runFormatTest(import.meta, ['solidity-parse'], { experimentalTernaries: true, tabWidth: 1 }); -run_spec(import.meta, ['solidity-parse'], { +runFormatTest(import.meta, ['solidity-parse'], { experimentalTernaries: true, useTabs: true }); diff --git a/tests/format/ForStatements/format.test.js b/tests/format/ForStatements/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/ForStatements/format.test.js +++ b/tests/format/ForStatements/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/FunctionCalls/format.test.js b/tests/format/FunctionCalls/format.test.js index 993a81764..7bed92968 100644 --- a/tests/format/FunctionCalls/format.test.js +++ b/tests/format/FunctionCalls/format.test.js @@ -1,2 +1,2 @@ -run_spec(import.meta, ['solidity-parse']); -run_spec(import.meta, ['solidity-parse'], { bracketSpacing: true }); +runFormatTest(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse'], { bracketSpacing: true }); diff --git a/tests/format/FunctionDefinitions/format.test.js b/tests/format/FunctionDefinitions/format.test.js index 41e6db5a6..c606c3d28 100644 --- a/tests/format/FunctionDefinitions/format.test.js +++ b/tests/format/FunctionDefinitions/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse'], { compiler: '0.8.0' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.8.0' }); diff --git a/tests/format/FunctionDefinitionsV0.5.0/format.test.js b/tests/format/FunctionDefinitionsV0.5.0/format.test.js index 417487a97..12273b032 100644 --- a/tests/format/FunctionDefinitionsV0.5.0/format.test.js +++ b/tests/format/FunctionDefinitionsV0.5.0/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse'], { compiler: '0.5.0' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.5.0' }); diff --git a/tests/format/HexLiteral/format.test.js b/tests/format/HexLiteral/format.test.js index ac4400e7d..6defea148 100644 --- a/tests/format/HexLiteral/format.test.js +++ b/tests/format/HexLiteral/format.test.js @@ -1,8 +1,8 @@ -run_spec(import.meta, ['solidity-parse'], { +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.8.6', singleQuote: true }); -run_spec(import.meta, ['solidity-parse'], { +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.8.6', singleQuote: false }); diff --git a/tests/format/IfStatements/format.test.js b/tests/format/IfStatements/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/IfStatements/format.test.js +++ b/tests/format/IfStatements/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/Immutable/format.test.js b/tests/format/Immutable/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/Immutable/format.test.js +++ b/tests/format/Immutable/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/ImportDirective/format.test.js b/tests/format/ImportDirective/format.test.js index 993a81764..7bed92968 100644 --- a/tests/format/ImportDirective/format.test.js +++ b/tests/format/ImportDirective/format.test.js @@ -1,2 +1,2 @@ -run_spec(import.meta, ['solidity-parse']); -run_spec(import.meta, ['solidity-parse'], { bracketSpacing: true }); +runFormatTest(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse'], { bracketSpacing: true }); diff --git a/tests/format/Inbox/format.test.js b/tests/format/Inbox/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/Inbox/format.test.js +++ b/tests/format/Inbox/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/IndexOf/format.test.js b/tests/format/IndexOf/format.test.js index fb953582e..94898ac13 100644 --- a/tests/format/IndexOf/format.test.js +++ b/tests/format/IndexOf/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse'], { compiler: '0.4.26' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.4.26' }); diff --git a/tests/format/IndexRangeAccess/format.test.js b/tests/format/IndexRangeAccess/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/IndexRangeAccess/format.test.js +++ b/tests/format/IndexRangeAccess/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/InheritanceSpecifier/format.test.js b/tests/format/InheritanceSpecifier/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/InheritanceSpecifier/format.test.js +++ b/tests/format/InheritanceSpecifier/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/Issues/format.test.js b/tests/format/Issues/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/Issues/format.test.js +++ b/tests/format/Issues/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/Libraries/format.test.js b/tests/format/Libraries/format.test.js index 993a81764..7bed92968 100644 --- a/tests/format/Libraries/format.test.js +++ b/tests/format/Libraries/format.test.js @@ -1,2 +1,2 @@ -run_spec(import.meta, ['solidity-parse']); -run_spec(import.meta, ['solidity-parse'], { bracketSpacing: true }); +runFormatTest(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse'], { bracketSpacing: true }); diff --git a/tests/format/Markdown/format.test.js b/tests/format/Markdown/format.test.js index cca2da906..aa8606946 100644 --- a/tests/format/Markdown/format.test.js +++ b/tests/format/Markdown/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['markdown']); +runFormatTest(import.meta, ['markdown']); diff --git a/tests/format/MemberAccess/format.test.js b/tests/format/MemberAccess/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/MemberAccess/format.test.js +++ b/tests/format/MemberAccess/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/ModifierDefinitions/format.test.js b/tests/format/ModifierDefinitions/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/ModifierDefinitions/format.test.js +++ b/tests/format/ModifierDefinitions/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/ModifierInvocations/format.test.js b/tests/format/ModifierInvocations/format.test.js index 41e6db5a6..c606c3d28 100644 --- a/tests/format/ModifierInvocations/format.test.js +++ b/tests/format/ModifierInvocations/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse'], { compiler: '0.8.0' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.8.0' }); diff --git a/tests/format/MultipartStrings/format.test.js b/tests/format/MultipartStrings/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/MultipartStrings/format.test.js +++ b/tests/format/MultipartStrings/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/NameValueExpression/format.test.js b/tests/format/NameValueExpression/format.test.js index 993a81764..7bed92968 100644 --- a/tests/format/NameValueExpression/format.test.js +++ b/tests/format/NameValueExpression/format.test.js @@ -1,2 +1,2 @@ -run_spec(import.meta, ['solidity-parse']); -run_spec(import.meta, ['solidity-parse'], { bracketSpacing: true }); +runFormatTest(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse'], { bracketSpacing: true }); diff --git a/tests/format/NumberLiteral/format.test.js b/tests/format/NumberLiteral/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/NumberLiteral/format.test.js +++ b/tests/format/NumberLiteral/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/Ownable/format.test.js b/tests/format/Ownable/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/Ownable/format.test.js +++ b/tests/format/Ownable/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/Parentheses/format.test.js b/tests/format/Parentheses/format.test.js index 8c772cba0..fdf54fb8a 100644 --- a/tests/format/Parentheses/format.test.js +++ b/tests/format/Parentheses/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse'], { compiler: '0.8.6' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.8.6' }); diff --git a/tests/format/Pragma/format.test.js b/tests/format/Pragma/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/Pragma/format.test.js +++ b/tests/format/Pragma/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/PrettierIgnore/format.test.js b/tests/format/PrettierIgnore/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/PrettierIgnore/format.test.js +++ b/tests/format/PrettierIgnore/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/Proxy/format.test.js b/tests/format/Proxy/format.test.js index daacfb24c..109c063bb 100644 --- a/tests/format/Proxy/format.test.js +++ b/tests/format/Proxy/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse'], { compiler: '0.4.24' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.4.24' }); diff --git a/tests/format/RespectDefaultOptions/format.test.js b/tests/format/RespectDefaultOptions/format.test.js index 21d1d2cb5..563faa86a 100644 --- a/tests/format/RespectDefaultOptions/format.test.js +++ b/tests/format/RespectDefaultOptions/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['babel']); +runFormatTest(import.meta, ['babel']); diff --git a/tests/format/SampleCrowdsale/format.test.js b/tests/format/SampleCrowdsale/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/SampleCrowdsale/format.test.js +++ b/tests/format/SampleCrowdsale/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/SimpleAuction/format.test.js b/tests/format/SimpleAuction/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/SimpleAuction/format.test.js +++ b/tests/format/SimpleAuction/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/SimpleStorage/format.test.js b/tests/format/SimpleStorage/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/SimpleStorage/format.test.js +++ b/tests/format/SimpleStorage/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/SplittableCommodity/format.test.js b/tests/format/SplittableCommodity/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/SplittableCommodity/format.test.js +++ b/tests/format/SplittableCommodity/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/StateVariableDeclarations/format.test.js b/tests/format/StateVariableDeclarations/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/StateVariableDeclarations/format.test.js +++ b/tests/format/StateVariableDeclarations/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/StringLiteral/format.test.js b/tests/format/StringLiteral/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/StringLiteral/format.test.js +++ b/tests/format/StringLiteral/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/StyleGuide/format.test.js b/tests/format/StyleGuide/format.test.js index 417487a97..12273b032 100644 --- a/tests/format/StyleGuide/format.test.js +++ b/tests/format/StyleGuide/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse'], { compiler: '0.5.0' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.5.0' }); diff --git a/tests/format/TryCatch/format.test.js b/tests/format/TryCatch/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/TryCatch/format.test.js +++ b/tests/format/TryCatch/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/Tuples/format.test.js b/tests/format/Tuples/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/Tuples/format.test.js +++ b/tests/format/Tuples/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/TypeDefinition/format.test.js b/tests/format/TypeDefinition/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/TypeDefinition/format.test.js +++ b/tests/format/TypeDefinition/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/WhileStatements/format.test.js b/tests/format/WhileStatements/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/WhileStatements/format.test.js +++ b/tests/format/WhileStatements/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']); diff --git a/tests/format/WrongCompiler/format.test.js b/tests/format/WrongCompiler/format.test.js index 0e6bb7941..2b6fb0aba 100644 --- a/tests/format/WrongCompiler/format.test.js +++ b/tests/format/WrongCompiler/format.test.js @@ -1,10 +1,10 @@ // Should warn twice -run_spec(import.meta, ['solidity-parse'], { compiler: '0.8.4' }); +runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.8.4' }); // Should warn once -run_spec(import.meta, ['solidity-parse'], { +runFormatTest(import.meta, ['solidity-parse'], { compiler: 'v0.7.5-nightly.2020.11.9+commit.41f50365' }); // Should not warn -run_spec(import.meta, ['solidity-parse'], { +runFormatTest(import.meta, ['solidity-parse'], { compiler: 'v0.7.3+commit.9bfce1f6' }); diff --git a/tests/format/quotes/format.test.js b/tests/format/quotes/format.test.js index 3272026cc..0ee502339 100644 --- a/tests/format/quotes/format.test.js +++ b/tests/format/quotes/format.test.js @@ -1,2 +1,2 @@ -run_spec(import.meta, ['solidity-parse'], { singleQuote: true }); -run_spec(import.meta, ['solidity-parse'], { singleQuote: false }); +runFormatTest(import.meta, ['solidity-parse'], { singleQuote: true }); +runFormatTest(import.meta, ['solidity-parse'], { singleQuote: false }); diff --git a/tests/format/strings/format.test.js b/tests/format/strings/format.test.js index 765dd60a6..2ae629864 100644 --- a/tests/format/strings/format.test.js +++ b/tests/format/strings/format.test.js @@ -1 +1 @@ -run_spec(import.meta, ['solidity-parse']); +runFormatTest(import.meta, ['solidity-parse']);