fix broken tests

Author: petekanev

test/npm-support.ts

@@ -191,6 +191,7 @@ describe("Npm support tests", () => {
 		appDestinationFolderPath = projectSetup.appDestinationFolderPath;
 	});
 	it("Ensures that the installed dependencies are prepared correctly", () => {
+		let fs: IFileSystem = testInjector.resolve("fs");
 		// Setup
 		addDependencies(testInjector, projectFolder, { "bplist": "0.0.4" }).wait();
 
@@ -199,16 +200,15 @@ describe("Npm support tests", () => {
 
 		// Assert
 		let tnsModulesFolderPath = path.join(appDestinationFolderPath, "app", "tns_modules");
-		let lodashFolderPath = path.join(tnsModulesFolderPath, "lodash");
-		let bplistFolderPath = path.join(tnsModulesFolderPath, "bplist");
-		let bplistCreatorFolderPath = path.join(tnsModulesFolderPath, "bplist-creator");
-		let bplistParserFolderPath = path.join(tnsModulesFolderPath, "bplist-parser");
 
-		let fs = testInjector.resolve("fs");
-		assert.isTrue(fs.exists(lodashFolderPath).wait());
-		assert.isTrue(fs.exists(bplistFolderPath).wait());
-		assert.isTrue(fs.exists(bplistCreatorFolderPath).wait());
-		assert.isTrue(fs.exists(bplistParserFolderPath).wait());
+		let results = fs.enumerateFilesInDirectorySync(tnsModulesFolderPath, (file, stat) => {
+			return true;
+		}, { enumerateDirectories: true });
+
+		assert.isTrue(results.filter((val) => _.endsWith(val, "lodash")).length === 1);
+		assert.isTrue(results.filter((val) => _.endsWith(val, path.join(tnsModulesFolderPath, "bplist"))).length === 1);
+		assert.isTrue(results.filter((val) => _.endsWith(val, "bplist-creator")).length === 1);
+		assert.isTrue(results.filter((val) => _.endsWith(val, "bplist-parser")).length === 1);
 	});
 	it("Ensures that scoped dependencies are prepared correctly", () => {
 		// Setup
@@ -219,11 +219,8 @@ describe("Npm support tests", () => {
 		let dependencies: any = {};
 		dependencies[scopedName] = "0.0.0-prealpha.3";
 		// Do not pass dependencies object as the sinopia cannot work with scoped dependencies. Instead move them manually.
-		addDependencies(testInjector, projectFolder, {}).wait();
-		//create module dir, and add a package.json
-		shelljs.mkdir("-p", scopedModule);
-		fs.writeFile(scopedPackageJson, JSON.stringify({ name: scopedName, version: "1.0.0" })).wait();
-
+		addDependencies(testInjector, projectFolder, dependencies).wait();
+		
 		// Act
 		preparePlatform(testInjector).wait();
 
@@ -249,9 +246,16 @@ describe("Npm support tests", () => {
 
 		// Assert
 		let tnsModulesFolderPath = path.join(appDestinationFolderPath, "app", "tns_modules");
+		
+		let results = fs.enumerateFilesInDirectorySync(tnsModulesFolderPath, (file, stat) => {
+			return true;
+		}, { enumerateDirectories: true });
 
-		let scopedDependencyPath = path.join(tnsModulesFolderPath, "@scoped-plugin", "inner-plugin");
-		assert.isTrue(fs.exists(scopedDependencyPath).wait());
+		let filteredResults = results.filter((val) => {
+			return _.endsWith(val,  path.join("@scoped-plugin", "inner-plugin"));			
+		});
+
+		assert.isTrue(filteredResults.length === 1);
 	});
 
 	it("Ensures that tns_modules absent when bundling", () => {