From d978f9671ef8d0a495c72bc8723c4461833bb36e Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 11 Oct 2019 12:41:21 +0300 Subject: [PATCH] [Gradle, JS] Not consider mocha default arguments #KT-33747 fixed --- .../tools/kotlin-test-js-runner/karma.ts | 8 ++----- .../tools/kotlin-test-js-runner/nodejs.ts | 22 +------------------ .../src/CliArgsParser.ts | 4 +--- 3 files changed, 4 insertions(+), 30 deletions(-) diff --git a/libraries/tools/kotlin-test-js-runner/karma.ts b/libraries/tools/kotlin-test-js-runner/karma.ts index ef40794d19c..9602f742bc5 100755 --- a/libraries/tools/kotlin-test-js-runner/karma.ts +++ b/libraries/tools/kotlin-test-js-runner/karma.ts @@ -12,12 +12,8 @@ process.exit = (exitCode) => { throw new Error(`Exit with ${exitCode}`) }; -const cliDescription = getDefaultCliDescription(); -cliDescription.freeArgsTitle = null; -const parser = new CliArgsParser(cliDescription); - -const processArgs = window.__karma__.config.args; -const untypedArgs = parser.parse(processArgs); +const parser = new CliArgsParser(getDefaultCliDescription()); +const untypedArgs = parser.parse(window.__karma__.config.args); const initialAdapter = kotlin_test.kotlin.test.detectAdapter_8be2vx$(); kotlin_test.setAdapter(runWithFilteringAndConsoleAdapters(initialAdapter, untypedArgs)); diff --git a/libraries/tools/kotlin-test-js-runner/nodejs.ts b/libraries/tools/kotlin-test-js-runner/nodejs.ts index 270b34cb67e..3b5ad4da5c1 100755 --- a/libraries/tools/kotlin-test-js-runner/nodejs.ts +++ b/libraries/tools/kotlin-test-js-runner/nodejs.ts @@ -4,27 +4,7 @@ import {runWithFilteringAndConsoleAdapters} from "./src/Adapter"; const kotlin_test = require('kotlin-test'); const parser = new CliArgsParser(getDefaultCliDescription()); - -const defaultMochaArgs = [ - '--reporter', - 'place-holder', - '--require', - 'place-holder', - '--no-config', - '--no-package', - '--no-opts', - '--diff', - '--extension', - 'js', - '--slow', - '75', - '--timeout', - '2000', - '--ui', - 'bdd' -]; -const processArgs = process.argv.slice(2, -1 * defaultMochaArgs.length); -const untypedArgs = parser.parse(processArgs); +const untypedArgs = parser.parse(process.argv); const initialAdapter = kotlin_test.kotlin.test.detectAdapter_8be2vx$(); kotlin_test.setAdapter(runWithFilteringAndConsoleAdapters(initialAdapter, untypedArgs)); \ No newline at end of file diff --git a/libraries/tools/kotlin-test-js-runner/src/CliArgsParser.ts b/libraries/tools/kotlin-test-js-runner/src/CliArgsParser.ts index 1353d67953d..2bd40d42857 100644 --- a/libraries/tools/kotlin-test-js-runner/src/CliArgsParser.ts +++ b/libraries/tools/kotlin-test-js-runner/src/CliArgsParser.ts @@ -100,8 +100,6 @@ export class CliArgsParser { continue args; } } - - this.badArgsExit("Unknown option: " + arg); } else { result.free.push(arg) } @@ -149,6 +147,6 @@ export function getDefaultCliDescription(): CliDescription { default: IgnoredTestSuitesReporting.reportAllInnerTestsAsIgnored } }, - freeArgsTitle: "module_name" + freeArgsTitle: null }; }