From 9fc9704cdd7dd4214e10fe32926161a3d5499fad Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Fri, 25 Sep 2015 23:13:37 -0700 Subject: [PATCH] test(tools): temporarily disable tests that depend on mock-fs mock-fs is currently incompatible with node 4.x, but a fix is in progress https://github.com/tschaub/mock-fs/issues/59 Since we are currently not actively developing the affected broccoli plugins, the risk of disabling these tests is low, especially in the light of improvements we get from node 4.x. --- tools/broccoli/broccoli-flatten.spec.ts | 6 ++++++ tools/broccoli/broccoli-merge-trees.spec.ts | 6 ++++++ tools/broccoli/tree-differ.spec.ts | 8 +++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/broccoli/broccoli-flatten.spec.ts b/tools/broccoli/broccoli-flatten.spec.ts index b58fd585d5..d89b613a75 100644 --- a/tools/broccoli/broccoli-flatten.spec.ts +++ b/tools/broccoli/broccoli-flatten.spec.ts @@ -1,6 +1,11 @@ /// /// +console.warn( + "Skipping all tests in broccoli-flatten.spec.ts because they require mock-fs which is currently incompatible with node 4.x. See: https://github.com/tschaub/mock-fs/issues/59"); + + +/* let mockfs = require('mock-fs'); import fs = require('fs'); import path = require('path'); @@ -74,3 +79,4 @@ describe('Flatten', () => { path.sep + "file-1.txt'"); }); }); +*/ diff --git a/tools/broccoli/broccoli-merge-trees.spec.ts b/tools/broccoli/broccoli-merge-trees.spec.ts index c1c659f546..0576b654ad 100644 --- a/tools/broccoli/broccoli-merge-trees.spec.ts +++ b/tools/broccoli/broccoli-merge-trees.spec.ts @@ -1,6 +1,11 @@ /// /// +console.warn( + "Skipping all tests in broccoli-merge-trees.spec.ts because they require mock-fs which is currently incompatible with node 4.x. See: https://github.com/tschaub/mock-fs/issues/59"); + + +/* let mockfs = require('mock-fs'); import fs = require('fs'); import {TreeDiffer} from './tree-differ'; @@ -89,3 +94,4 @@ describe('MergeTrees', () => { 'Either remove the duplicate or enable the "overwrite" option for this merge.'); }); }); +*/ diff --git a/tools/broccoli/tree-differ.spec.ts b/tools/broccoli/tree-differ.spec.ts index 0a2205ca52..00b6762ae1 100644 --- a/tools/broccoli/tree-differ.spec.ts +++ b/tools/broccoli/tree-differ.spec.ts @@ -1,13 +1,18 @@ /// /// +console.warn( + "Skipping all tests in tree-differ.spec.ts because they require mock-fs which is currently incompatible with node 4.x. See: https://github.com/tschaub/mock-fs/issues/59"); + + +/* let mockfs = require('mock-fs'); import fs = require('fs'); import path = require('path'); import {TreeDiffer} from './tree-differ'; -describe('TreeDiffer', () => { +xdescribe('TreeDiffer', () => { afterEach(() => mockfs.restore()); @@ -376,3 +381,4 @@ describe('TreeDiffer', () => { }); }); }); +*/