Compare commits

...

8 Commits

Author SHA1 Message Date
0ea621cb99 1.0.41 2020-07-11 15:52:32 +00:00
984d551bd6 fix(core): update 2020-07-11 15:52:31 +00:00
4066d9b0e8 1.0.40 2020-07-09 23:20:15 +00:00
f24ff2f79e fix(core): update 2020-07-09 23:20:14 +00:00
9d37fcf734 1.0.39 2020-07-09 22:00:46 +00:00
f7524179d7 fix(core): update 2020-07-09 22:00:45 +00:00
19d6b52ddb 1.0.38 2020-07-08 02:05:51 +00:00
cf69e5436c fix(core): update 2020-07-08 02:05:51 +00:00
5 changed files with 31 additions and 13 deletions

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@gitzone/tstest", "name": "@gitzone/tstest",
"version": "1.0.37", "version": "1.0.41",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "@gitzone/tstest", "name": "@gitzone/tstest",
"version": "1.0.37", "version": "1.0.41",
"private": false, "private": false,
"description": "a test utility to run tests that match test/**/*.ts", "description": "a test utility to run tests that match test/**/*.ts",
"main": "dist_ts/index.js", "main": "dist_ts/index.js",

View File

@ -20,7 +20,15 @@ export class TapCombinator {
let failGlobal = false; // determine wether tstest should fail let failGlobal = false; // determine wether tstest should fail
for (const tapParser of this.tapParserStore) { for (const tapParser of this.tapParserStore) {
if (tapParser.getErrorTests().length === 0) { if (!tapParser.expectedTests) {
failGlobal = true;
let overviewString =
logPrefixes.TsTestPrefix +
cs(` ${tapParser.fileName} ${plugins.figures.cross}`, 'red') +
` ${plugins.figures.pointer} ` +
`does not specify tests!`;
console.log(overviewString);
} else if (tapParser.getErrorTests().length === 0) {
let overviewString = let overviewString =
logPrefixes.TsTestPrefix + logPrefixes.TsTestPrefix +
cs(` ${tapParser.fileName} ${plugins.figures.tick}`, 'green') + cs(` ${tapParser.fileName} ${plugins.figures.tick}`, 'green') +
@ -28,13 +36,13 @@ export class TapCombinator {
tapParser.getTestOverviewAsString(); tapParser.getTestOverviewAsString();
console.log(overviewString); console.log(overviewString);
} else { } else {
failGlobal = true;
let overviewString = let overviewString =
logPrefixes.TsTestPrefix + logPrefixes.TsTestPrefix +
cs(` ${tapParser.fileName} ${plugins.figures.cross}`, 'red') + cs(` ${tapParser.fileName} ${plugins.figures.cross}`, 'red') +
` ${plugins.figures.pointer} ` + ` ${plugins.figures.pointer} ` +
tapParser.getTestOverviewAsString(); tapParser.getTestOverviewAsString();
console.log(overviewString); console.log(overviewString);
failGlobal = true;
} }
} }
console.log(cs(plugins.figures.hamburger.repeat(48), 'cyan')); console.log(cs(plugins.figures.hamburger.repeat(48), 'cyan'));

View File

@ -179,7 +179,11 @@ export class TapParser {
)}` )}`
); );
} }
if (this.getErrorTests().length === 0) { if (!this.expectedTests) {
console.log(cs('Error: No tests were defined. Therefore the testfile failed!', 'red'));
} else if (this.expectedTests !== this.receivedTests) {
console.log(cs('Error: The amount of received tests and expectedTests is unequal! Therefore the testfile failed', 'red'));
} else 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 { } else {
console.log( console.log(

View File

@ -7,7 +7,6 @@ import { coloredString as cs } from '@pushrocks/consolecolor';
import { TestDirectory } from './tstest.classes.testdirectory'; import { TestDirectory } from './tstest.classes.testdirectory';
import { TapCombinator } from './tstest.classes.tap.combinator'; import { TapCombinator } from './tstest.classes.tap.combinator';
import { TapParser } from './tstest.classes.tap.parser'; import { TapParser } from './tstest.classes.tap.parser';
import { threeEighths } from 'figures';
export class TsTest { export class TsTest {
public testDir: TestDirectory; public testDir: TestDirectory;
@ -56,7 +55,7 @@ export class TsTest {
public async runInNode(fileNameArg: string): Promise<TapParser> { public async runInNode(fileNameArg: string): Promise<TapParser> {
console.log(`${cs('=> ', 'blue')} Running ${cs(fileNameArg, 'orange')} in node.js runtime.`); console.log(`${cs('=> ', 'blue')} Running ${cs(fileNameArg, 'orange')} in node.js runtime.`);
console.log(cs(`=`.repeat(16), 'cyan')); console.log(`${cs(`= `.repeat(32), 'cyan')}`);
const tapParser = new TapParser(fileNameArg); const tapParser = new TapParser(fileNameArg);
// tsrun options // tsrun options
@ -74,7 +73,7 @@ export class TsTest {
public async runInChrome(fileNameArg: string): Promise<TapParser> { public async runInChrome(fileNameArg: string): Promise<TapParser> {
console.log(`${cs('=> ', 'blue')} Running ${cs(fileNameArg, 'orange')} in chromium runtime.`); console.log(`${cs('=> ', 'blue')} Running ${cs(fileNameArg, 'orange')} in chromium runtime.`);
console.log(cs(`=`.repeat(16), 'cyan')); console.log(`${cs(`= `.repeat(32), 'cyan')}`);
// lets get all our paths sorted // lets get all our paths sorted
const tsbundleCacheDirPath = plugins.path.join(paths.cwd, './.nogit/tstest_cache'); const tsbundleCacheDirPath = plugins.path.join(paths.cwd, './.nogit/tstest_cache');
@ -119,7 +118,9 @@ export class TsTest {
// create an array that will later be joined into a string. // create an array that will later be joined into a string.
const stringArray = []; const stringArray = [];
if (typeof obj === 'object' && obj.join === undefined) { if (typeof obj === 'object' && typeof obj.toString === 'function') {
stringArray.push(obj.toString());
} else if (typeof obj === 'object' && obj.join === undefined) {
stringArray.push('{'); stringArray.push('{');
for (const prop of Object.keys(obj)) { for (const prop of Object.keys(obj)) {
stringArray.push(prop, ': ', convertToText(obj[prop]), ','); stringArray.push(prop, ': ', convertToText(obj[prop]), ',');
@ -146,7 +147,7 @@ export class TsTest {
return stringArray.join(''); return stringArray.join('');
}; };
let logStore = 'Starting log capture\n'; let logStore = '';
// tslint:disable-next-line: max-classes-per-file // tslint:disable-next-line: max-classes-per-file
const log = console.log.bind(console); const log = console.log.bind(console);
console.log = (...args) => { console.log = (...args) => {
@ -164,7 +165,12 @@ export class TsTest {
logStore += `${args}\n`; logStore += `${args}\n`;
error(...args); error(...args);
}; };
const bundle = await (await fetch('/test__test.browser.ts.js')).text(); const bundleName = new URLSearchParams(window.location.search).get('bundleName');
console.log(`::TSTEST IN CHROMIUM:: Relevant Script name is: ${bundleName}`);
const bundleResponse = await fetch(`/${bundleName}`);
console.log(`::TSTEST IN CHROMIUM:: Got ${bundleName} with STATUS ${bundleResponse.status}`);
const bundle = await bundleResponse.text();
console.log(`::TSTEST IN CHROMIUM:: Executing ${bundleName}`);
try { try {
// tslint:disable-next-line: no-eval // tslint:disable-next-line: no-eval
eval(bundle); eval(bundle);
@ -181,9 +187,9 @@ export class TsTest {
} }
); );
await this.smartbrowserInstance.stop(); await this.smartbrowserInstance.stop();
console.log(`${cs('=> ', 'blue')} Stopped ${cs(fileNameArg, 'orange')} chromium instance.`);
await server.stop(); await server.stop();
console.log(`${cs('=> ', 'blue')} Stopped ${cs(fileNameArg, 'orange')} server.`); console.log(`${cs('=> ', 'blue')} Stopped ${cs(fileNameArg, 'orange')} chromium instance and server.`);
console.log(`${cs('=> ', 'blue')} See the result captured from the chromium execution:`);
// lets create the tap parser // lets create the tap parser
const tapParser = new TapParser(fileNameArg); const tapParser = new TapParser(fileNameArg);
tapParser.handleTapLog(evaluation); tapParser.handleTapLog(evaluation);