Merge pull request mozilla-b2g#30198 from andreastt/bug_1167567

Bug 1167567 - Fix path to Gaia profile in mozilla-profile-builder; r=gaye
daleharvey · May 22, 2015 · d43f7bb · d43f7bb
2 parents e71b0cb + bd8551d
commit d43f7bb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/tests/jsmarionette/runner/mozilla-profile-builder/lib/gaiaprofile.js b/tests/jsmarionette/runner/mozilla-profile-builder/lib/gaiaprofile.js
@@ -25,8 +25,8 @@ function gaiaProfile (basePath, callback) {
 
   var linux = fsPath.join(basePath, 'gaia', 'profile');
   fs.exists(linux, next.bind(null, linux));
-  var osx = fsPath.join(basePath, 'Contents', 'MacOS', 'gaia', 'profile');
-  fs.exists(osx, next.bind(null, osx));
+  var macos = fsPath.join(basePath, 'Contents', 'Resources', 'gaia', 'profile');
+  fs.exists(macos, next.bind(null, macos));
 }
 
 module.exports = gaiaProfile;
diff --git a/...2g-mac/Contents/MacOS/gaia/profile/yey.js → ...ac/Contents/Resources/gaia/profile/yey.js b/...2g-mac/Contents/MacOS/gaia/profile/yey.js → ...ac/Contents/Resources/gaia/profile/yey.js
diff --git a/tests/jsmarionette/runner/mozilla-profile-builder/test/gaiaprofile.js b/tests/jsmarionette/runner/mozilla-profile-builder/test/gaiaprofile.js
@@ -8,7 +8,7 @@ suite('#gaiaProfile', function() {
   test('mac', function(done) {
     subject(mac, function(err, path) {
       if (err) return done(err);
-      assert.equal(path, mac + '/Contents/MacOS/gaia/profile');
+      assert.equal(path, mac + '/Contents/Resources/gaia/profile');
       done();
     });
   });