From bd8551d429126036dc0d9a6df754908e37f67289 Mon Sep 17 00:00:00 2001
From: Andreas Tolfsen <ato@mozilla.com>
Date: Fri, 22 May 2015 13:55:14 +0100
Subject: [PATCH] Bug 1167567 - Fix path to Gaia profile in
 mozilla-profile-builder; r=gaye

---
 .../runner/mozilla-profile-builder/lib/gaiaprofile.js         | 4 ++--
 .../b2g-mac/Contents/{MacOS => Resources}/gaia/profile/yey.js | 0
 .../runner/mozilla-profile-builder/test/gaiaprofile.js        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename tests/jsmarionette/runner/mozilla-profile-builder/test/fixtures/b2g-mac/Contents/{MacOS => Resources}/gaia/profile/yey.js (100%)

diff --git a/tests/jsmarionette/runner/mozilla-profile-builder/lib/gaiaprofile.js b/tests/jsmarionette/runner/mozilla-profile-builder/lib/gaiaprofile.js
index 9a2aac457d61..af2a3e6d2465 100644
--- 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/tests/jsmarionette/runner/mozilla-profile-builder/test/fixtures/b2g-mac/Contents/MacOS/gaia/profile/yey.js b/tests/jsmarionette/runner/mozilla-profile-builder/test/fixtures/b2g-mac/Contents/Resources/gaia/profile/yey.js
similarity index 100%
rename from tests/jsmarionette/runner/mozilla-profile-builder/test/fixtures/b2g-mac/Contents/MacOS/gaia/profile/yey.js
rename to tests/jsmarionette/runner/mozilla-profile-builder/test/fixtures/b2g-mac/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
index 59e29604b9f9..c740d3c838bd 100644
--- 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();
     });
   });