Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature alexamil 1513931385131 #256

Merged
merged 22 commits into from
Feb 26, 2018
Merged
Next Next commit
pdev:set
  • Loading branch information
ORESoftware committed Dec 22, 2017
commit ba54e2cb6bb56ad79a8ec20b10721f80163ce8db
3 changes: 1 addition & 2 deletions lib/handle-browser.d.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
import { AsyncQueue } from 'async';
export declare const run: (testRegistrationQueue: AsyncQueue<Function>, testQueue: AsyncQueue<Function>) => void;
export declare const run: (testRegistrationQueue: any, testQueue: any) => void;
7 changes: 4 additions & 3 deletions lib/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { IInitFn } from "suman-types/dts/index-init";
import { IHookOrTestCaseParam } from "suman-types/dts/test-suite";
import * as s from './s';
export { s };
import sumanRun = require('./helpers/suman-run');
import { ISumanRunFn } from "./helpers/suman-run";
export declare const init: IInitFn;
export declare const autoPass: (t: any) => void;
export declare const autoFail: (t: any) => Promise<never>;
export declare const autoPass: (t: IHookOrTestCaseParam) => void;
export declare const autoFail: (t: IHookOrTestCaseParam) => Promise<never>;
export declare const run: sumanRun.ISumanRunFn;
export declare const once: (fn: Function) => (cb: Function) => void;
export declare const once: any;
export declare const version: any;
export interface ISumanExports {
s: typeof s;
Expand Down
3 changes: 1 addition & 2 deletions lib/runner-helpers/browser/add-to-run-queue.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
import { IGanttData } from "../socket-cp-hash";
import { AsyncQueue } from "async";
export declare const makeAddToRunQueue: (runnerObj: Object, args: string[], runQueue: AsyncQueue<Function>, projectRoot: string, cpHash: Object, forkedCPs: any[], onExitFn: Function) => (file: string, shortFile: string, stdout: string, gd: IGanttData) => void;
export declare const makeAddToRunQueue: (runnerObj: Object, args: string[], runQueue: any, projectRoot: string, cpHash: Object, forkedCPs: any[], onExitFn: Function) => (file: string, shortFile: string, stdout: string, gd: IGanttData) => void;
3 changes: 1 addition & 2 deletions lib/runner-helpers/browser/add-to-transpile-queue.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { ITableRows } from "suman-types/dts/runner";
import { AsyncQueue } from "async";
import { IGanttHash } from "../socket-cp-hash";
export declare const makeAddToTranspileQueue: (f: string, transpileQueue: AsyncQueue<Function>, tableRows: ITableRows, ganttHash: IGanttHash, projectRoot: string) => (fileShortAndFull: string[][]) => void;
export declare const makeAddToTranspileQueue: (f: string, transpileQueue: any, tableRows: ITableRows, ganttHash: IGanttHash, projectRoot: string) => (fileShortAndFull: string[][]) => void;
3 changes: 1 addition & 2 deletions lib/runner-helpers/multi-process/add-to-run-queue.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { IGanttData } from "../socket-cp-hash";
import { IRunnerObj } from "suman-types/dts/runner";
import { AsyncQueue } from "async";
export declare const makeAddToRunQueue: (runnerObj: IRunnerObj, args: string[], runQueue: AsyncQueue<Function>, projectRoot: string, cpHash: Object, forkedCPs: any[], onExitFn: Function) => (file: string, shortFile: string, stdout: string, gd: IGanttData) => void;
export declare const makeAddToRunQueue: (runnerObj: IRunnerObj, args: string[], runQueue: any, projectRoot: string, cpHash: Object, forkedCPs: any[], onExitFn: Function) => (file: string, shortFile: string, stdout: string, gd: IGanttData) => void;
3 changes: 1 addition & 2 deletions lib/runner-helpers/multi-process/add-to-transpile-queue.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { ITableRows } from "suman-types/dts/runner";
import { AsyncQueue } from "async";
import { IGanttHash } from "../socket-cp-hash";
export declare const makeAddToTranspileQueue: (f: string, transpileQueue: AsyncQueue<Function>, tableRows: ITableRows, ganttHash: IGanttHash, projectRoot: string) => (fileShortAndFull: string[]) => void;
export declare const makeAddToTranspileQueue: (f: string, transpileQueue: any, tableRows: ITableRows, ganttHash: IGanttHash, projectRoot: string) => (fileShortAndFull: string[]) => void;
9 changes: 4 additions & 5 deletions lib/runner-helpers/shared/queues.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { AsyncQueue } from 'async';
export declare const getRunQueue: () => AsyncQueue<Function>;
export declare const makeRunQueue: () => AsyncQueue<Function>;
export declare const getTranspileQueue: () => AsyncQueue<Function>;
export declare const makeTranspileQueue: (failedTransformObjects: any, runFile: Function, queuedTestFns: any) => AsyncQueue<Function>;
export declare const getRunQueue: () => any;
export declare const makeRunQueue: () => any;
export declare const getTranspileQueue: () => any;
export declare const makeTranspileQueue: (failedTransformObjects: any, runFile: Function, queuedTestFns: any) => any;
3 changes: 1 addition & 2 deletions lib/test-suite-helpers/handle-injections.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
import { ITestSuite } from "suman-types/dts/test-suite";
import { ErrorCallback } from 'async';
export declare const handleInjections: (suite: ITestSuite, cb: ErrorCallback<any>) => void;
export declare const handleInjections: (suite: ITestSuite, cb: any) => void;
2 changes: 1 addition & 1 deletion lib/test-suite-helpers/handle-promise-generator.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ISumanDomain } from "suman-types/dts/global";
import { ITestDataObj } from "suman-types/dts/it";
import { IHookObj } from "suman-types/dts/test-suite";
export declare const handleReturnVal: (done: Function, fnStr: string, testOrHook: ITestDataObj | IHookObj) => (val: any, warn: boolean, d: ISumanDomain) => void;
export declare const handleReturnVal: (done: Function, fnStr: string, testOrHook: IHookObj | ITestDataObj) => (val: any, warn: boolean, d: ISumanDomain) => void;
export declare const handleGenerator: (fn: Function, arg: any) => any;
6 changes: 3 additions & 3 deletions lib/test-suite-helpers/make-fini-callbacks.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ var throwsHelper = function (err, test, hook) {
}
if (!err) {
var z = testOrHook.didNotThrowErrorWithExpectedMessage =
'Error => Expected to throw an error matching regex (' + testOrHook.throws + ') , ' +
'Error => Expected to throw an error matching regex (' + testOrHook.throws + '), ' +
'but did not throw or pass any error.';
err = general_1.cloneError(testOrHook.warningErr, z);
err = general_1.cloneError(testOrHook.warningErr, z, false);
if (hook) {
err.sumanFatal = true;
err.sumanExitCode = constants.EXIT_CODES.HOOK_DID_NOT_THROW_EXPECTED_ERROR;
Expand All @@ -55,7 +55,7 @@ var throwsHelper = function (err, test, hook) {
var z = testOrHook.didNotThrowErrorWithExpectedMessage =
'Error => Expected to throw an error matching regex (' + testOrHook.throws + ') , ' +
'but did not throw or pass any error.';
var newErr = general_1.cloneError(testOrHook.warningErr, z);
var newErr = general_1.cloneError(testOrHook.warningErr, z, false);
err = new Error(err.stack + '\n' + newErr.stack);
}
else {
Expand Down
6 changes: 3 additions & 3 deletions lib/test-suite-helpers/make-fini-callbacks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ const throwsHelper = function (err: IPseudoError, test: ITestDataObj, hook: IHoo
if (!err) {

let z = testOrHook.didNotThrowErrorWithExpectedMessage =
'Error => Expected to throw an error matching regex (' + testOrHook.throws + ') , ' +
'Error => Expected to throw an error matching regex (' + testOrHook.throws + '), ' +
'but did not throw or pass any error.';

err = cloneError(testOrHook.warningErr, z);
err = cloneError(testOrHook.warningErr, z, false);

if (hook) {
err.sumanFatal = true;
Expand All @@ -89,7 +89,7 @@ const throwsHelper = function (err: IPseudoError, test: ITestDataObj, hook: IHoo
'Error => Expected to throw an error matching regex (' + testOrHook.throws + ') , ' +
'but did not throw or pass any error.';

let newErr = cloneError(testOrHook.warningErr, z);
let newErr = cloneError(testOrHook.warningErr, z, false);
err = new Error(err.stack + '\n' + newErr.stack);

}
Expand Down
2 changes: 1 addition & 1 deletion test/.suman/.meta/gantt.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
}
];

let tasksRaw = JSON.parse('[{"startDate":1513923585242,"endDate":1513923585833,"transformStartDate":null,"transformEndDate":null,"taskName":"/Users/alexamil/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/1.test.js","status":"SUCCEEDED"},{"startDate":1513923584464,"endDate":1513923585580,"transformStartDate":null,"transformEndDate":null,"taskName":"/Users/alexamil/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/2.test.js","status":"SUCCEEDED"},{"startDate":1513923584295,"endDate":1513923585237,"transformStartDate":null,"transformEndDate":null,"taskName":"/Users/alexamil/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/3.test.js","status":"FAILED"},{"startDate":1513923584311,"endDate":1513923585286,"transformStartDate":null,"transformEndDate":null,"taskName":"/Users/alexamil/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/4.test.js","status":"SUCCEEDED"},{"startDate":1513923584261,"endDate":1513923585309,"transformStartDate":null,"transformEndDate":null,"taskName":"/Users/alexamil/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/5.test.js","status":"SUCCEEDED"},{"startDate":1513923584250,"endDate":1513923585299,"transformStartDate":null,"transformEndDate":null,"taskName":"/Users/alexamil/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/6.test.js","status":"SUCCEEDED"},{"startDate":1513923584279,"endDate":1513923585286,"transformStartDate":null,"transformEndDate":null,"taskName":"/Users/alexamil/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/events.test.js","status":"SUCCEEDED"},{"startDate":1513923584225,"endDate":1513923585449,"transformStartDate":null,"transformEndDate":null,"taskName":"/Users/alexamil/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/injection.test.js","status":"SUCCEEDED"},{"startDate":1513923584230,"endDate":1513923584439,"transformStartDate":null,"transformEndDate":null,"taskName":"/Users/alexamil/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/injection2.test.ts","status":"FAILED"},{"startDate":1513923584233,"endDate":1513923585286,"transformStartDate":null,"transformEndDate":null,"taskName":"/Users/alexamil/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/simple.js","status":"SUCCEEDED"}]');
let tasksRaw = JSON.parse('[{"startDate":1513933788460,"endDate":1513933789435,"transformStartDate":null,"transformEndDate":null,"taskName":"/home/oleg/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/1.test.js","status":"SUCCEEDED"},{"startDate":1513933788448,"endDate":1513933789479,"transformStartDate":null,"transformEndDate":null,"taskName":"/home/oleg/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/2.test.js","status":"SUCCEEDED"},{"startDate":1513933788442,"endDate":1513933789208,"transformStartDate":null,"transformEndDate":null,"taskName":"/home/oleg/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/3.test.js","status":"SUCCEEDED"},{"startDate":1513933788428,"endDate":1513933789149,"transformStartDate":null,"transformEndDate":null,"taskName":"/home/oleg/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/4.test.js","status":"SUCCEEDED"},{"startDate":1513933788414,"endDate":1513933789230,"transformStartDate":null,"transformEndDate":null,"taskName":"/home/oleg/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/5.test.js","status":"SUCCEEDED"},{"startDate":1513933788410,"endDate":1513933789365,"transformStartDate":null,"transformEndDate":null,"taskName":"/home/oleg/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/6.test.js","status":"SUCCEEDED"},{"startDate":1513933788395,"endDate":1513933789334,"transformStartDate":null,"transformEndDate":null,"taskName":"/home/oleg/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/events.test.js","status":"FAILED"},{"startDate":1513933788389,"endDate":1513933789173,"transformStartDate":null,"transformEndDate":null,"taskName":"/home/oleg/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/injection.test.js","status":"SUCCEEDED"},{"startDate":1513933788374,"endDate":1513933788479,"transformStartDate":null,"transformEndDate":null,"taskName":"/home/oleg/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/injection2.test.ts","status":"FAILED"},{"startDate":1513933788367,"endDate":1513933789165,"transformStartDate":null,"transformEndDate":null,"taskName":"/home/oleg/WebstormProjects/oresoftware/sumanjs/suman/test/src/dev/node/simple.js","status":"SUCCEEDED"}]');

let tasks = [];

Expand Down
2 changes: 1 addition & 1 deletion test/.suman/.meta/timeline.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
dataTable.addColumn({type: 'date', id: 'Start'});
dataTable.addColumn({type: 'date', id: 'End'});

let tasksRaw = JSON.parse('[{"startDate":1513923584225,"endDate":1513923585449,"transformStartDate":null,"transformEndDate":null,"taskName":"injection.test.js","status":"SUCCEEDED"},{"startDate":1513923584230,"endDate":1513923584439,"transformStartDate":null,"transformEndDate":null,"taskName":"injection2.test.ts","status":"FAILED"},{"startDate":1513923584233,"endDate":1513923585286,"transformStartDate":null,"transformEndDate":null,"taskName":"simple.js","status":"SUCCEEDED"},{"startDate":1513923584250,"endDate":1513923585299,"transformStartDate":null,"transformEndDate":null,"taskName":"6.test.js","status":"SUCCEEDED"},{"startDate":1513923584261,"endDate":1513923585309,"transformStartDate":null,"transformEndDate":null,"taskName":"5.test.js","status":"SUCCEEDED"},{"startDate":1513923584279,"endDate":1513923585286,"transformStartDate":null,"transformEndDate":null,"taskName":"events.test.js","status":"SUCCEEDED"},{"startDate":1513923584295,"endDate":1513923585237,"transformStartDate":null,"transformEndDate":null,"taskName":"3.test.js","status":"FAILED"},{"startDate":1513923584311,"endDate":1513923585286,"transformStartDate":null,"transformEndDate":null,"taskName":"4.test.js","status":"SUCCEEDED"},{"startDate":1513923584464,"endDate":1513923585580,"transformStartDate":null,"transformEndDate":null,"taskName":"2.test.js","status":"SUCCEEDED"},{"startDate":1513923585242,"endDate":1513923585833,"transformStartDate":null,"transformEndDate":null,"taskName":"1.test.js","status":"SUCCEEDED"}]');
let tasksRaw = JSON.parse('[{"startDate":1513933788367,"endDate":1513933789165,"transformStartDate":null,"transformEndDate":null,"taskName":"simple.js","status":"SUCCEEDED"},{"startDate":1513933788374,"endDate":1513933788479,"transformStartDate":null,"transformEndDate":null,"taskName":"injection2.test.ts","status":"FAILED"},{"startDate":1513933788389,"endDate":1513933789173,"transformStartDate":null,"transformEndDate":null,"taskName":"injection.test.js","status":"SUCCEEDED"},{"startDate":1513933788395,"endDate":1513933789334,"transformStartDate":null,"transformEndDate":null,"taskName":"events.test.js","status":"FAILED"},{"startDate":1513933788410,"endDate":1513933789365,"transformStartDate":null,"transformEndDate":null,"taskName":"6.test.js","status":"SUCCEEDED"},{"startDate":1513933788414,"endDate":1513933789230,"transformStartDate":null,"transformEndDate":null,"taskName":"5.test.js","status":"SUCCEEDED"},{"startDate":1513933788428,"endDate":1513933789149,"transformStartDate":null,"transformEndDate":null,"taskName":"4.test.js","status":"SUCCEEDED"},{"startDate":1513933788442,"endDate":1513933789208,"transformStartDate":null,"transformEndDate":null,"taskName":"3.test.js","status":"SUCCEEDED"},{"startDate":1513933788448,"endDate":1513933789479,"transformStartDate":null,"transformEndDate":null,"taskName":"2.test.js","status":"SUCCEEDED"},{"startDate":1513933788460,"endDate":1513933789435,"transformStartDate":null,"transformEndDate":null,"taskName":"1.test.js","status":"SUCCEEDED"}]');

let tasks = [];
let colors = [];
Expand Down
11 changes: 4 additions & 7 deletions test/src/dev/node/events.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@ const {Test} = suman.init(module);

Test.create(function (b, assert, describe, before, beforeEach, after, afterEach, it, $core, events) {

const EventEmitter = events.EventEmitter;
const EE = events.EventEmitter;

const x = b;

debugger;

it('test successEvents', {successEvents: null}, t => {

const ee = new EventEmitter();
const ee = new EE();

setTimeout(function () {
ee.emit('done');
Expand All @@ -28,7 +25,7 @@ Test.create(function (b, assert, describe, before, beforeEach, after, afterEach,

it('test successEvents', {throws: /zoom/, errorEvents: ['bubba']}, t => {

const ee = new EventEmitter();
const ee = new EE();

setTimeout(function () {
ee.emit('bubba', new Error('zoom'));
Expand All @@ -40,7 +37,7 @@ Test.create(function (b, assert, describe, before, beforeEach, after, afterEach,

it('test successEvents', {throws: /zoom/, events: {error: ['bubba']}}, t => {

const ee = new EventEmitter();
const ee = new EE();

setTimeout(function () {
ee.emit('bubba', new Error('zoom'));
Expand Down