Skip to content

Commit

Permalink
Merge pull request #35 from smaato/sdx-1580-update-node-version
Browse files Browse the repository at this point in the history
Updated certain packages to that the package works with node 11.
  • Loading branch information
arijitdasgupta authored Dec 11, 2018
2 parents e01577e + cf3a0c1 commit b29ec68
Show file tree
Hide file tree
Showing 10 changed files with 12,165 additions and 321 deletions.
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,6 @@ Minify JS with uglify.

Serve files on localhost.

### testE2e

Run end-to-end tests with Nightwatch in PhantomJS.

### testUnit

Run unit tests with Karma.
Expand Down
19 changes: 0 additions & 19 deletions demo/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* Feel free to copy and paste this file and customize it.
*/

const fs = require('fs');
const gulp = require('gulp');
const rimraf = require('rimraf');
const runSequence = require('run-sequence');
Expand Down Expand Up @@ -139,23 +138,6 @@ gulp.task('demoTestUnit', gulpTasks.testUnit({
configFile: `${__dirname}/karma.conf.js`,
}).task);

/**
* Run e2e tests.
*/

const karmaPhantomJsShim =
fs.readFileSync('../node_modules/karma-phantomjs-shim/shim.js');

gulp.task('demoTestE2e', gulpTasks.testE2e({
dir: './tests-e2e',
connect: {
root: DISTRIBUTION_DIR,
fallback: `${DISTRIBUTION_DIR}/index.html`,
port: 9000,
},
shim: (`<script>${karmaPhantomJsShim}</script>`),
}).task);

/**
* Deploy to AWS.
*/
Expand Down Expand Up @@ -202,7 +184,6 @@ gulp.task('demoTest', done => {
'demoLintScss',
'demoBuild',
'demoTestUnit',
'demoTestE2e',
done
);
});
Expand Down
55 changes: 0 additions & 55 deletions demo/tests-e2e/nightwatch.json

This file was deleted.

11 changes: 0 additions & 11 deletions demo/tests-e2e/src/tests/demo/demo-test.js

This file was deleted.

1 change: 0 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,4 @@ module.exports.minifyJs = require('./src/minifyJs');
module.exports.serve = require('./src/serve');

// Tests
module.exports.testE2e = require('./src/testE2e');
module.exports.testUnit = require('./src/testUnit');
Loading

0 comments on commit b29ec68

Please sign in to comment.