Skip to content
This repository has been archived by the owner on Sep 21, 2022. It is now read-only.

Commit

Permalink
Rename runner-event to events
Browse files Browse the repository at this point in the history 
They contain not only runner events
  • Loading branch information
Sergey Tatarintsev committed Sep 27, 2016
1 parent bfc6219 commit 1e81731
Show file tree
Hide file tree
Showing 29 changed files with 260 additions and 260 deletions.
0 lib/constants/runner-events.js → lib/constants/events.js
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions lib/gemini-facade.js
View file
Expand Up @@ -2,15 +2,15 @@

const _ = require('lodash');
const Runner = require('./runner/runner');
const RunnerEvents = require('./constants/runner-events');
const Events = require('./constants/events');

module.exports = class GeminiFacade extends Runner {
constructor(runner) {
super();

this.config = runner.config;
this.events = RunnerEvents;
this.events = Events;

this.passthroughEvent(runner, _.values(RunnerEvents));
this.passthroughEvent(runner, _.values(Events));
}
};
10 changes: 5 additions & 5 deletions lib/gemini.js
View file
Expand Up @@ -13,7 +13,7 @@ const GeminiError = require('./errors/gemini-error');
const GeminiFacade = require('./gemini-facade');
const readTests = require('./test-reader');
const Runner = require('./runner');
const RunnerEvents = require('./constants/runner-events');
const Events = require('./constants/events');
const RunnerStats = require('./stats');
const StateProcessor = require('./state-processor');
const SuiteCollection = require('./suite-collection');
Expand Down Expand Up @@ -58,7 +58,7 @@ module.exports = class Gemini extends QEmitter {
const envSkipBrowsers = parseBrowsers(process.env.GEMINI_SKIP_BROWSERS);
const browsers = options.browsers || envBrowsers;

this._passThroughRunnerEvents(runner);
this._passThroughEvents(runner);
this._loadPlugins(runner);

if (browsers) {
Expand Down Expand Up @@ -89,10 +89,10 @@ module.exports = class Gemini extends QEmitter {
});
}

