commit 98b22b228bf90bf8911ee5717aed382fecaf020a
author Vladimir Kotikov <kotikov.vladimir@gmail.com> Thu May 05 12:00:07 2016 +0300
committer Vladimir Kotikov <kotikov.vladimir@gmail.com> Thu May 05 13:02:05 2016 +0300
tree 33c8a7114d4c9296c3904edac21c860676c1e161
parent f082343bd3512026effd70fda92abdacbd6595a6

Remove custom frameworks correctly

Update tests to deal with customFrameworks properly
Remove incorrect assertion in removeFrameworks tests

lib/pbxProject.js

diff --git a/lib/pbxProject.js b/lib/pbxProject.js
index da05245..ab515e1 100644
--- a/lib/pbxProject.js
+++ b/lib/pbxProject.js
@@ -304,7 +304,7 @@
     this.removeFromPbxEmbedFrameworksBuildPhase(file); // PBXCopyFilesBuildPhase
 
     if (opt && opt.customFramework) {
-        this.removeFromFrameworkSearchPaths(file.dirname);
+        this.removeFromFrameworkSearchPaths(file);
     }
 
     return file;
@@ -1051,7 +1051,6 @@
                 searchPaths.splice(idx, 1);
             });
         }
-
     }
 }
 

test/removeFramework.js

diff --git a/test/removeFramework.js b/test/removeFramework.js
index 20667f7..ffca3b4 100644
--- a/test/removeFramework.js
+++ b/test/removeFramework.js
@@ -1,4 +1,4 @@
-var fullProject = require('./fixtures/full-project')
+var fullProject = require('./fixtures/full-project'),
     fullProjectStr = JSON.stringify(fullProject),
     pbx = require('../lib/pbxProject'),
     pbxFile = require('../lib/pbxFile'),
@@ -47,22 +47,22 @@
         var newFile = proj.addFramework('libsqlite3.dylib');
 
         test.equal(newFile.constructor, pbxFile);
-        
+
         var deletedFile = proj.removeFramework('libsqlite3.dylib');
 
         test.equal(deletedFile.constructor, pbxFile);
-        
+
         test.done()
     },
     'should set a fileRef on the pbxFile': function (test) {
         var newFile = proj.addFramework('libsqlite3.dylib');
 
         test.ok(newFile.fileRef);
-        
+
         var deletedFile = proj.removeFramework('libsqlite3.dylib');
 
         test.ok(deletedFile.fileRef);
-        
+
         test.done()
     },
     'should remove 2 fields from the PBXFileReference section': function (test) {
@@ -80,7 +80,7 @@
         test.equal(66, frsLength);
         test.ok(!fileRefSection[deletedFile.fileRef]);
         test.ok(!fileRefSection[deletedFile.fileRef + '_comment']);
-        
+
         test.done();
     },
     'should remove 2 fields from the PBXBuildFile section': function (test) {
@@ -93,13 +93,13 @@
         test.ok(buildFileSection[newFile.uuid + '_comment']);
 
         var deletedFile = proj.removeFramework('libsqlite3.dylib');
-        
+
         bfsLength = Object.keys(buildFileSection).length;
 
         test.equal(58, bfsLength);
         test.ok(!buildFileSection[deletedFile.uuid]);
         test.ok(!buildFileSection[deletedFile.uuid + '_comment']);
-        
+
         test.done();
     },
     'should remove from the Frameworks PBXGroup': function (test) {
@@ -108,12 +108,12 @@
             frameworks = proj.pbxGroupByName('Frameworks');
 
         test.equal(frameworks.children.length, newLength);
-        
+
         var deletedFile = proj.removeFramework('libsqlite3.dylib'),
         newLength = newLength - 1;
 
         test.equal(frameworks.children.length, newLength);
-        
+
         test.done();
     },
     'should remove from the PBXFrameworksBuildPhase': function (test) {
@@ -121,34 +121,33 @@
             frameworks = proj.pbxFrameworksBuildPhaseObj();
 
         test.equal(frameworks.files.length, 16);
-        
+
         var deletedFile = proj.removeFramework('libsqlite3.dylib'),
             frameworks = proj.pbxFrameworksBuildPhaseObj();
 
         test.equal(frameworks.files.length, 15);
-        
+
         test.done();
     },
     'should remove custom frameworks': function (test) {
-        var newFile = proj.addFramework('/path/to/Custom.framework'),
+        var newFile = proj.addFramework('/path/to/Custom.framework', { customFramework: true }),
             frameworks = proj.pbxFrameworksBuildPhaseObj();
 
         test.equal(frameworks.files.length, 16);
-        
-        var deletedFile = proj.removeFramework('/path/to/Custom.framework'),
+
+        var deletedFile = proj.removeFramework('/path/to/Custom.framework', { customFramework: true }),
             frameworks = proj.pbxFrameworksBuildPhaseObj();
 
         test.equal(frameworks.files.length, 15);
-        
+
         var frameworkPaths = frameworkSearchPaths(proj);
             expectedPath = '"/path/to"';
 
         for (i = 0; i < frameworkPaths.length; i++) {
             var current = frameworkPaths[i];
-            test.ok(current.indexOf('"$(inherited)"') == -1);
             test.ok(current.indexOf(expectedPath) == -1);
         }
-        
+
         test.done();
     }
 }