fix: unit tests

Kristian D. Dimitrov · Kristian D. Dimitrov · commit e2a7eee51785 · 2019-01-31T15:31:23.000+02:00
diff --git a/lib/pbxProject.js b/lib/pbxProject.js
@@ -510,7 +510,7 @@ pbxProject.prototype.findMainPbxGroup = function () {
 }
 
 pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceTree, opt) {
-
+    opt = opt || {};
     var oldGroup = this.pbxGroupByName(name);
     if (oldGroup) {
         this.removePbxGroup(name, path);
@@ -523,6 +523,7 @@ pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceT
             isa: 'PBXGroup',
             children: [],
             name: name,
+            path: path,
             sourceTree: sourceTree ? sourceTree : '"<group>"'
         },//path is mandatory only for the main group
         fileReferenceSection = this.pbxFileReferenceSection(),
@@ -551,23 +552,29 @@ pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceT
 
         var srcRootPath = $path.dirname($path.dirname(this.filepath));
         var file = new pbxFile($path.relative(srcRootPath, filePath));
-        if (fs.lstatSync(filePath).isDirectory()) {
+        if (fs.existsSync(filePath) && fs.lstatSync(filePath).isDirectory()) {
             file.uuid = this.generateUuid();
             file.fileRef = file.uuid;
             this.addToPbxFileReferenceSection(file);    // PBXFileReference
             this.addToPbxBuildFileSection(file);
             pbxGroup.children.push(pbxGroupChild(file));
             var files = fs.readdirSync(filePath).map(p => $path.join(filePath, p));
             this.addPbxGroup(files, $path.basename(filePath), filePath, null, {uuid: file.uuid});
-        }else if (isSourceOrHeaderFileType(file.lastType)) {
+        } else if (isSourceOrHeaderFileType(file.lastKnownFileType)) {
             file.uuid = this.generateUuid();
             file.fileRef = this.generateUuid();
             this.addToPbxFileReferenceSection(file);    // PBXFileReference
             this.addToPbxBuildFileSection(file);        // PBXBuildFile
-            if (!isHeaderFileType(file.lastType)) {
+            if (!isHeaderFileType(file.lastKnownFileType)) {
                 this.addToPbxSourcesBuildPhase(file);
             }
             pbxGroup.children.push(pbxGroupChild(file));
+        } else {
+            file.uuid = this.generateUuid();
+            file.fileRef = this.generateUuid();
+            this.addToPbxFileReferenceSection(file);    // PBXFileReference
+            this.addToPbxBuildFileSection(file);
+            pbxGroup.children.push(pbxGroupChild(file));
         }
 
     }
@@ -594,6 +601,8 @@ pbxProject.prototype.removePbxGroup = function(groupName, path) {
     if (!group) { 
         return;
     }
+ 
+    path = path || $path.dirname(this.filepath);
 
     var children = group.children;
 
@@ -607,10 +616,13 @@ pbxProject.prototype.removePbxGroup = function(groupName, path) {
         this.removeFromPbxSourcesBuildPhase(file);
     }
 
-    var mainGroupChildren = this.findMainPbxGroup().children, i;
-    for(i in mainGroupChildren) {
-        if (mainGroupChildren[i].comment == name) {
-            mainGroupChildren.splice(i, 1);
+    var mainGroup = this.findMainPbxGroup();
+    if(mainGroup) {
+        var mainGroupChildren = this.findMainPbxGroup().children, i;
+        for(i in mainGroupChildren) {
+            if (mainGroupChildren[i].comment == name) {
+                mainGroupChildren.splice(i, 1);
+            }
         }
     }
 
@@ -1592,12 +1604,12 @@ function pbxFileReferenceObj(file) {
         includeInIndex: file.includeInIndex
     };
 
-    if(fileObject.name.indexOf("\"") !== -1) {
+    if(fileObject.name && fileObject.name.indexOf("\"") !== -1) {
         fileObject.name = fileObject.name.replace(/\"/g, "\\\"");
         fileObject.path = fileObject.path.replace(/\"/g, "\\\"");
     }
 
-    if(!file.basename.match(NO_SPECIAL_SYMBOLS)) {
+    if(file.basename && !file.basename.match(NO_SPECIAL_SYMBOLS)) {
         fileObject.name = "\"" + fileObject.name + "\"";
     }
 
diff --git a/test/BuildSettings.js b/test/BuildSettings.js
@@ -18,7 +18,7 @@
 var fullProject = require('./fixtures/full-project')
     fullProjectStr = JSON.stringify(fullProject),
     pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     proj = new pbx('.');
 
 function cleanHash() {
diff --git a/test/FrameworkSearchPaths.js b/test/FrameworkSearchPaths.js
@@ -18,7 +18,7 @@
 var fullProject = require('./fixtures/full-project')
     fullProjectStr = JSON.stringify(fullProject),
     pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     proj = new pbx('.');
 
 var pbxFile = {
diff --git a/test/HeaderSearchPaths.js b/test/HeaderSearchPaths.js
@@ -18,7 +18,7 @@
 var fullProject = require('./fixtures/full-project')
     fullProjectStr = JSON.stringify(fullProject),
     pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     proj = new pbx('.');
 
 function cleanHash() {
diff --git a/test/LibrarySearchPaths.js b/test/LibrarySearchPaths.js
@@ -18,7 +18,7 @@
 var fullProject = require('./fixtures/full-project')
     fullProjectStr = JSON.stringify(fullProject),
     pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     proj = new pbx('.');
 
 function cleanHash() {
diff --git a/test/OtherLinkerFlags.js b/test/OtherLinkerFlags.js
@@ -18,7 +18,7 @@
 var fullProject = require('./fixtures/full-project')
     fullProjectStr = JSON.stringify(fullProject),
     pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     proj = new pbx('.');
 
 function cleanHash() {
diff --git a/test/addFramework.js b/test/addFramework.js
@@ -18,7 +18,7 @@
 var fullProject = require('./fixtures/full-project')
     fullProjectStr = JSON.stringify(fullProject),
     pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     proj = new pbx('.');
 
 function cleanHash() {
@@ -98,7 +98,7 @@ exports.addFramework = {
 
         test.equal(fileRefEntry.isa, 'PBXFileReference');
         test.equal(fileRefEntry.lastKnownFileType, 'compiled.mach-o.dylib');
-        test.equal(fileRefEntry.name, '"libsqlite3.dylib"');
+        test.equal(fileRefEntry.name, 'libsqlite3.dylib');
         test.equal(fileRefEntry.path, '"usr/lib/libsqlite3.dylib"');
         test.equal(fileRefEntry.sourceTree, 'SDKROOT');
 
diff --git a/test/addHeaderFile.js b/test/addHeaderFile.js
@@ -18,7 +18,7 @@
 var fullProject = require('./fixtures/full-project')
     fullProjectStr = JSON.stringify(fullProject),
     pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     proj = new pbx('.');
 
 function cleanHash() {
@@ -70,8 +70,8 @@ exports.addHeaderFile = {
         test.equal(fileRefEntry.isa, 'PBXFileReference');
         test.equal(fileRefEntry.fileEncoding, 4);
         test.equal(fileRefEntry.lastKnownFileType, 'sourcecode.c.h');
-        test.equal(fileRefEntry.name, '"file.h"');
-        test.equal(fileRefEntry.path, '"file.h"');
+        test.equal(fileRefEntry.name, 'file.h');
+        test.equal(fileRefEntry.path, 'file.h');
         test.equal(fileRefEntry.sourceTree, '"<group>"');
 
         test.done();
diff --git a/test/addRemovePbxGroup.js b/test/addRemovePbxGroup.js
@@ -169,7 +169,6 @@ exports.addRemovePbxGroup = {
         proj.removePbxGroup(groupName);
 
         var pbxGroupInPbx = proj.pbxGroupByName(groupName);
-        console.log(pbxGroupInPbx);
 
         test.ok(!pbxGroupInPbx);
         test.done()
diff --git a/test/addResourceFile.js b/test/addResourceFile.js
@@ -18,7 +18,7 @@
 var fullProject = require('./fixtures/full-project')
     fullProjectStr = JSON.stringify(fullProject),
     pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     proj = new pbx('.');
 
 function cleanHash() {
@@ -108,7 +108,7 @@ exports.addResourceFile = {
         test.equal(fileRefEntry.isa, 'PBXFileReference');
         test.equal(fileRefEntry.fileEncoding, undefined);
         test.equal(fileRefEntry.lastKnownFileType, 'wrapper.plug-in');
-        test.equal(fileRefEntry.name, '"assets.bundle"');
+        test.equal(fileRefEntry.name, 'assets.bundle');
         test.equal(fileRefEntry.path, '"Resources/assets.bundle"');
         test.equal(fileRefEntry.sourceTree, '"<group>"');
 
@@ -169,7 +169,7 @@ exports.addResourceFile = {
             test.equal(fileRefEntry.isa, 'PBXFileReference');
             test.equal(fileRefEntry.fileEncoding, undefined);
             test.equal(fileRefEntry.lastKnownFileType, 'wrapper.plug-in');
-            test.equal(fileRefEntry.name, '"assets.bundle"');
+            test.equal(fileRefEntry.name, 'assets.bundle');
             test.equal(fileRefEntry.path, '"Plugins/assets.bundle"');
             test.equal(fileRefEntry.sourceTree, '"<group>"');
             test.done();
diff --git a/test/addSourceFile.js b/test/addSourceFile.js
@@ -18,7 +18,7 @@
 var fullProject = require('./fixtures/full-project')
     fullProjectStr = JSON.stringify(fullProject),
     pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     proj = new pbx('.');
 
 function cleanHash() {
@@ -106,8 +106,8 @@ exports.addSourceFile = {
         test.equal(fileRefEntry.isa, 'PBXFileReference');
         test.equal(fileRefEntry.fileEncoding, 4);
         test.equal(fileRefEntry.lastKnownFileType, 'sourcecode.c.objc');
-        test.equal(fileRefEntry.name, '"file.m"');
-        test.equal(fileRefEntry.path, '"file.m"');
+        test.equal(fileRefEntry.name, 'file.m');
+        test.equal(fileRefEntry.path, 'file.m');
         test.equal(fileRefEntry.sourceTree, '"<group>"');
 
         test.done();
diff --git a/test/addStaticLibrary.js b/test/addStaticLibrary.js
@@ -18,7 +18,7 @@
 var fullProject = require('./fixtures/full-project')
     fullProjectStr = JSON.stringify(fullProject),
     pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     proj = new pbx('.');
 
 function cleanHash() {
@@ -140,8 +140,8 @@ exports.addStaticLibrary = {
 
         test.equal(fileRefEntry.isa, 'PBXFileReference');
         test.equal(fileRefEntry.lastKnownFileType, 'archive.ar');
-        test.equal(fileRefEntry.name, '"libGoogleAnalytics.a"');
-        test.equal(fileRefEntry.path, '"libGoogleAnalytics.a"');
+        test.equal(fileRefEntry.name, 'libGoogleAnalytics.a');
+        test.equal(fileRefEntry.path, 'libGoogleAnalytics.a');
         test.equal(fileRefEntry.sourceTree, '"<group>"');
 
         test.done();
diff --git a/test/addToPbxFileReferenceSection.js b/test/addToPbxFileReferenceSection.js
@@ -18,7 +18,7 @@
 var jsonProject = require('./fixtures/full-project')
     fullProjectStr = JSON.stringify(jsonProject),
     pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     myProj = new pbx('.');
 
 function cleanHash() {
@@ -39,8 +39,8 @@ exports['addToPbxFileReferenceSection function'] = {
 
         test.equal(myProj.pbxFileReferenceSection()[file.fileRef].isa, 'PBXFileReference');
         test.equal(myProj.pbxFileReferenceSection()[file.fileRef].lastKnownFileType, 'sourcecode.c.objc');
-        test.equal(myProj.pbxFileReferenceSection()[file.fileRef].name, '"file.m"');
-        test.equal(myProj.pbxFileReferenceSection()[file.fileRef].path, '"file.m"');
+        test.equal(myProj.pbxFileReferenceSection()[file.fileRef].name, 'file.m');
+        test.equal(myProj.pbxFileReferenceSection()[file.fileRef].path, 'file.m');
         test.equal(myProj.pbxFileReferenceSection()[file.fileRef].sourceTree, '"<group>"');
         test.equal(myProj.pbxFileReferenceSection()[file.fileRef].fileEncoding, 4);
         test.equal(myProj.pbxFileReferenceSection()[file.fileRef + "_comment"], 'file.m');
diff --git a/test/dataModelDocument.js b/test/dataModelDocument.js
@@ -19,7 +19,7 @@ var jsonProject = require('./fixtures/full-project')
     fullProjectStr = JSON.stringify(jsonProject),
     path = require('path'),
     pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     proj = new pbx('.'),
     singleDataModelFilePath = __dirname + '/fixtures/single-data-model.xcdatamodeld',
     multipleDataModelFilePath = __dirname + '/fixtures/multiple-data-model.xcdatamodeld';
diff --git a/test/group.js b/test/group.js
@@ -16,7 +16,7 @@
  */
 
 var pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     project,
     projectHash;
 
diff --git a/test/multipleTargets.js b/test/multipleTargets.js
@@ -18,7 +18,7 @@
 var fullProject = require('./fixtures/multiple-targets')
     fullProjectStr = JSON.stringify(fullProject),
     pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     proj = new pbx('.');
 
 function cleanHash() {
diff --git a/test/pbxFile.js b/test/pbxFile.js
@@ -15,7 +15,7 @@
  under the License.
  */
 
-var pbxFile = require('../lib/pbxFile');
+var pbxFile = require('../lib/pbxFile').pbxFile;
 
 exports['lastKnownFileType'] = {
     'should detect that a .m path means sourcecode.c.objc': function (test) {
diff --git a/test/pbxProject.js b/test/pbxProject.js
@@ -18,9 +18,14 @@
 var pbx = require('../lib/pbxProject'),
     buildConfig = require('./fixtures/buildFiles'),
     jsonProject = require('./fixtures/full-project'),
+    fullProjectStr = JSON.stringify(jsonProject),
     fs = require('fs'),
     project;
 
+    function getCleanHash() {
+        return JSON.parse(fullProjectStr);
+    }
+
 exports['creation'] = {
     'should create a pbxProject with the new operator': function (test) {
         var myProj = new pbx('test/parser/projects/hash.pbxproj');
@@ -332,7 +337,7 @@ exports['hasFile'] = {
 exports['addToPbxFileReferenceSection'] = {
     'should not quote name when no special characters present in basename': function (test) {
         var newProj = new pbx('.');
-            newProj.hash = jsonProject,
+            newProj.hash = getCleanHash(),
             file = { 
                 uuid: newProj.generateUuid(), 
                 fileRef: newProj.generateUuid(), 
@@ -351,7 +356,7 @@ exports['addToPbxFileReferenceSection'] = {
     },
     'should quote name when special characters present in basename': function (test) {
         var newProj = new pbx('.');
-            newProj.hash = jsonProject,
+            newProj.hash = getCleanHash(),
             file = { 
                 uuid: newProj.generateUuid(), 
                 fileRef: newProj.generateUuid(), 
@@ -370,7 +375,7 @@ exports['addToPbxFileReferenceSection'] = {
     },
     'should not quote path when no special characters present in path': function (test) {
         var newProj = new pbx('.');
-            newProj.hash = jsonProject,
+            newProj.hash = getCleanHash(),
             file = { 
                 uuid: newProj.generateUuid(), 
                 fileRef: newProj.generateUuid(), 
@@ -389,7 +394,7 @@ exports['addToPbxFileReferenceSection'] = {
     },
     'should quote path when special characters present in path': function (test) {
         var newProj = new pbx('.');
-            newProj.hash = jsonProject,
+            newProj.hash = getCleanHash(),
             file = { 
                 uuid: newProj.generateUuid(), 
                 fileRef: newProj.generateUuid(), 
@@ -408,7 +413,7 @@ exports['addToPbxFileReferenceSection'] = {
     },
     'should quote path and name when special characters present in path and basename': function (test) {
         var newProj = new pbx('.');
-            newProj.hash = jsonProject,
+            newProj.hash = getCleanHash(),
             file = { 
                 uuid: newProj.generateUuid(), 
                 fileRef: newProj.generateUuid(), 
diff --git a/test/removeFramework.js b/test/removeFramework.js
@@ -18,7 +18,7 @@
 var fullProject = require('./fixtures/full-project'),
     fullProjectStr = JSON.stringify(fullProject),
     pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     proj = new pbx('.');
 
 function cleanHash() {
diff --git a/test/removeHeaderFile.js b/test/removeHeaderFile.js
@@ -18,7 +18,7 @@
 var fullProject = require('./fixtures/full-project')
     fullProjectStr = JSON.stringify(fullProject),
     pbx = require('../lib/pbxProject'),
-    pbxFile = require('../lib/pbxFile'),
+    pbxFile = require('../lib/pbxFile').pbxFile,
     proj = new pbx('.');
 
 function cleanHash() {
@@ -94,8 +94,8 @@ exports.removeHeaderFile = {
         test.equal(fileRefEntry.isa, 'PBXFileReference');
         test.equal(fileRefEntry.fileEncoding, 4);
         test.equal(fileRefEntry.lastKnownFileType, 'sourcecode.c.h');
-        test.equal(fileRefEntry.name, '"file.h"');
-        test.equal(fileRefEntry.path, '"file.h"');
+        test.equal(fileRefEntry.name, 'file.h');
+        test.equal(fileRefEntry.path, 'file.h');
         test.equal(fileRefEntry.sourceTree, '"<group>"');
 
         var deletedFile = proj.removeHeaderFile('Plugins/file.h'),
diff --git a/test/removeResourceFile.js b/test/removeResourceFile.js
diff --git a/test/removeSourceFile.js b/test/removeSourceFile.js
diff --git a/test/xcode5searchPaths.js b/test/xcode5searchPaths.js
