Skip to content

Commit

Permalink
Merge pull request #157 from GannettDigital/issue-128
Browse files Browse the repository at this point in the history
issue-128: bug fix, dependency updates, and lint spacing
  • Loading branch information
tomrdale authored Sep 17, 2018
2 parents ca463b0 + c22d9a6 commit 445f0cd
Show file tree
Hide file tree
Showing 120 changed files with 16,894 additions and 16,780 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dist: trusty
language: node_js
node_js:
- "8.9"
- "8.12"
env:
global:
- secure: "MyS7Ilc0PnoRmbW+ZzIFvLtPWNXf+qgAYgI4KDk/D5uiiUYDc6PoeWRdF/YZSjxWo7avIUaMR0xSawiPdHsgu+yAYNLyO3N/VqXl70YJwu3AwK9ahvMO+dsxVhfZhx820bUEZ9aLHH7v2nyH/8Vc9/48JEkqWUBB5VQPTWVHQydtxYgGGe6gOAMhhORfc6YQ17f66jlIWGvyekFjKC2B0I43mQfFlCkojaC3HJPRLX52xGFDortPbpJstgI8Q+X7ev33YtXojy+YyHXODnDUZgp0CV9uLiHGjlesZL3fTvhg2rx1IvMSdPH+k7NpL8gGZyPNNK+j1V9bKx6xlSRo38ssdlenzote+/m5R1zZXjw96zlsYQdYmdn1sYwLrY3XYs2ISxgoQwhUOvZe+eXlroZM84McHTIvCI/mOFRec8q2yEQHAENRFndFL1t8etabUqPbY61rAX4+gmfhnNlBvUgZUXgFiNnC6Jfo+m5etVE3fWrG2UlHjUmZbFom5BnT3SPTKQLM1fFuHXHiqem1ig+a7A8P8IvAqGPLfy0SVwQEAp0ucm7IVjuV0n9F2hkHpzFgFfMVCJTsG+xNXzXB2p5MLSjVD/ug7IZlz0w4YY/w+8J2wIwrOeEohqUMWcHIN8YrducVmp1kwxwcd2Fwdql5rRf7klxAP8lYrFWQchs="
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## Pending Version

## 0.6.3

* Scott Gunther
* Fix child process uncaught exception loop

## 0.6.2

* Tom Dale
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
environment:
nodejs_version: "8.9.4"
nodejs_version: "8.12.0"
SAUCE_USERNAME:
secure: r6ysENaYaFvWoayTLHMkVQ==
SAUCE_ACCESS_KEY:
Expand Down
5 changes: 5 additions & 0 deletions docs/_pages/home/current-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ sidebar:
nav: "home"
---

## 0.6.3

* Scott Gunther
* Fix child process uncaught exception loop

## 0.6.2