_passThroughRunnerEvents(runner) {
_passThroughEvents(runner) {
passthroughEvent(runner, this, [
RunnerEvents.START_RUNNER,
RunnerEvents.END_RUNNER
Events.START_RUNNER,
Events.END_RUNNER
]);
}

Expand Down
18 changes: 9 additions & 9 deletions lib/reporters/flat-factory/flat.js
View file
Expand Up @@ -6,7 +6,7 @@ const chalk = require('chalk');
const logger = require('../../utils').logger;
const TestCounter = require('../utils/test-counter');

const RunnerEvents = require('../../constants/runner-events');
const Events = require('../../constants/events.js');

const ICON_SUCCESS = chalk.green('✓');
const ICON_NOT_UPDATED = chalk.gray('✓');
Expand All @@ -20,14 +20,14 @@ module.exports = class Flat {
}

attachRunner(runner) {
runner.on(RunnerEvents.TEST_RESULT, this._onTestResult.bind(this));
runner.on(RunnerEvents.UPDATE_RESULT, this._onUpdateResult.bind(this));
runner.on(RunnerEvents.RETRY, this._onRetry.bind(this));
runner.on(RunnerEvents.ERROR, this._onError.bind(this));
runner.on(RunnerEvents.WARNING, this._onWarning.bind(this));
runner.on(RunnerEvents.END, this._onEnd.bind(this));
runner.on(RunnerEvents.INFO, this._onInfo.bind(this));
runner.on(RunnerEvents.SKIP_STATE, this._onSkipState.bind(this));
runner.on(Events.TEST_RESULT, this._onTestResult.bind(this));
runner.on(Events.UPDATE_RESULT, this._onUpdateResult.bind(this));
runner.on(Events.RETRY, this._onRetry.bind(this));
runner.on(Events.ERROR, this._onError.bind(this));
runner.on(Events.WARNING, this._onWarning.bind(this));
runner.on(Events.END, this._onEnd.bind(this));
runner.on(Events.INFO, this._onInfo.bind(this));
runner.on(Events.SKIP_STATE, this._onSkipState.bind(this));
}

_compile(tmpl, data) {
Expand Down
24 changes: 12 additions & 12 deletions lib/reporters/html/index.js
View file
Expand Up @@ -11,7 +11,7 @@ var path = require('path'),
chalk = require('chalk'),
logger = require('../../utils').logger,

RunnerEvents = require('../../constants/runner-events');
Events = require('../../constants/events');

/**
* @param {String} srcPath
Expand Down Expand Up @@ -44,22 +44,22 @@ function prepareViewData(runner) {
var result = q.defer(),
model = new ViewModel();

runner.on(RunnerEvents.SKIP_STATE, model.addSkipped.bind(model));
runner.on(Events.SKIP_STATE, model.addSkipped.bind(model));

runner.on(RunnerEvents.TEST_RESULT, function(r) {
runner.on(Events.TEST_RESULT, function(r) {
if (r.equal) {
model.addSuccess(r);
} else {
model.addFail(r);
}
});

runner.on(RunnerEvents.RETRY, model.addRetry.bind(model));
runner.on(Events.RETRY, model.addRetry.bind(model));

runner.on(RunnerEvents.ERROR, model.addError.bind(model));
runner.on(RunnerEvents.WARNING, model.addWarning.bind(model));
runner.on(Events.ERROR, model.addError.bind(model));
runner.on(Events.WARNING, model.addWarning.bind(model));

runner.on(RunnerEvents.END, function() {
runner.on(Events.END, function() {
result.resolve(model.getResult());
});

Expand All @@ -80,33 +80,33 @@ function prepareImages(runner) {
var imagesReady = q.defer(),
queue = q(true);

runner.on(RunnerEvents.WARNING, function(testResult) {
runner.on(Events.WARNING, function(testResult) {
queue = queue.then(function() {
return copyImage(testResult.currentPath, lib.currentAbsolutePath(testResult));
});
});

runner.on(RunnerEvents.ERROR, function(testResult) {
runner.on(Events.ERROR, function(testResult) {
queue = queue.then(function() {
return handleErrorEvent_(testResult);
});
});

runner.on(RunnerEvents.RETRY, function(testResult) {
runner.on(Events.RETRY, function(testResult) {
queue = queue.then(function() {
return testResult.hasOwnProperty('equal')
? handleTestResultEvent_(testResult)
: handleErrorEvent_(testResult);
});
});

runner.on(RunnerEvents.TEST_RESULT, function(testResult) {
runner.on(Events.TEST_RESULT, function(testResult) {
queue = queue.then(function() {
return handleTestResultEvent_(testResult);
});
});

runner.on(RunnerEvents.END, function() {
runner.on(Events.END, function() {
logPathToHtmlReport();

queue.then(imagesReady.resolve, imagesReady.reject);
Expand Down
28 changes: 14 additions & 14 deletions lib/runner/browser-runner/index.js
View file
Expand Up @@ -6,7 +6,7 @@ const promiseUtils = require('q-promise-utils');
const BrowserAgent = require('./browser-agent');
const Runner = require('../runner');
const SuiteRunner = require('../suite-runner');
const RunnerEvents = require('../../constants/runner-events');
const Events = require('../../constants/events');

const log = require('debug')('gemini:runner');

Expand All @@ -26,11 +26,11 @@ module.exports = class BrowserRunner extends Runner {

run(suiteCollection, stateProcessor) {
log('start browser %s', this._browserId);
this.emit(RunnerEvents.START_BROWSER, {browserId: this._browserId});
this.emit(Events.START_BROWSER, {browserId: this._browserId});
return this._runSuites(suiteCollection, stateProcessor)
.finally(() => {
log('stop browser %s', this._browserId);
this.emit(RunnerEvents.STOP_BROWSER, {browserId: this._browserId});
this.emit(Events.STOP_BROWSER, {browserId: this._browserId});
});
}

Expand Down Expand Up @@ -58,17 +58,17 @@ module.exports = class BrowserRunner extends Runner {
const runner = SuiteRunner.create(suite, browserAgent, this._config);

this.passthroughEvent(runner, [
RunnerEvents.BEGIN_SUITE,
RunnerEvents.END_SUITE,
RunnerEvents.SKIP_STATE,
RunnerEvents.BEGIN_STATE,
RunnerEvents.END_STATE,
RunnerEvents.TEST_RESULT,
RunnerEvents.CAPTURE,
RunnerEvents.UPDATE_RESULT,
RunnerEvents.WARNING,
RunnerEvents.ERROR,
RunnerEvents.RETRY
Events.BEGIN_SUITE,
Events.END_SUITE,
Events.SKIP_STATE,
Events.BEGIN_STATE,
Events.END_STATE,
Events.TEST_RESULT,
Events.CAPTURE,
Events.UPDATE_RESULT,
Events.WARNING,
Events.ERROR,
Events.RETRY
]);

this._suiteRunners.push(runner);
Expand Down
50 changes: 25 additions & 25 deletions lib/runner/index.js
View file
Expand Up @@ -5,7 +5,7 @@ const q = require('q');
const Runner = require('./runner');
const TestSessionRunner = require('./test-session-runner');
const Coverage = require('../coverage');
const RunnerEvents = require('../constants/runner-events');
const Events = require('../constants/events');

module.exports = class TestsRunner extends Runner {
static create(config, stateProcessor) {
Expand All @@ -32,8 +32,8 @@ module.exports = class TestsRunner extends Runner {
const suites = suiteCollection.allSuites();

return q.fcall(() => {
this.emit(RunnerEvents.START_RUNNER, this);
this.emit(RunnerEvents.BEGIN, {
this.emit(Events.START_RUNNER, this);
this.emit(Events.BEGIN, {
config: this.config,
totalStates: _.reduce(suites, (result, suite) => {
return result + suite.states.length;
Expand All @@ -45,33 +45,33 @@ module.exports = class TestsRunner extends Runner {
.then(() => this._runTestSession(suiteCollection))
.then(() => this.coverage && this.coverage.processStats())
.finally(() => {
this.emit(RunnerEvents.END);
this.emit(RunnerEvents.END_RUNNER, this);
this.emit(Events.END);
this.emit(Events.END_RUNNER, this);
});
}

_runTestSession(suiteCollection) {
const sessionRunner = TestSessionRunner.create(this.config, this._testBrowsers);

this.passthroughEvent(sessionRunner, [
RunnerEvents.BEGIN_SESSION,
RunnerEvents.END_SESSION,
RunnerEvents.START_BROWSER,
RunnerEvents.STOP_BROWSER,
RunnerEvents.INFO,
RunnerEvents.BEGIN_SUITE,
RunnerEvents.END_SUITE,
RunnerEvents.SKIP_STATE,
RunnerEvents.BEGIN_STATE,
RunnerEvents.END_STATE,
RunnerEvents.ERROR,
RunnerEvents.WARNING,
RunnerEvents.RETRY
Events.BEGIN_SESSION,
Events.END_SESSION,
Events.START_BROWSER,
Events.STOP_BROWSER,
Events.INFO,
Events.BEGIN_SUITE,
Events.END_SUITE,
Events.SKIP_STATE,
Events.BEGIN_STATE,
Events.END_STATE,
Events.ERROR,
Events.WARNING,
Events.RETRY
]);

sessionRunner.on(RunnerEvents.TEST_RESULT, (result) => this._handleTestResult(result));
sessionRunner.on(RunnerEvents.CAPTURE, (result) => this._handleCapture(result));
sessionRunner.on(RunnerEvents.UPDATE_RESULT, (result) => this._handleUpdateResult(result));
sessionRunner.on(Events.TEST_RESULT, (result) => this._handleTestResult(result));
sessionRunner.on(Events.CAPTURE, (result) => this._handleCapture(result));
sessionRunner.on(Events.UPDATE_RESULT, (result) => this._handleUpdateResult(result));

return sessionRunner.run(suiteCollection, this._stateProcessor);
}
Expand All @@ -83,18 +83,18 @@ module.exports = class TestsRunner extends Runner {
_handleTestResult(result) {
this._saveCoverage(result);

this.emit(RunnerEvents.END_TEST, result);
this.emit(RunnerEvents.TEST_RESULT, result);
this.emit(Events.END_TEST, result);
this.emit(Events.TEST_RESULT, result);
}

_handleCapture(result) {
this._saveCoverage(result);
this.emit(RunnerEvents.CAPTURE, result);
this.emit(Events.CAPTURE, result);
}

_handleUpdateResult(result) {
this._saveCoverage(result);
this.emit(RunnerEvents.UPDATE_RESULT, result);
this.emit(Events.UPDATE_RESULT, result);
}

_saveCoverage(data) {
Expand Down
8 changes: 4 additions & 4 deletions lib/runner/state-runner/state-runner.js
View file
Expand Up @@ -3,7 +3,7 @@
const _ = require('lodash');

const Runner = require('../runner');
const RunnerEvents = require('../../constants/runner-events');
const Events = require('../../constants/events');

module.exports = class StateRunner extends Runner {
constructor(state, browserSession, config) {
Expand All @@ -21,16 +21,16 @@ module.exports = class StateRunner extends Runner {
}

run(stateProcessor) {
this._emit(RunnerEvents.BEGIN_STATE);
this._emit(Events.BEGIN_STATE);

const session = this._browserSession;

return session.runActions(this._state.actions)
.then(() => session.prepareScreenshot(this._state, {coverage: this._config.isCoverageEnabled()}))
.catch((e) => session.extendWithPageScreenshot(e).thenReject(e))
.then((page) => this._capture(stateProcessor, page))
.catch((e) => this._emit(RunnerEvents.ERROR, e))
.finally(() => this._emit(RunnerEvents.END_STATE));
.catch((e) => this._emit(Events.ERROR, e))
.finally(() => this._emit(Events.END_STATE));
}

_emit(event, data) {
Expand Down
24 changes: 12 additions & 12 deletions lib/runner/suite-runner/decorator-suite-runner.js
View file
Expand Up @@ -4,7 +4,7 @@ const url = require('url');
const path = require('path');

const Runner = require('../runner');
const RunnerEvents = require('../../constants/runner-events');
const Events = require('../../constants/events');

module.exports = class DecoratorSuiteRunner extends Runner {
constructor(runner, browserAgent, config) {
Expand All @@ -14,20 +14,20 @@ module.exports = class DecoratorSuiteRunner extends Runner {
this._browserConfig = config.forBrowser(browserAgent.browserId);

this.passthroughEvent(this._suiteRunner, [
RunnerEvents.BEGIN_SUITE,
RunnerEvents.END_SUITE
Events.BEGIN_SUITE,
Events.END_SUITE
]);

[
RunnerEvents.BEGIN_STATE,
RunnerEvents.SKIP_STATE,
RunnerEvents.END_STATE,
RunnerEvents.TEST_RESULT,
RunnerEvents.CAPTURE,
RunnerEvents.UPDATE_RESULT,
RunnerEvents.WARNING,
RunnerEvents.ERROR,
RunnerEvents.RETRY
Events.BEGIN_STATE,
Events.SKIP_STATE,
Events.END_STATE,
Events.TEST_RESULT,
Events.CAPTURE,
Events.UPDATE_RESULT,
Events.WARNING,
Events.ERROR,
Events.RETRY
].forEach((event) => this._decorateEvent(event));
}

Expand Down

0 comments on commit 1e81731

Please sign in to comment.