Fixed #1222: Update PhantomJS globals to 1.7 API

Signed-off-by: Anton Kovalyov <anton@kovalyov.net>
jshint · Aug 15, 2013 · 27bd241 · 27bd241
1 parent 6c5a085
commit 27bd241
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/src/jshint.js b/src/jshint.js
@@ -4570,7 +4570,7 @@ var JSHINT = (function () {
 				directives();
 
 				if (state.directive["use strict"]) {
-					if (!state.option.globalstrict && !state.option.node) {
+					if (!state.option.globalstrict && !(state.option.node || state.option.phantom)) {
 						warning("W097", state.tokens.prev);
 					}
 				}

diff --git a/src/vars.js b/src/vars.js
@@ -405,7 +405,9 @@ exports.node = {
 exports.phantom = {
 	phantom      : true,
 	require      : true,
-	WebPage      : true
+	WebPage      : true,
+	console      : true, // in examples, but undocumented
+	exports      : true  // v1.7+
 };
 
 exports.rhino = {

diff --git a/tests/unit/envs.js b/tests/unit/envs.js
@@ -685,10 +685,26 @@ exports.phantom = function (test) {
 		'phantom',
 		'require',
 		'WebPage',
+		'console',
+		'exports'
 	];
 
 	globalsImplied(test, globals);
 	globalsKnown(test, globals, { phantom: true });
 
+	// Phantom environment assumes `globalstrict`
+	var globalStrict = [
+		'"use strict";',
+		"function test() { return; }",
+	].join('\n');
+
+	TestRun(test)
+		.addError(1, 'Use the function form of "use strict".')
+		.test(globalStrict, { es3: true, strict: true });
+
+	TestRun(test)
+		.test(globalStrict, { es3: true, phantom: true, strict: true });
+
+
 	test.done();
 };