diff --git a/gulpfile.js b/gulpfile.js index 016708f04..583192215 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -175,7 +175,7 @@ function runIntern(params) { }; } -gulp.task('intern:unit', runIntern({suites: argv.suites || 'static/tests/unit/**/*.js', browser: 'phantomjs'})); +gulp.task('intern:unit', runIntern({suites: argv.suites || 'static/tests/unit/**/*.js'})); gulp.task('intern:functional', runIntern({functionalSuites: argv.suites || 'static/tests/functional/**/test_*.js'})); gulp.task('unit-tests', function(cb) { diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 0f35ea5b1..c26727ab5 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -26,10 +26,6 @@ "version": "3.3.4", "from": "bootstrap@3.3.4" }, - "casperjs": { - "version": "1.1.0-beta3", - "from": "casperjs@1.1.0-beta3" - }, "classnames": { "version": "1.1.4", "from": "classnames@1.1.4" @@ -3995,274 +3991,6 @@ "version": "1.4.0", "from": "open-sans-fontface@1.4.0" }, - "phantomjs": { - "version": "1.9.18", - "from": "phantomjs@1.9.18", - "dependencies": { - "adm-zip": { - "version": "0.4.4", - "from": "adm-zip@0.4.4" - }, - "fs-extra": { - "version": "0.23.1", - "from": "fs-extra@0.23.1", - "dependencies": { - "graceful-fs": { - "version": "4.1.2", - "from": "graceful-fs@4.1.2" - }, - "jsonfile": { - "version": "2.2.1", - "from": "jsonfile@2.2.1" - }, - "path-is-absolute": { - "version": "1.0.0", - "from": "path-is-absolute@1.0.0" - } - } - }, - "kew": { - "version": "0.4.0", - "from": "kew@0.4.0" - }, - "npmconf": { - "version": "2.1.1", - "from": "npmconf@2.1.1", - "dependencies": { - "config-chain": { - "version": "1.1.9", - "from": "config-chain@1.1.9", - "dependencies": { - "proto-list": { - "version": "1.2.4", - "from": "proto-list@1.2.4" - } - } - }, - "inherits": { - "version": "2.0.1", - "from": "inherits@2.0.1" - }, - "ini": { - "version": "1.3.4", - "from": "ini@1.3.4" - }, - "mkdirp": { - "version": "0.5.1", - "from": "mkdirp@0.5.1", - "dependencies": { - "minimist": { - "version": "0.0.8", - "from": "minimist@0.0.8" - } - } - }, - "nopt": { - "version": "3.0.3", - "from": "nopt@3.0.3", - "dependencies": { - "abbrev": { - "version": "1.0.7", - "from": "abbrev@1.0.7" - } - } - }, - "once": { - "version": "1.3.2", - "from": "once@1.3.2", - "dependencies": { - "wrappy": { - "version": "1.0.1", - "from": "wrappy@1.0.1" - } - } - }, - "osenv": { - "version": "0.1.3", - "from": "osenv@0.1.3", - "dependencies": { - "os-homedir": { - "version": "1.0.1", - "from": "os-homedir@1.0.1" - }, - "os-tmpdir": { - "version": "1.0.1", - "from": "os-tmpdir@1.0.1" - } - } - }, - "semver": { - "version": "4.3.6", - "from": "semver@4.3.6" - }, - "uid-number": { - "version": "0.0.5", - "from": "uid-number@0.0.5" - } - } - }, - "progress": { - "version": "1.1.8", - "from": "progress@1.1.8" - }, - "request": { - "version": "2.42.0", - "from": "request@2.42.0", - "dependencies": { - "bl": { - "version": "0.9.4", - "from": "bl@0.9.4", - "dependencies": { - "readable-stream": { - "version": "1.0.33", - "from": "readable-stream@1.0.33", - "dependencies": { - "core-util-is": { - "version": "1.0.1", - "from": "core-util-is@1.0.1" - }, - "isarray": { - "version": "0.0.1", - "from": "isarray@0.0.1" - }, - "string_decoder": { - "version": "0.10.31", - "from": "string_decoder@0.10.31" - }, - "inherits": { - "version": "2.0.1", - "from": "inherits@2.0.1" - } - } - } - } - }, - "caseless": { - "version": "0.6.0", - "from": "caseless@0.6.0" - }, - "forever-agent": { - "version": "0.5.2", - "from": "forever-agent@0.5.2" - }, - "qs": { - "version": "1.2.2", - "from": "qs@1.2.2" - }, - "json-stringify-safe": { - "version": "5.0.1", - "from": "json-stringify-safe@5.0.1" - }, - "mime-types": { - "version": "1.0.2", - "from": "mime-types@1.0.2" - }, - "node-uuid": { - "version": "1.4.3", - "from": "node-uuid@1.4.3" - }, - "tunnel-agent": { - "version": "0.4.1", - "from": "tunnel-agent@0.4.1" - }, - "tough-cookie": { - "version": "2.0.0", - "from": "tough-cookie@2.0.0" - }, - "form-data": { - "version": "0.1.4", - "from": "form-data@0.1.4", - "dependencies": { - "combined-stream": { - "version": "0.0.7", - "from": "combined-stream@0.0.7", - "dependencies": { - "delayed-stream": { - "version": "0.0.5", - "from": "delayed-stream@0.0.5" - } - } - }, - "mime": { - "version": "1.2.11", - "from": "mime@1.2.11" - }, - "async": { - "version": "0.9.2", - "from": "async@0.9.2" - } - } - }, - "http-signature": { - "version": "0.10.1", - "from": "http-signature@0.10.1", - "dependencies": { - "assert-plus": { - "version": "0.1.5", - "from": "assert-plus@0.1.5" - }, - "asn1": { - "version": "0.1.11", - "from": "asn1@0.1.11" - }, - "ctype": { - "version": "0.5.3", - "from": "ctype@0.5.3" - } - } - }, - "oauth-sign": { - "version": "0.4.0", - "from": "oauth-sign@0.4.0" - }, - "hawk": { - "version": "1.1.1", - "from": "hawk@1.1.1", - "dependencies": { - "hoek": { - "version": "0.9.1", - "from": "hoek@0.9.1" - }, - "boom": { - "version": "0.4.2", - "from": "boom@0.4.2" - }, - "cryptiles": { - "version": "0.2.2", - "from": "cryptiles@0.2.2" - }, - "sntp": { - "version": "0.2.4", - "from": "sntp@0.2.4" - } - } - }, - "aws-sign2": { - "version": "0.5.0", - "from": "aws-sign2@0.5.0" - }, - "stringstream": { - "version": "0.0.4", - "from": "stringstream@0.0.4" - } - } - }, - "request-progress": { - "version": "0.3.1", - "from": "request-progress@0.3.1", - "dependencies": { - "throttleit": { - "version": "0.0.2", - "from": "throttleit@0.0.2" - } - } - }, - "which": { - "version": "1.0.9", - "from": "which@1.0.9" - } - } - }, "react": { "version": "0.13.3", "from": "react@0.13.3", diff --git a/package.json b/package.json index 2a4054785..9df69c427 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "requirejs-plugins": "1.0.2" }, "devDependencies": { - "casperjs": "~1.1.0-beta3", "es5-shim": "~4.1.11", "eslint-plugin-react": "~3.1.0", "esprima-fb": "13001.1001.0-dev-harmony-fb", @@ -47,7 +46,6 @@ "gulp-util": "~3.0.4", "intern": "~2.2.2", "minimist": "~1.1.1", - "phantomjs": "~1.9.16", "rimraf": "~2.2.8", "run-sequence": "~1.0.2", "selenium-standalone": "~4.4.0", diff --git a/static/tests/intern-phantomjs.js b/static/tests/intern-phantomjs.js index 5ecd2f71b..692fdf0af 100644 --- a/static/tests/intern-phantomjs.js +++ b/static/tests/intern-phantomjs.js @@ -16,10 +16,7 @@ define(['./intern'], function(config) { 'use strict'; - config.environments = [{ - browserName: 'phantomjs', - 'phantomjs.binary.path': 'node_modules/phantomjs/lib/phantom/bin/phantomjs' - }]; + config.environments = [{browserName: 'phantomjs'}]; config.loader.shim.react = { deps: ['vendor/npm/es5-shim/es5-shim'] };