fix(): ensure that the project base directory is passed to setupLiveR…

…eload. fixes #1034
ionic-team · Jun 6, 2016 · f36acef · f36acef
1 parent 53bcbbb
commit f36acef
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
@@ -67,11 +67,11 @@ function run(ionic, argv, rawCliArguments) {
 
   return Q.all(promiseList).then(function() {
     if (isLiveReload) {
-      return cordovaUtils.setupLiveReload(argv);
+      return cordovaUtils.setupLiveReload(argv, appDirectory);
     }
 
     // ensure the content node was set back to its original
-    return ConfigXml.setConfigXml(process.cwd(), {
+    return ConfigXml.setConfigXml(appDirectory, {
       resetContent: true,
       errorWhenNotFound: false
     });

diff --git a/lib/ionic/run.js b/lib/ionic/run.js
@@ -67,11 +67,11 @@ function run(ionic, argv, rawCliArguments) {
 
   return Q.all(promiseList).then(function() {
     if (isLiveReload) {
-      return cordovaUtils.setupLiveReload(argv);
+      return cordovaUtils.setupLiveReload(argv, appDirectory);
     }
 
     // ensure the content node was set back to its original
-    return ConfigXml.setConfigXml(process.cwd(), {
+    return ConfigXml.setConfigXml(appDirectory, {
       resetContent: true,
       errorWhenNotFound: false
     });

diff --git a/spec/tasks/emulate.spec.js b/spec/tasks/emulate.spec.js
@@ -183,7 +183,7 @@ describe('emulate command', function() {
       spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
 
       emulate.run(null, argv, rawCliArguments).then(function() {
-        expect(cordovaUtils.setupLiveReload).toHaveBeenCalledWith(argv);
+        expect(cordovaUtils.setupLiveReload).toHaveBeenCalledWith(argv. appDirectory);
         expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(
           ['emulate', 'android'], true, { blah: 'blah' });
         done();

diff --git a/spec/tasks/run.spec.js b/spec/tasks/run.spec.js
@@ -180,7 +180,7 @@ describe('run command', function() {
       }));
 
       run.run(null, argv, rawCliArguments).then(function() {
-        expect(cordovaUtils.setupLiveReload).toHaveBeenCalledWith(argv);
+        expect(cordovaUtils.setupLiveReload).toHaveBeenCalledWith(argv, appDirectory);
         expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(
           ['run', 'android'], true, { blah: 'blah' });
         done();