From 469d0bc191dfa147ac9b12361c1a63f1917afb77 Mon Sep 17 00:00:00 2001 From: Mehdy Dara Date: Fri, 23 Sep 2016 12:56:19 +0200 Subject: [PATCH 1/2] Update some deps --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index a69a0f5..0eb02a6 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,8 @@ "chai": "^3.5.0", "co": "^4.6.0", "co-mocha": "^1.1.2", - "cross-spawn": "^2.1.5", - "eslint": "^2.4.0", + "cross-spawn": "^4.0.0", + "eslint": "^3.5.0", "eslint-config-angular": "^0.5.0", "eslint-config-xo-react": "^0.6.0", "eslint-config-xo-space": "^0.12.0", @@ -32,19 +32,19 @@ "eslint-plugin-html": "^1.5.2", "eslint-plugin-react": "^4.3.0", "fixture-stdout": "^0.2.1", - "globby": "^4.0.0", + "globby": "^6.0.0", "jsdom": "swiip/jsdom#zonejs-compat-usable", "lodash": "^4.6.1", - "mkdirp-promise": "^2.0.0", - "mocha": "^2.4.5", + "mkdirp-promise": "^3.0.1", + "mocha": "^3.0.2", "mz": "^2.4.0", "rimraf-promise": "^2.0.0", "sauce-connect-launcher": "^0.14.0", "semver": "^5.1.0", "through2-spy": "^2.0.0", - "toposort": "^0.2.12", + "toposort": "^1.0.0", "tslint": "^3.7.4", - "typescript": "^1.8.10", + "typescript": "^2.0.3", "webdriverio": "^4.0.5", "yeoman-test": "^1.1.0" }, From 3207ad497a6558ddf212a942a7017849cbe00ba8 Mon Sep 17 00:00:00 2001 From: Mehdy Dara Date: Fri, 23 Sep 2016 13:15:13 +0200 Subject: [PATCH 2/2] Add interactiv test with JSDOM --- package.json | 2 +- test/interactive-test-jsdom.js | 39 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 test/interactive-test-jsdom.js diff --git a/package.json b/package.json index 0eb02a6..bea66c9 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "globby": "^6.0.0", "jsdom": "swiip/jsdom#zonejs-compat-usable", "lodash": "^4.6.1", - "mkdirp-promise": "^3.0.1", + "mkdirp-promise": "^2.0.0", "mocha": "^3.0.2", "mz": "^2.4.0", "rimraf-promise": "^2.0.0", diff --git a/test/interactive-test-jsdom.js b/test/interactive-test-jsdom.js new file mode 100644 index 0000000..6323438 --- /dev/null +++ b/test/interactive-test-jsdom.js @@ -0,0 +1,39 @@ +'use strict'; + +require('co-mocha'); + +const gulp = require('./helpers/gulp-helper'); +const yeoman = require('./helpers/yeoman-helper'); +const linter = require('./helpers/linter-helper'); +const unit = require('./helpers/unit-helper'); +const jsdom = require('./helpers/jsdom-helper'); + +describe('fountain interactive integration test with jsdom', function () { + this.timeout(0); + + before(function *() { + yield yeoman.prepare(); + }); + + it(`should test linter on `, function *() { + const options = yield yeoman.run(); + yield linter.linterTest(options); + }); + + it('should run unit tests', function *() { + const result = yield gulp.test(); + unit.unitTests(result); + }); + + it('should run "gulp serve" and e2e on number of Techs listed', function *() { + const url = yield gulp.serve(); + yield jsdom.run(url); + gulp.killServe(); + }); + + it('should run "gulp serve:dist" and e2e on number of Techs listed', function *() { + const url = yield gulp.serveDist(); + yield jsdom.run(url); + gulp.killServe(); + }); +});