diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1d614e..8321aed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,6 +26,7 @@ mirror: snyk: stage: security script: + - npmci npm prepare - npmci command npm install -g snyk - npmci command npm install --ignore-scripts - npmci command snyk test @@ -36,21 +37,11 @@ snyk: # ==================== # test stage # ==================== -testLEGACY: - stage: test - script: - - npmci node install legacy - - npmci npm install - - npmci npm test - coverage: /\d+.?\d+?\%\s*coverage/ - tags: - - docker - - notpriv - allow_failure: true testLTS: stage: test script: + - npmci npm prepare - npmci node install lts - npmci npm install - npmci npm test @@ -62,6 +53,7 @@ testLTS: testSTABLE: stage: test script: + - npmci npm prepare - npmci node install stable - npmci npm install - npmci npm test @@ -118,6 +110,7 @@ pages: stage: metadata script: - npmci command npm install -g typedoc typescript + - npmci npm prepare - npmci npm install - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/ tags: @@ -130,13 +123,3 @@ pages: paths: - public allow_failure: true - -windowsCompatibility: - image: stefanscherer/node-windows:10-build-tools - stage: metadata - script: - - npm install & npm test - coverage: /\d+.?\d+?\%\s*coverage/ - tags: - - windows - allow_failure: true diff --git a/package.json b/package.json index 1876a22..6902442 100644 --- a/package.json +++ b/package.json @@ -32,4 +32,4 @@ "@types/figures": "^2.0.0", "figures": "^2.0.0" } -} +} \ No newline at end of file diff --git a/ts/tstest.classes.tap.combinator.ts b/ts/tstest.classes.tap.combinator.ts index f62c07f..f45ab7c 100644 --- a/ts/tstest.classes.tap.combinator.ts +++ b/ts/tstest.classes.tap.combinator.ts @@ -14,7 +14,9 @@ export class TapCombinator { } evaluate() { - console.log(`${logPrefixes.TsTestPrefix} RESULTS FOR ${this.tapParserStore.length} TESTFILE(S):`); + console.log( + `${logPrefixes.TsTestPrefix} RESULTS FOR ${this.tapParserStore.length} TESTFILE(S):` + ); let failGlobal = false; // determine wether tstest should fail for (const tapParser of this.tapParserStore) { diff --git a/ts/tstest.classes.tap.parser.ts b/ts/tstest.classes.tap.parser.ts index 596cb19..a24fa05 100644 --- a/ts/tstest.classes.tap.parser.ts +++ b/ts/tstest.classes.tap.parser.ts @@ -23,7 +23,6 @@ export class TapParser { */ constructor(public fileName: string) {} - private _getNewTapTestResult() { this.activeTapTestResult = new TapTestResult(this.testStore.length + 1); } @@ -45,10 +44,7 @@ export class TapParser { const regexResult = this.expectedTestsRegex.exec(logLine); this.expectedTests = parseInt(regexResult[2]); console.log( - `${logPrefixes.TapPrefix} ${cs( - `Expecting ${this.expectedTests} tests!`, - 'blue' - )}` + `${logPrefixes.TapPrefix} ${cs(`Expecting ${this.expectedTests} tests!`, 'blue')}` ); // initiating first TapResult @@ -70,9 +66,7 @@ export class TapParser { // test for protocol error if (testId !== this.activeTapTestResult.id) { console.log( - `${ - logPrefixes.TapErrorPrefix - } Something is strange! Test Ids are not equal!` + `${logPrefixes.TapErrorPrefix} Something is strange! Test Ids are not equal!` ); } this.activeTapTestResult.setTestResult(testOk); @@ -128,9 +122,9 @@ export class TapParser { * returns a test overview as string */ getTestOverviewAsString() { - let overviewString = '' - for(let test of this.testStore) { - if(overviewString !== '') { + let overviewString = ''; + for (let test of this.testStore) { + if (overviewString !== '') { overviewString += ' | '; } if (test.testOk) { @@ -161,29 +155,20 @@ export class TapParser { if (this.expectedTests === this.receivedTests) { console.log( `${logPrefixes.TapPrefix} ${cs( - `${this.receivedTests} out of ${ - this.expectedTests - } Tests completed!`, + `${this.receivedTests} out of ${this.expectedTests} Tests completed!`, 'green' )}` ); } else { console.log( `${logPrefixes.TapErrorPrefix} ${cs( - `Only ${this.receivedTests} out of ${ - this.expectedTests - } completed!`, + `Only ${this.receivedTests} out of ${this.expectedTests} completed!`, 'red' )}` ); } if (this.getErrorTests().length === 0) { - console.log( - `${logPrefixes.TapPrefix} ${cs( - `All tests are successfull!!!`, - 'green' - )}` - ); + console.log(`${logPrefixes.TapPrefix} ${cs(`All tests are successfull!!!`, 'green')}`); } else { console.log( `${logPrefixes.TapPrefix} ${cs( diff --git a/ts/tstest.classes.tstest.ts b/ts/tstest.classes.tstest.ts index d92de40..ae37be8 100644 --- a/ts/tstest.classes.tstest.ts +++ b/ts/tstest.classes.tstest.ts @@ -37,12 +37,14 @@ export class TsTest { const tapParser = new TapParser(fileName); // tsrun options - let tsrunOptions = '' - if(process.argv.includes('--web')) { - tsrunOptions += ' --web' + let tsrunOptions = ''; + if (process.argv.includes('--web')) { + tsrunOptions += ' --web'; } - const execResultStreaming = await smartshellInstance.execStreamingSilent(`tsrun ${fileName}${tsrunOptions}`); + const execResultStreaming = await smartshellInstance.execStreamingSilent( + `tsrun ${fileName}${tsrunOptions}` + ); await tapParser.handleTapProcess(execResultStreaming.childProcess); console.log(cs(`^`.repeat(16), 'cyan')); console.log(''); // force new line diff --git a/tslint.json b/tslint.json index 45052ad..d4ea2e9 100644 --- a/tslint.json +++ b/tslint.json @@ -1,3 +1,17 @@ { - "extends": "tslint-config-standard" + "extends": ["tslint:latest", "tslint-config-prettier"], + "rules": { + "semicolon": [true, "always"], + "no-console": false, + "ordered-imports": false, + "object-literal-sort-keys": false, + "member-ordering": { + "options":{ + "order": [ + "static-method" + ] + } + } + }, + "defaultSeverity": "warning" }