{"patch":"diff --git a\/.gitignore b\/.gitignore\nindex fce7d1d993..e69b58bd04 100644\n--- a\/.gitignore\n+++ b\/.gitignore\n@@ -22,4 +22,4 @@ docs\/js\/live_editor.js\n docs\/js\/examples\n docs\/downloads\n examples\/shared\/*.js\n-\n+test\/the-files-to-test.generated.js\ndiff --git a\/.travis.yml b\/.travis.yml\nindex 1a40ce3cf6..0f00ae082c 100644\n--- a\/.travis.yml\n+++ b\/.travis.yml\n@@ -13,3 +13,5 @@ env:\n - secure: qPvsJ46XzGrdIuPA70b55xQNGF8jcK7N1LN5CCQYYocXLa+fBrl+fTE77QvehOPhqwJXcj6kOxI+sY0KrVwV7gmq2XY2HZGWUSCxTN0SZlNIzqPA80Y7G\/yOjA4PUt8LKgP+8tptyhTAY56qf+hgW8BoLiKOdztYF2p+3zXOLuA=\n # SECRET_TOKEN\n - secure: dkpPW+VnoqC\/okhRdV90m36NcyBFhcwEKL3bNFExAwi0dXnFao8RoFlvnwiPlA23h2faROkMIetXlti6Aju08BgUFV+f9aL6vLyU7gUent4Nd3413zf2fwDtXIWIETg6uLnOpSykGKgCAT\/hY3Q2oPLqOoY0OxfgnbqwxkxljrE=\n+ - secure: eHMg4yQWJ+5zFxNcjVwpdpcbZCQMaSByqJy0wwQ2XOOMItdCvSfO\/fa+mYoVND\/9Orsi5kvXC9tx4sYHyth5hLrvO+bghYjiayrbxYYrxso6G\/aU8Pttc7s\/qk3I4zadLlua1kGy2TauByxS6nt9nUDe0FDaJKA9k1QXVlpq5Ac=\n+ - secure: v65jUPPNBvJg1xhj4cY7wMKinCESUseHsW1d2gp68SluFHHyjWZOvXYXZdABqB\/1uNmQxjbUkwkdSNAOn5k7ppjRcRnlAH2uu1xDqXrGp6cW4MfNPchrAe+FcUMtse\/3THGJj8SZ9IQWIl+BHv4XASQ7FwqCR8cwlOfhsqdfch8=\ndiff --git a\/Gruntfile.js b\/Gruntfile.js\nindex 6ecc654e32..c46d9a6ba4 100644\n--- a\/Gruntfile.js\n+++ b\/Gruntfile.js\n@@ -4,7 +4,8 @@ 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 var releaseTasks = require('.\/grunt\/tasks\/release');\n \n@@ -16,7 +17,8 @@ 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 clean: ['.\/build', '.\/*.gem', '.\/docs\/_site', '.\/examples\/shared\/*.js'],\n jshint: require('.\/grunt\/config\/jshint'),\n@@ -25,11 +27,12 @@ module.exports = function(grunt) {\n \n grunt.config.set('compress', require('.\/grunt\/config\/compress'));\n \n- grunt.loadNpmTasks('grunt-contrib-jshint');\n- grunt.loadNpmTasks('grunt-contrib-copy');\n- grunt.loadNpmTasks('grunt-contrib-clean');\n- grunt.loadNpmTasks('grunt-compare-size');\n- grunt.loadNpmTasks('grunt-contrib-compress');\n+ Object.keys(grunt.file.readJSON('package.json').devDependencies)\n+ .filter(function(npmTaskName){ return npmTaskName.indexOf('grunt-') === 0;})\n+ .forEach(function(npmTaskName){\n+ grunt.loadNpmTasks(npmTaskName);\n+ })\n+ ;\n \n \/\/ Alias 'jshint' to 'lint' to better match the workflow we know\n grunt.registerTask('lint', ['jshint']);\n@@ -42,7 +45,7 @@ module.exports = function(grunt) {\n \n grunt.registerMultiTask('populist', populistTask);\n \n- grunt.registerMultiTask('phantom', phantomTask);\n+ grunt.registerMultiTask('webdriver-jasmine', webdriverJasmineTasks);\n \n grunt.registerMultiTask('npm', npmTask);\n \n@@ -70,11 +73,17 @@ module.exports = function(grunt) {\n 'jsx:jasmine',\n 'jsx:test',\n 'version-check',\n- 'populist:jasmine',\n 'populist:test'\n ]);\n \n- grunt.registerTask('test', ['build:test', 'build:basic', 'phantom:run']);\n+ grunt.registerTask('webdriver-phantomjs', webdriverPhantomJSTask);\n+\n+ grunt.registerTask('test:webdriver:phantomjs', [\n+ 'connect',\n+ 'webdriver-phantomjs',\n+ 'webdriver-jasmine:local'\n+ ]);\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\/config\/server.js b\/grunt\/config\/server.js\nnew file mode 100644\nindex 0000000000..cfa4506dcf\n--- \/dev\/null\n+++ b\/grunt\/config\/server.js\n@@ -0,0 +1,47 @@\n+var pxlgif = Buffer('R0lGODlhAQABAIAAAP\/\/\/wAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==', 'base64');\n+\n+module.exports = function(grunt){\n+ \n+ function printMiddleware(req, res, next) {\n+ if (req._parsedUrl.pathname != '\/print') return next();\n+ if (req.query.message.indexOf('ok') === 0){\n+ grunt.log.ok(req.query.message);\n+ } else if (req.query.message.indexOf('not ok') === 0){\n+ grunt.log.error(req.query.message);\n+ } else {\n+ grunt[req.query.type || 'log'].writeln('[%s][%s]', req.headers['user-agent'], Date.now(), req.query.message);\n+ }\n+ res.end(pxlgif);\n+ }\n+ function testResultLoggerMiddleware(req, res, next) {\n+ if (!(req.body && req.body.data)) return next();\n+ grunt.log.writeln('[%s][%s]', req.headers['user-agent'], Date.now(), req.body.data);\n+ res.end('Got it, thanks!');\n+ }\n+ \n+ return {\n+ server: {\n+ options: {\n+ base: '.',\n+ hostname: '*',\n+ port: 9999,\n+ middleware: function(connect, options) {\n+ connect.logger.token('user-agent', function(req, res){ return req.headers['user-agent']; });\n+ connect.logger.token('timestamp', function(req, res){ return Date.now(); });\n+ \n+ return [\n+ connect.query(),\n+ printMiddleware,\n+ \n+ connect.logger({format:'[:user-agent][:timestamp] :method :url', stream:grunt.verbose}),\n+ connect.bodyParser(),\n+ testResultLoggerMiddleware,\n+ \n+ connect.static(options.base),\n+ connect.directory(options.base)\n+ ];\n+ },\n+ }\n+ }\n+ }\n+}\ndiff --git a\/grunt\/config\/webdriver-jasmine.js b\/grunt\/config\/webdriver-jasmine.js\nnew file mode 100644\nindex 0000000000..1b3a58b4a3\n--- \/dev\/null\n+++ b\/grunt\/config\/webdriver-jasmine.js\n@@ -0,0 +1,18 @@\n+var grunt = require('grunt');\n+\n+\n+exports.local = {\n+ webdriver: {\n+ remote: { protocol: 'http:', hostname: '127.0.0.1', port: 9515, path: '\/' }\n+ },\n+ url: \"http:\/\/127.0.0.1:9999\/test\/index.html\",\n+ onComplete: function(report){\n+ var browser = this;\n+ if (!report.passed){\n+ grunt.fatal(\"tests failed\");\n+ }\n+ },\n+ onError: function(error){\n+ grunt.fatal(error);\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\/grunt\/tasks\/populist.js b\/grunt\/tasks\/populist.js\nindex b9b848bf88..eba314d91e 100644\n--- a\/grunt\/tasks\/populist.js\n+++ b\/grunt\/tasks\/populist.js\n@@ -1,11 +1,19 @@\n 'use strict';\n \n var grunt = require('grunt');\n+var fs = require('fs')\n \n module.exports = function() {\n var config = this.data;\n var done = this.async();\n \n+ var theFilesToTestScript = fs.createWriteStream(__dirname + '\/..\/..\/test\/the-files-to-test.generated.js');\n+ theFilesToTestScript.write('\/\/ Generated by ');\n+ theFilesToTestScript.write(JSON.stringify(__filename.split(\/(?=grunt)\/)[1]));\n+ theFilesToTestScript.write(' at ');\n+ theFilesToTestScript.write(JSON.stringify(new Date()));\n+ theFilesToTestScript.write('\\n\\n');\n+\n \/\/ create the bundle we'll work with\n var args = config.args;\n \n@@ -15,7 +23,9 @@ module.exports = function() {\n nonull: true, \/\/ Keep IDs that don't expand to anything.\n cwd: config.rootDirectory\n }, requires).forEach(function(name) {\n- args.push(name.replace(\/\\.js$\/i, \"\"));\n+ name = name.replace(\/\\.js$\/i, \"\");\n+ args.push(name);\n+ theFilesToTestScript.write('harness.enableTest(' + JSON.stringify(name) + ');\\n');\n });\n \n require(\"populist\").buildP({\n@@ -23,6 +33,7 @@ module.exports = function() {\n args: args\n }).then(function(output) {\n grunt.file.write(config.outfile, output);\n+ theFilesToTestScript.end();\n done();\n });\n };\ndiff --git a\/grunt\/tasks\/webdriver-jasmine.js b\/grunt\/tasks\/webdriver-jasmine.js\nnew file mode 100644\nindex 0000000000..bd998dfcb7\n--- \/dev\/null\n+++ b\/grunt\/tasks\/webdriver-jasmine.js\n@@ -0,0 +1,44 @@\n+var grunt = require(\"grunt\");\n+var wd = require('wd');\n+\n+module.exports = function(){\n+ var config = this.data;\n+ var taskSucceeded = this.async();\n+ grunt.verbose.write('webdriver remote', JSON.stringify(config.webdriver.remote));\n+ var browser = wd.promiseChainRemote(config.webdriver.remote);\n+\n+ browser.on('status', function(info) {\n+ grunt.verbose.writeln(info);\n+ });\n+\n+ browser.on('command', function(meth, path, data) {\n+ grunt.verbose.writeln(' > ' + meth, path, data || '');\n+ });\n+\n+ browser\n+ .init(config.browser || {})\n+ .get(config.url)\n+ .then(function(){return browser;})\n+ .then(getJSReport)\n+ .then(config.onComplete && config.onComplete.bind(browser), config.onError && config.onError.bind(browser))\n+ .fail(grunt.verbose.writeln.bind(grunt.verbose))\n+ .fin(function(){\n+ if (grunt.option('webdriver-keep-open')) return;\n+ grunt.verbose.writeln('Closing the browser window. To keep it open, pass the --webdriver-keep-open flag to grunt.');\n+ return browser.quit();\n+ })\n+ .done(\n+ taskSucceeded.bind(null,true),\n+ taskSucceeded.bind(null,false)\n+ )\n+ ;\n+}\n+\n+function getJSReport(browser){\n+ return browser\n+ .waitForCondition(\"typeof window.jasmine != 'undefined'\", 500)\n+ .waitForCondition(\"typeof window.jasmine.getJSReport != 'undefined'\", 10e3)\n+ .waitForCondition(\"window.testImageURL.running <= 0\", 5e3)\n+ .eval(\"jasmine.getJSReport()\")\n+ ;\n+}\ndiff --git a\/grunt\/tasks\/webdriver-phantomjs.js b\/grunt\/tasks\/webdriver-phantomjs.js\nnew file mode 100644\nindex 0000000000..0f841b633e\n--- \/dev\/null\n+++ b\/grunt\/tasks\/webdriver-phantomjs.js\n@@ -0,0 +1,37 @@\n+var grunt = require('grunt');\n+\n+module.exports = function(){\n+ var onReadyCallback = this.async();\n+\n+ var phantomjs = require(\"phantomjs\").path;\n+ var child_process = require('child_process');\n+ var config = this.data || {};\n+\n+ var args = [\"--webdriver=\" + (config.port || 9515)];\n+ grunt.verbose.writeln('phantomjs START path:%s args:%s', phantomjs, args);\n+\n+ var child = child_process.spawn(phantomjs, args);\n+ process.on('exit', function() {\n+ child.kill();\n+ });\n+\n+ child.on('error', function(error) {\n+ grunt.verbose.writeln('phantomjs ERROR');\n+ grunt.fatal(error);\n+ });\n+ child.on('exit', function(code) {\n+ grunt.verbose.writeln('phantomjs END');\n+ if (code) grunt.fatal('phantomjs FAIL');\n+ });\n+\n+ function verboseWrite(chunk) {\n+ if (onReadyCallback && chunk.toString().indexOf('running on port') != -1) {\n+ grunt.verbose.writeln('phantomjs STARTED');\n+ onReadyCallback();\n+ onReadyCallback = null;\n+ }\n+ grunt.verbose.write(chunk);\n+ }\n+ child.stdout.on('data', verboseWrite);\n+ child.stderr.on('data', verboseWrite);\n+}\ndiff --git a\/package.json b\/package.json\nindex de0aa349ce..865f4a0a9b 100644\n--- a\/package.json\n+++ b\/package.json\n@@ -48,7 +48,7 @@\n \"grunt-contrib-copy\": \"~0.4.1\",\n \"grunt-contrib-jshint\": \"~0.6.0\",\n \"optimist\": \"~0.6.0\",\n- \"phantomjs\": \"~1.9.1-4\",\n+ \"phantomjs\": \"~1.9\",\n \"recast\": \"~0.4.16\",\n \"semver\": \"~2.1.0\",\n \"uglify-js\": \"~2.4.0\",\n@@ -56,7 +56,11 @@\n \"grunt-compare-size\": \"~0.4.0\",\n \"gzip-js\": \"~0.3.2\",\n \"tmp\": \"~0.0.18\",\n- \"grunt-contrib-compress\": \"~0.5.1\"\n+ \"grunt-contrib-compress\": \"~0.5.1\",\n+ \"jasmine-tapreporter\": \"~0.2.2\",\n+ \"grunt-contrib-connect\": \"~0.5.0\",\n+ \"es5-shim\": \"~2.1.0\",\n+ \"wd\": \"~0.2.2\"\n },\n \"engines\": {\n \"node\": \">=0.10.0\"\ndiff --git a\/src\/environment\/__tests__\/ReactWebWorker-test.js b\/src\/environment\/__tests__\/ReactWebWorker-test.js\nindex 87f093f8c0..8703dbb2a1 100644\n--- a\/src\/environment\/__tests__\/ReactWebWorker-test.js\n+++ b\/src\/environment\/__tests__\/ReactWebWorker-test.js\n@@ -22,11 +22,11 @@\n \"use strict\";\n \n describe('ReactWebWorker', function() {\n- it('can run React in a web worker', function() {\n+ ;(typeof Worker == 'undefined' ? xit : it)('can run React in a web worker', function() {\n var done = false;\n var error;\n \n- var worker = new Worker('\/worker.js');\n+ var worker = new Worker(window.ReactWebWorker_URL || '\/src\/test\/worker.js?_=' + Date.now().toString(36));\n worker.addEventListener('message', function(e) {\n var data = JSON.parse(e.data);\n if (data.type == 'error') {\ndiff --git a\/src\/test\/worker.js b\/src\/test\/worker.js\nindex 2918cb6e4d..7ba7e1ffc7 100644\n--- a\/src\/test\/worker.js\n+++ b\/src\/test\/worker.js\n@@ -6,7 +6,7 @@ var global = {};\n importScripts(\"phantomjs-shims.js\");\n \n try {\n- importScripts(\"react.js\");\n+ importScripts(\"..\/..\/build\/react.js\");\n } catch (e) {\n postMessage(JSON.stringify({\n type: 'error',\ndiff --git a\/test\/index.html b\/test\/index.html\nindex 97fbfb0479..de8c0aaf9a 100644\n--- a\/test\/index.html\n+++ b\/test\/index.html\n@@ -1,23 +1,38 @@\n-\n-\n- \n- \n-

dillon1000/react

Files changed