Unit tests

Author: Fatme Havaluova

lib/tools/broccoli/node-modules-dest-copy.ts

@@ -17,50 +17,49 @@ export class DestCopy implements IBroccoliPlugin {
 	private dependencies:  IDictionary<any>  = null;
 	private devDependencies:  IDictionary<any>  = null;
 
-  constructor(private inputPath: string, private cachePath: string, private outputRoot: string, private projectDir: string) {
+  constructor(private inputPath: string, private cachePath: string, private outputRoot: string, private projectDir: string,
+	  private $fs: IFileSystem) {
 	this.dependencies = Object.create(null);
 	this.devDependencies = this.getDevDependencies(projectDir);
   }
 
   public rebuildChangedDirectories(changedDirectories: string[]): void {
 	_.each(changedDirectories, changedDirectoryAbsolutePath => {
 		let pathToPackageJson = path.join(changedDirectoryAbsolutePath, "package.json");
-		if(fs.existsSync(pathToPackageJson)) {
-			let packageJsonFiles = [pathToPackageJson];
-			let nodeModulesFolderPath = path.join(changedDirectoryAbsolutePath, "node_modules");
-			packageJsonFiles = packageJsonFiles.concat(this.enumeratePackageJsonFilesSync(nodeModulesFolderPath));
+		let packageJsonFiles = fs.existsSync(pathToPackageJson) ? [pathToPackageJson] : [];
+		let nodeModulesFolderPath = path.join(changedDirectoryAbsolutePath, "node_modules");
+		packageJsonFiles = packageJsonFiles.concat(this.enumeratePackageJsonFilesSync(nodeModulesFolderPath));
+			
+		_.each(packageJsonFiles, packageJsonFilePath => {
+			let fileContent = require(packageJsonFilePath);
+			let isPlugin = fileContent.nativescript;
+	
+			if(!this.devDependencies[fileContent.name]) { // Don't flatten dev dependencies
+		
+				let currentDependency = {
+					name: fileContent.name,
+					version: fileContent.version,
+					directory: path.dirname(packageJsonFilePath),
+					isPlugin: isPlugin
+				};
 
-			_.each(packageJsonFiles, packageJsonFilePath => {
-				let fileContent = require(packageJsonFilePath);
-				let isPlugin = fileContent.nativescript;
+				let addedDependency = this.dependencies[currentDependency.name];
+				if (addedDependency) {
+					if (semver.gt(currentDependency.version, addedDependency.version)) {
+						let currentDependencyMajorVersion = semver.major(currentDependency.version);
+						let addedDependencyMajorVersion = semver.major(addedDependency.version);
+		
+						let message = `The depedency located at ${addedDependency.directory} with version  ${addedDependency.version} will be replaced with dependency located at ${currentDependency.directory} with version ${currentDependency.version}`;
+						let logger = $injector.resolve("$logger");
+						currentDependencyMajorVersion === addedDependencyMajorVersion ? logger.out(message) : logger.warn(message);
 
-				if(!this.devDependencies[fileContent.name]) { // Don't flatten dev dependencies
-			
-					let currentDependency = {
-						name: fileContent.name,
-						version: fileContent.version,
-						directory: path.dirname(packageJsonFilePath),
-						isPlugin: isPlugin
-					};
-					
-					let addedDependency = this.dependencies[currentDependency.name];
-					if (addedDependency) {
-						if (semver.gt(currentDependency.version, addedDependency.version)) {
-							let currentDependencyMajorVersion = semver.major(currentDependency.version);
-							let addedDependencyMajorVersion = semver.major(addedDependency.version);
-			
-							let message = `The depedency located at ${addedDependency.directory} with version  ${addedDependency.version} will be replaced with dependency located at ${currentDependency.directory} with version ${currentDependency.version}`;
-							let logger = $injector.resolve("$logger");
-							currentDependencyMajorVersion === addedDependencyMajorVersion ? logger.out(message) : logger.warn(message);
-			
-							this.dependencies[currentDependency.name] = currentDependency;
-						}
-					} else {
 						this.dependencies[currentDependency.name] = currentDependency;
 					}
+				} else {
+					this.dependencies[currentDependency.name] = currentDependency;
 				}
-			});
-		}
+			}
+		});
 	});
 
 	_.each(this.dependencies, dependency => {
@@ -93,7 +92,10 @@ export class DestCopy implements IBroccoliPlugin {
 		if(fs.existsSync(nodeModulesDirectoryPath)) {
 			let contents = fs.readdirSync(nodeModulesDirectoryPath);
 			for (let i = 0; i < contents.length; ++i) {
-				foundFiles.push(path.join(nodeModulesDirectoryPath, contents[i], "package.json"));
+				let packageJsonFilePath = path.join(nodeModulesDirectoryPath, contents[i], "package.json");
+				if (fs.existsSync(packageJsonFilePath)) {
+					foundFiles.push(packageJsonFilePath);
+				}
 
                 var directoryPath = path.join(nodeModulesDirectoryPath, contents[i], "node_modules");
                 if (fs.existsSync(directoryPath)) {

test/npm-support.ts

@@ -88,15 +88,10 @@ function createProject(testInjector: IInjector, dependencies?: any): string {
 	return tempFolder;
 }
 
-describe("Npm support tests", () => {
-	it("Ensures that the installed dependencies are prepared correctly", () => {
-		let dependencies = {
-			"bplist": "0.0.4",
-			"lodash": "3.9.3"
-		};
-		
+function setupProject(): IFuture<any> {
+	return (() => {
 		let testInjector = createTestInjector();
-		let projectFolder = createProject(testInjector, dependencies);
+		let projectFolder = createProject(testInjector);
 
 		let fs = testInjector.resolve("fs");		
 
@@ -112,7 +107,6 @@ describe("Npm support tests", () => {
 		let androidFolderPath = path.join(projectFolder, "platforms", "android");
 		fs.ensureDirectoryExists(androidFolderPath).wait();
 
-		
 		// Mock platform data
 		let appDestinationFolderPath = path.join(androidFolderPath, "assets");
 		let platformsData = testInjector.resolve("platformsData");
@@ -129,8 +123,45 @@ describe("Npm support tests", () => {
 			}	
 		};
 
-		let platformService = testInjector.resolve("platformService");
-		platformService.preparePlatform("android").wait();
+		return {
+			testInjector: testInjector,
+			projectFolder: projectFolder,
+			appDestinationFolderPath: appDestinationFolderPath,
+		};
+	}).future<any>()();
+}
+
+function addDependencies(testInjector: IInjector, projectFolder: string, dependencies: any): IFuture<void> {
+	return (() => {
+		let fs = testInjector.resolve("fs");
+		let packageJsonPath = path.join(projectFolder, "package.json");
+		let packageJsonData = fs.readJson(packageJsonPath).wait();
+		
+		let currentDependencies = packageJsonData.dependencies;
+		_.extend(currentDependencies, dependencies);
+		fs.writeJson(packageJsonPath, packageJsonData).wait();
+	}).future<void>()();
+}
+
+function preparePlatform(testInjector: IInjector): IFuture<void> {
+	let platformService = testInjector.resolve("platformService");
+	return platformService.preparePlatform("android");
+}
+
+describe("Npm support tests", () => {
+	let testInjector: IInjector, projectFolder: string, appDestinationFolderPath: string;
+	before(() => {
+		let projectSetup = setupProject().wait();
+		testInjector = projectSetup.testInjector;
+		projectFolder = projectSetup.projectFolder;
+		appDestinationFolderPath = projectSetup.appDestinationFolderPath;
+	});
+	it("Ensures that the installed dependencies are prepared correctly", () => {
+		// Setup
+		addDependencies(testInjector, projectFolder, {"bplist": "0.0.4"}).wait();
+		
+		// Act
+		preparePlatform(testInjector).wait();
 
 		// Assert
 		let tnsModulesFolderPath = path.join(appDestinationFolderPath, "app", "tns_modules");		
@@ -139,6 +170,7 @@ describe("Npm support tests", () => {
 		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());