{"commit":{"authorEmail":"aylott@fb.com","authoredAt":"2013-11-06T16:44:03-05:00","authorName":"Thomas Aylott","shortRevision":"c9401be38e","subject":"replace phantom-harness runner with webdriver","revision":"c9401be38eb817c16f4e3adf8a1cefd4d9a79279"},"parents":["b922d8d8a6ee5a6db47401086bf109f6ac056036"],"files":[{"status":"M","path":"Gruntfile.js"},{"status":"D","path":"grunt\/config\/phantom.js"},{"status":"D","path":"grunt\/tasks\/phantom.js"},{"status":"D","path":"test\/index.html"},{"status":"D","path":"test\/phantom-harness.js"}],"patch":"diff --git a\/Gruntfile.js b\/Gruntfile.js\nindex 81f09ab87c..7357e051aa 100644\n--- a\/Gruntfile.js\n+++ b\/Gruntfile.js\n@@ -4,7 +4,6 @@ var exec = require('child_process').exec;\n var jsxTask = require('.\/grunt\/tasks\/jsx');\n var browserifyTask = require('.\/grunt\/tasks\/browserify');\n var populistTask = require('.\/grunt\/tasks\/populist');\n-var phantomTask = require('.\/grunt\/tasks\/phantom');\n var webdriverPhantomJSTask = require('.\/grunt\/tasks\/webdriver-phantomjs');\n var webdriverJasmineTasks = require('.\/grunt\/tasks\/webdriver-jasmine');\n var npmTask = require('.\/grunt\/tasks\/npm');\n@@ -18,7 +17,6 @@ module.exports = function(grunt) {\n jsx: require('.\/grunt\/config\/jsx\/jsx'),\n browserify: require('.\/grunt\/config\/browserify'),\n populist: require('.\/grunt\/config\/populist'),\n- phantom: require('.\/grunt\/config\/phantom'),\n connect: require('.\/grunt\/config\/server')(grunt),\n \"webdriver-jasmine\": require('.\/grunt\/config\/webdriver-jasmine.js'),\n npm: require('.\/grunt\/config\/npm'),\n@@ -44,8 +42,6 @@ module.exports = function(grunt) {\n \n grunt.registerMultiTask('populist', populistTask);\n \n- grunt.registerMultiTask('phantom', phantomTask);\n-\n grunt.registerMultiTask('webdriver-jasmine', webdriverJasmineTasks);\n \n grunt.registerMultiTask('npm', npmTask);\n@@ -79,12 +75,12 @@ module.exports = function(grunt) {\n \n grunt.registerTask('webdriver-phantomjs', webdriverPhantomJSTask);\n \n- grunt.registerTask('test:webdriver', [\n+ grunt.registerTask('test:webdriver:phantomjs', [\n 'connect',\n 'webdriver-phantomjs',\n 'webdriver-jasmine:local'\n ]);\n- grunt.registerTask('test', ['build:test', 'build:basic', 'phantom:run']);\n+ grunt.registerTask('test', ['build:test', 'build:basic', 'test:webdriver:phantomjs']);\n grunt.registerTask('npm:test', ['build', 'npm:pack']);\n \n \/\/ Optimized build task that does all of our builds. The subtasks will be run\ndiff --git a\/grunt\/config\/phantom.js b\/grunt\/config\/phantom.js\ndeleted file mode 100644\nindex 36cbc0f3de..0000000000\n--- a\/grunt\/config\/phantom.js\n+++ \/dev\/null\n@@ -1,11 +0,0 @@\n-var grunt = require(\"grunt\");\n-\n-exports.run = {\n- port: 8080,\n- harness: \"test\/phantom-harness.js\",\n- \/\/ Run `grunt test --debug` to enable in-browser testing.\n- debug: !!grunt.option(\"debug\"),\n- tests: [\n- \"**\/__tests__\/*-test.js\"\n- ]\n-};\ndiff --git a\/grunt\/tasks\/phantom.js b\/grunt\/tasks\/phantom.js\ndeleted file mode 100644\nindex d5c66eb258..0000000000\n--- a\/grunt\/tasks\/phantom.js\n+++ \/dev\/null\n@@ -1,68 +0,0 @@\n-'use strict';\n-\n-var assert = require(\"assert\");\n-var grunt = require(\"grunt\");\n-var spawn = grunt.util.spawn;\n-var semver = require(\"semver\");\n-var MIN_VERSION = \"1.9.0\";\n-var phantomjs = require(\"phantomjs\").path;\n-\n-function checkVersion(error, result, code) {\n- if (error) {\n- throw error;\n- }\n- assert.strictEqual(code, 0);\n-\n- var version = result.stdout;\n-\n- assert.ok(\n- semver.valid(version),\n- \"Invalid PhantomJS version: \" + version\n- );\n-\n- assert.ok(\n- semver.gte(version, MIN_VERSION),\n- \"PhantomJS v\" + version + \" too old; need to install \" +\n- \"v\" + MIN_VERSION + \" or higher.\"\n- );\n-}\n-\n-function run(config, done) {\n- var args = [\n- config.harness,\n- \"--port\", config.port\n- ];\n-\n- if (config.debug) {\n- args.push(\"--debug\");\n- }\n-\n- args.push(\"--tests\");\n- grunt.file.expand({\n- nonull: true,\n- cwd: \"src\"\n- }, config.tests || []).forEach(function(file) {\n- args.push(file.replace(\/\\.js$\/i, \"\"));\n- });\n-\n- var child = spawn({\n- cmd: phantomjs,\n- args: args\n- }, done);\n-\n- child.stdout.pipe(process.stdout);\n- child.stderr.pipe(process.stderr);\n-}\n-\n-module.exports = function() {\n- var config = this.data;\n- var done = this.async();\n-\n- spawn({\n- cmd: phantomjs,\n- args: [\"--version\"]\n- }, function(error, result, code) {\n- checkVersion(error, result, code);\n- run(config, done);\n- });\n-};\ndiff --git a\/test\/index.html b\/test\/index.html\ndeleted file mode 100644\nindex 97fbfb0479..0000000000\n--- a\/test\/index.html\n+++ \/dev\/null\n@@ -1,23 +0,0 @@\n-\n-\n- \n- \n-

dillon1000/react

Files changed