* Tom Dale
Expand Down
2 changes: 1 addition & 1 deletion docs/_pages/home/publish.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Steps for core contributers to publish a new release of simulato
* Pull down and verify you have the most recent version of master
* Update the version number in the package.json using [semantic versioning](https://semver.org/)
* Verify the CHANGELOG.md has the aggregated list of changes under the version number to which simulato is being updated
* Prepend the aggregated list of changes under the version number to docs/_pages/release-notes.md
* Prepend the aggregated list of changes under the version number to docs/_pages/home/current-notes.md
* Delete package-lock.json and node_modules
* Run the command `npm install` to generate a new package-lock.json with the proper version
* Push any versioning update changes listed above to a branch titled the version number
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ const cliEventDispatch = require('./cli-event-dispatch.js');
const registerCliEvents = require('./register-cli-events.js');

module.exports = function() {
registerCliEvents(cliEventDispatch);
registerCliEvents(cliEventDispatch);
};
8 changes: 4 additions & 4 deletions lib/cli/commands/generate.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ const cliEventDispatch = require('../cli-event-dispatch/cli-event-dispatch.js');
let generate;

module.exports = generate = {
configure() {
generate.emit('componentHandler.configure', configHandler.get('componentPath'));
generate.emit('generate.configured');
},
configure() {
generate.emit('componentHandler.configure', configHandler.get('componentPath'));
generate.emit('generate.configured');
},
};

Emitter.mixIn(generate, cliEventDispatch);
4 changes: 2 additions & 2 deletions lib/cli/commands/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

module.exports = {
run: require('./run.js').configure,
generate: require('./generate.js').configure,
run: require('./run.js').configure,
generate: require('./generate.js').configure,
};
50 changes: 25 additions & 25 deletions lib/cli/commands/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,32 @@ const cliEventDispatch = require('../cli-event-dispatch/cli-event-dispatch.js');
let run;

module.exports = run = {
configure() {
let paths = [configHandler.get('testPath')];
let testFilePaths;
let configureInfo = {};
configure() {
let paths = [configHandler.get('testPath')];
let testFilePaths;
let configureInfo = {};

run.emit('findFiles.search', paths, function(files) {
run.emit('validators.validateTestCases', files, function(validatedTestCases) {
if (validatedTestCases.length) {
testFilePaths = validatedTestCases;
if (process.env.USING_PARENT_TEST_RUNNER === 'true') {
configureInfo.command = 'execute';
configureInfo.testFile = testFilePaths[0];
return run.emit('run.configuredSkipOrchestration', configureInfo);
} else {
configureInfo.command = 'run';
configureInfo.testFilePaths = testFilePaths;
}
return run.emit('run.configuredRunOrchestration', configureInfo);
} else {
throw new SimulatoError.TEST_CASE.NO_TEST_CASES_FOUND(
`No test cases were found at path '${paths}'`
);
}
});
});
},
run.emit('findFiles.search', paths, function(files) {
run.emit('validators.validateTestCases', files, function(validatedTestCases) {
if (validatedTestCases.length) {
testFilePaths = validatedTestCases;
if (process.env.USING_PARENT_TEST_RUNNER === 'true') {
configureInfo.command = 'execute';
configureInfo.testFile = testFilePaths[0];
return run.emit('run.configuredSkipOrchestration', configureInfo);
} else {
configureInfo.command = 'run';
configureInfo.testFilePaths = testFilePaths;
}
return run.emit('run.configuredRunOrchestration', configureInfo);
} else {
throw new SimulatoError.TEST_CASE.NO_TEST_CASES_FOUND(
`No test cases were found at path '${paths}'`
);
}
});
});
},
};

Emitter.mixIn(run, cliEventDispatch);
20 changes: 10 additions & 10 deletions lib/cli/orchestration/after.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ const concurrent = require('palinode').concurrent;
const configHandler = require('../../util/config-handler.js');

module.exports = function() {
let functions = [];
let functions = [];

if (configHandler.get('saucelabs')) {
functions.push(Saucelabs.close);
}
if (configHandler.get('saucelabs')) {
functions.push(Saucelabs.close);
}

concurrent(functions, function(error) {
if (error) {
console.log(error);
process.exit(1);
}
});
concurrent(functions, function(error) {
if (error) {
console.log(error);
process.exit(1);
}
});
};
48 changes: 24 additions & 24 deletions lib/cli/orchestration/before.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,33 +9,33 @@ const cliEventDispatch = require('../cli-event-dispatch/cli-event-dispatch.js');
let before;

module.exports = before = {
runScripts(configureInfo) {
let functions = [];
runScripts(configureInfo) {
let functions = [];

if (configHandler.get('before')) {
functions.push(require(configHandler.get('before')));
}
if (configHandler.get('before')) {
functions.push(require(configHandler.get('before')));
}

if (configHandler.get('saucelabs')) {
Saucelabs.connect(function(error) {
if (error) {
throw error;
}
before.emit('before.readyToRunFunctions', functions, configureInfo);
});
} else {
before.emit('before.readyToRunFunctions', functions, configureInfo);
if (configHandler.get('saucelabs')) {
Saucelabs.connect(function(error) {
if (error) {
throw error;
}
},
_runFunctions(functions, configureInfo) {
concurrent(functions, function(error) {
if (error) {
throw error;
} else {
before.emit('before.finished', configureInfo);
}
});
},
before.emit('before.readyToRunFunctions', functions, configureInfo);
});
} else {
before.emit('before.readyToRunFunctions', functions, configureInfo);
}
},
_runFunctions(functions, configureInfo) {
concurrent(functions, function(error) {
if (error) {
throw error;
} else {
before.emit('before.finished', configureInfo);
}
});
},
};

Emitter.mixIn(before, cliEventDispatch);
Expand Down
6 changes: 3 additions & 3 deletions lib/errors/child/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const CHILD_NOT_OBJECT = require('./child-not-object.js');
const CHILD_OBJECT_PROPERTY_TYPE = require('./child-object-property-type.js');

module.exports = {
CHILDREN_NOT_ARRAY,
CHILD_NOT_OBJECT,
CHILD_OBJECT_PROPERTY_TYPE,
CHILDREN_NOT_ARRAY,
CHILD_NOT_OBJECT,
CHILD_OBJECT_PROPERTY_TYPE,
};
10 changes: 5 additions & 5 deletions lib/errors/component/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const FILE_TYPE_ERROR = require('./file-type-error.js');
const NO_COMPONENTS_FOUND = require('./no-components-found.js');

module.exports = {
NO_ENTRY_POINT,
NON_UNIQUE_COMPONENT,
COMPONENT_TYPE_ERROR,
FILE_TYPE_ERROR,
NO_COMPONENTS_FOUND,
NO_ENTRY_POINT,
NON_UNIQUE_COMPONENT,
COMPONENT_TYPE_ERROR,
FILE_TYPE_ERROR,
NO_COMPONENTS_FOUND,
};
6 changes: 3 additions & 3 deletions lib/errors/event/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const EVENT_NOT_OBJECT = require('./event-not-object.js');
const EVENT_OBJECT_PROPERTY_TYPE = require('./event-object-property-type.js');

module.exports = {
EVENTS_NOT_ARRAY,
EVENT_NOT_OBJECT,
EVENT_OBJECT_PROPERTY_TYPE,
EVENTS_NOT_ARRAY,
EVENT_NOT_OBJECT,
EVENT_OBJECT_PROPERTY_TYPE,
};
2 changes: 1 addition & 1 deletion lib/errors/planner/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
let GOAL_NOT_FOUND = require('./goal-not-found.js');

module.exports = {
GOAL_NOT_FOUND,
GOAL_NOT_FOUND,
};
Loading

0 comments on commit 445f0cd

Please sign in to comment.