From c8ccc9fa3af9f69657f03cb55d3c8d45f250d317 Mon Sep 17 00:00:00 2001 From: Joe Walker Date: Thu, 5 Feb 2015 16:21:06 +0000 Subject: [PATCH] runat-1128988: Audit test skips for PhantomJS 2.0 Better comments for the existing skips and remove a skip that was no longer needed. Signed-off-by: Joe Walker --- lib/gcli/test/testCli2.js | 2 +- lib/gcli/test/testCompletion1.js | 2 +- lib/gcli/test/testFile.js | 5 +---- lib/gcli/test/testUnion.js | 4 ++-- lib/gcli/test/testUrl.js | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/gcli/test/testCli2.js b/lib/gcli/test/testCli2.js index 1a8ecaf6..3b242336 100644 --- a/lib/gcli/test/testCli2.js +++ b/lib/gcli/test/testCli2.js @@ -581,7 +581,7 @@ exports.testNestedCommand = function(options) { } }, { - skipIf: options.isPhantomjs, + skipIf: options.isPhantomjs, // PhantomJS gets predictions wrong setup: 'tsn x', check: { input: 'tsn x', diff --git a/lib/gcli/test/testCompletion1.js b/lib/gcli/test/testCompletion1.js index afcff226..1b1821f0 100644 --- a/lib/gcli/test/testCompletion1.js +++ b/lib/gcli/test/testCompletion1.js @@ -159,7 +159,7 @@ exports.testActivate = function(options) { } }, { - skipIf: options.isPhantomjs, + skipIf: options.isPhantomjs, // PhantomJS gets predictions wrong setup: 'tsg d', check: { hints: ' [options] -> ccc' diff --git a/lib/gcli/test/testFile.js b/lib/gcli/test/testFile.js index c00dc4bf..78a434fa 100644 --- a/lib/gcli/test/testFile.js +++ b/lib/gcli/test/testFile.js @@ -23,10 +23,7 @@ var local = false; exports.testBasic = function(options) { return helpers.audit(options, [ { - // These tests require us to be using node directly or to be in - // PhantomJS connected to an execute enabled node server or to be in - // firefox. - skipRemainingIf: options.isPhantomjs || options.isFirefox, + skipRemainingIf: options.isFirefox, // No file implementation in Firefox setup: 'tsfile open /', check: { input: 'tsfile open /', diff --git a/lib/gcli/test/testUnion.js b/lib/gcli/test/testUnion.js index 8a27a0e1..b5b7a802 100644 --- a/lib/gcli/test/testUnion.js +++ b/lib/gcli/test/testUnion.js @@ -102,7 +102,7 @@ exports.testDefault = function(options) { } }, { - skipIf: options.isPhantomjs, // Phantom goes weird with predictions + skipIf: options.isPhantomjs, // PhantomJS gets predictions wrong setup: 'unionc1 5', check: { input: 'unionc1 5', @@ -136,7 +136,7 @@ exports.testDefault = function(options) { } }, { - skipRemainingIf: options.isPhantomjs, + skipIf: options.isPhantomjs, // PhantomJS URL type is broken setup: 'unionc2 on', check: { input: 'unionc2 on', diff --git a/lib/gcli/test/testUrl.js b/lib/gcli/test/testUrl.js index 54edee36..5a332b80 100644 --- a/lib/gcli/test/testUrl.js +++ b/lib/gcli/test/testUrl.js @@ -22,7 +22,7 @@ var helpers = require('./helpers'); exports.testDefault = function(options) { return helpers.audit(options, [ { - skipRemainingIf: options.isPhantomjs, + skipRemainingIf: options.isPhantomjs, // PhantomJS URL type is broken setup: 'urlc', check: { input: 'urlc',