Restore backup files after each scenario

ember-cli · Mar 1, 2020 · f1ab3e3 · f1ab3e3
1 parent bff5859
commit f1ab3e3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/lib/dependency-manager-adapters/npm.js b/lib/dependency-manager-adapters/npm.js
@@ -57,7 +57,7 @@ module.exports = CoreObject.extend({
   cleanup() {
     let adapter = this;
 
-    return this._restoreOriginalDependencies().then(() => {
+    return this.restoreOriginalDependencies().then(() => {
       debug('Remove backup package.json and node_modules');
 
       let cleanupTasks = [rimraf(path.join(adapter.cwd, adapter.packageJSONBackupFileName)),
@@ -186,7 +186,7 @@ module.exports = CoreObject.extend({
       }
     });
   },
-  _restoreOriginalDependencies() {
+  restoreOriginalDependencies() {
     let copy = RSVP.denodeify(fs.copy);
 
     debug('Restoring original package.json and node_modules');

diff --git a/lib/tasks/try-each.js b/lib/tasks/try-each.js
@@ -75,7 +75,7 @@ module.exports = CoreObject.extend({
 
           runResults.result = result;
           task._writeFooter(`Result: ${result}`);
-          return RSVP.resolve(runResults);
+          return task.ScenarioManager.restoreOriginalDependencies().then(() => runResults);
         });
       });
   },

diff --git a/lib/utils/scenario-manager.js b/lib/utils/scenario-manager.js
@@ -40,5 +40,17 @@ module.exports = CoreObject.extend({
       return depManager.cleanup();
     });
   },
+
+  /* Restore the original dependencies. Will only work with npm adapter
+   * as it has a restoreOriginalDependencies function.
+   */
+  restoreOriginalDependencies() {
+    return mapSeries(this.dependencyManagerAdapters, (depManager) => {
+      if (typeof depManager.restoreOriginalDependencies === 'function') {
+        return depManager.restoreOriginalDependencies();
+      }
+      return RSVP.resolve([]);
+    });
+  },
 });
 
diff --git a/test/dependency-manager-adapters/npm-adapter-test.js b/test/dependency-manager-adapters/npm-adapter-test.js
@@ -268,13 +268,13 @@ describe('npmAdapter', () => {
     });
   });
 
-  describe('#_restoreOriginalDependencies', () => {
+  describe('#restoreOriginalDependencies', () => {
     it('replaces the package.json with the backed up version', () => {
       writeJSONFile('package.json.ember-try', { originalPackageJSON: true });
       writeJSONFile('package.json', { originalPackageJSON: false });
       fs.mkdirSync('.node_modules.ember-try');
       writeJSONFile('.node_modules.ember-try/prove-it.json', { originalNodeModules: true });
-      return new NpmAdapter({ cwd: tmpdir })._restoreOriginalDependencies().then(() => {
+      return new NpmAdapter({ cwd: tmpdir }).restoreOriginalDependencies().then(() => {
         assertFileContainsJSON(path.join(tmpdir, 'package.json'), { originalPackageJSON: true });
         assertFileContainsJSON(path.join(tmpdir, 'node_modules/prove-it.json'), { originalNodeModules: true });
       });
@@ -291,7 +291,7 @@ describe('npmAdapter', () => {
       writeJSONFile('npm-shrinkwrap.json', { originalNpmShrinkWrap: false });
       writeJSONFile('package-lock.json.ember-try', { originalPackageLock: true });
       writeJSONFile('package-lock.json', { originalPackageLock: false });
-      return new NpmAdapter({ cwd: tmpdir })._restoreOriginalDependencies().then(() => {
+      return new NpmAdapter({ cwd: tmpdir }).restoreOriginalDependencies().then(() => {
         assertFileContainsJSON(path.join(tmpdir, 'package.json'), { originalPackageJSON: true });
         assertFileContainsJSON(path.join(tmpdir, 'node_modules/prove-it.json'), { originalNodeModules: true });
         assertFileContainsJSON(path.join(tmpdir, 'yarn.lock'), { originalYarnLock: true });