Bug 1022767 - Fix relative path building in webapp-optimize

mozilla-b2g · Sep 19, 2014 · b8065b6 · b8065b6
1 parent 5dd229d
commit b8065b6
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 13 deletions.
diff --git a/build/test/unit/mock_utils.js b/build/test/unit/mock_utils.js
@@ -99,5 +99,9 @@ exports.scriptLoader = {
 };
 
 exports.dirname = function(path) {
-  return path.substr(0, path.lastIndexOf('.'));
+  return path.substr(0, path.lastIndexOf('/'));
+};
+
+exports.basename = function(path) {
+  return path.substr(path.lastIndexOf('/')+1);
 };
diff --git a/build/test/unit/webapp-optimize.test.js b/build/test/unit/webapp-optimize.test.js
@@ -61,6 +61,9 @@ suite('webapp-optimize.js', function() {
         clone: function() {
           return getFile(filePath);
         },
+        get parent() {
+          return getFile(filePath.substr(0, filePath.lastIndexOf('/')));
+        },
         append: function(subPath) {
           filePath += '/' + subPath;
         },
@@ -353,7 +356,6 @@ suite('webapp-optimize.js', function() {
     var writeAggregatedConfig;
     setup(function() {
       var htmlFile = mockUtils.getFile('test-index.html');
-      htmlFile.parent = mockUtils.getFile('test-parent-index.html');
       htmlOptimizer = new app.HTMLOptimizer({
         htmlFile: htmlFile,
         webapp: {
@@ -525,9 +527,10 @@ suite('webapp-optimize.js', function() {
 
     test('getFileByRelativePath', function() {
       isSubjectToBranding = true;
-      var path = '/test';
+      var path = '/test/foo.html';
       var result = htmlOptimizer.getFileByRelativePath(path);
-      assert.equal(result.file.getCurrentPath(), 'build_stage/test/official');
+      assert.equal(result.file.getCurrentPath(),
+                   'build_stage/test/official/foo.html');
     });
   });
 });
diff --git a/build/test/unit/webapp-shared.test.js b/build/test/unit/webapp-shared.test.js
@@ -158,9 +158,10 @@ suite('webapp-shared.js', function() {
       assert.equal(webappShared.used.unstable_styles[0], unstable_styles,
         'push unstable_styles');
 
-      var locales = 'testlocales';
-      webappShared.pushFileByType('locales', locales + '.obj');
-      assert.equal(webappShared.used.locales[0], locales,
+      var localeName = 'date';
+      webappShared.pushFileByType('locales',
+        localeName + '/date.{locale}.properties');
+      assert.equal(webappShared.used.locales[0], localeName,
         'push locales');
     });
 

diff --git a/build/webapp-optimize.js b/build/webapp-optimize.js
@@ -548,14 +548,22 @@ HTMLOptimizer.prototype.getFileByRelativePath = function(relativePath) {
       return;
     }
     file.append(name);
-    if (utils.isSubjectToBranding(file.path)) {
-      file.append((this.config.OFFICIAL === '1') ? 'official' : 'unofficial');
-    }
-    if (utils.isSubjectToDeviceType(file.path)) {
-      file.append(this.config.GAIA_DEVICE_TYPE);
-    }
   }, this);
 
+  var dirName = utils.dirname(relativePath);
+  var fileName = utils.basename(relativePath);
+
+  if (utils.isSubjectToBranding(dirName)) {
+    file = file.parent;
+    file.append((this.config.OFFICIAL === '1') ? 'official' : 'unofficial');
+    file.append(fileName);
+  }
+  if (utils.isSubjectToDeviceType(file.path)) {
+    file = file.parent;
+    file.append(this.config.GAIA_DEVICE_TYPE);
+    file.append(fileName);
+  }
+
   try {
     return {
       file: file,