Added another branch switch scenario test

Author: bestander

test/commands/install.js

@@ -385,7 +385,7 @@ test("downgrade scenario", () => {
   });
 });
 
-test.only("install have a clean node_modules after lockfile update (branch switch scenario)", async () => {
+test("install have a clean node_modules after lockfile update (branch switch scenario)", async () => {
   // A@1 -> B@1
   // B@2
 
@@ -398,12 +398,13 @@ test.only("install have a clean node_modules after lockfile update (branch switc
   // A@1.2
   // B@1.2
 
-  let cwd = path.join(fixturesLoc, "install-should-cleanup-when-package-json-changed");
+  let fixture = "install-should-cleanup-when-package-json-changed";
+  let cwd = path.join(fixturesLoc, fixture);
 
   await fs.copy(path.join(cwd, "fbkpm.lock.before"), path.join(cwd, "fbkpm.lock"));
   await fs.copy(path.join(cwd, "package.json.before"), path.join(cwd, "package.json"));
 
-  return run({}, [], "install-should-cleanup-when-package-json-changed", async (config) => {
+  return run({}, [], fixture, async (config) => {
     assert.equal(JSON.parse(await fs.readFile(path.join(config.cwd,
       "node_modules/dep-a/package.json"))).version, "1.0.0");
     assert.equal(JSON.parse(await fs.readFile(path.join(config.cwd,
@@ -417,7 +418,7 @@ test.only("install have a clean node_modules after lockfile update (branch switc
     await fs.copy(path.join(cwd, "fbkpm.lock.after"), path.join(cwd, "fbkpm.lock"));
     await fs.copy(path.join(cwd, "package.json.after"), path.join(cwd, "package.json"));
 
-    return run({}, [], "install-should-cleanup-when-package-json-changed", async (config) => {
+    return run({}, [], fixture, async (config) => {
       assert.equal(JSON.parse(await fs.readFile(path.join(config.cwd,
         "node_modules/dep-a/package.json"))).version, "1.2.0");
       assert.equal(JSON.parse(await fs.readFile(path.join(config.cwd,
@@ -429,6 +430,44 @@ test.only("install have a clean node_modules after lockfile update (branch switc
   });
 });
 
+
+test("install have a clean node_modules after lockfile update (branch switch scenario 2)", async () => {
+  // A@1 -> B@1
+
+  // after package.json/lock file update
+
+  // A@1.2
+
+  let fixture = "install-should-cleanup-when-package-json-changed-2";
+  let cwd = path.join(fixturesLoc, fixture);
+
+  await fs.copy(path.join(cwd, "fbkpm.lock.before"), path.join(cwd, "fbkpm.lock"));
+  await fs.copy(path.join(cwd, "package.json.before"), path.join(cwd, "package.json"));
+
+  return run({}, [], fixture, async (config) => {
+    assert.equal(JSON.parse(await fs.readFile(path.join(config.cwd,
+      "node_modules/dep-a/package.json"))).version, "1.0.0");
+    assert.equal(JSON.parse(await fs.readFile(path.join(config.cwd,
+      "node_modules/dep-b/package.json"))).version, "1.0.0");
+
+    await fs.unlink(path.join(config.cwd, "fbkpm.lock"));
+    await fs.unlink(path.join(config.cwd, "package.json"));
+
+    await fs.copy(path.join(cwd, "fbkpm.lock.after"), path.join(cwd, "fbkpm.lock"));
+    await fs.copy(path.join(cwd, "package.json.after"), path.join(cwd, "package.json"));
+
+    return run({}, [], fixture, async (config) => {
+      assert.equal(JSON.parse(await fs.readFile(path.join(config.cwd,
+        "node_modules/dep-a/package.json"))).version, "1.2.0");
+
+      assert(!await fs.exists(path.join(config.cwd, "node_modules/dep-b")));
+
+      await fs.unlink(path.join(config.cwd, "fbkpm.lock"));
+      await fs.unlink(path.join(config.cwd, "package.json"));
+    });
+  });
+});
+
 test("uninstall should remove dependency from package.json, fbkpm.lock and node_modules", () => {
   let mirrorPath = "mirror-for-offline";
 

test/fixtures/install/install-should-cleanup-when-package-json-changed-2/.npmrc

@@ -0,0 +1 @@
+kpm-offline-mirror=./mirror-for-offline

test/fixtures/install/install-should-cleanup-when-package-json-changed-2/fbkpm.lock.after

@@ -0,0 +1,4 @@
+dep-a@^1.2.0:
+  name dep-a
+  version "1.2.0"
+  resolved dep-a-1.2.0.tgz#24fbe8e7aafea09dbfc4837058848a05eec95bf2

test/fixtures/install/install-should-cleanup-when-package-json-changed-2/fbkpm.lock.before

@@ -0,0 +1,10 @@
+dep-a@^1.0.0:
+  name dep-a
+  version "1.0.0"
+  resolved dep-a-1.0.0.tgz#d170a960654001b74bdee4747e71f744ecf0a24f
+  dependencies:
+    dep-b "1.0.0"
+dep-b@1.0.0:
+  name dep-b
+  version "1.0.0"
+  resolved dep-b-1.0.0.tgz#fa3fab4e36d8eb93ac74790748a30547e9cb0f3f

test/fixtures/install/install-should-cleanup-when-package-json-changed-2/mirror-for-offline/dep-a-1.0.0.tgz

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "dep-a": "^1.2.0"
+  }
+}

test/fixtures/install/install-should-cleanup-when-package-json-changed-2/mirror-for-offline/dep-a-1.2.0.tgz

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "dep-a": "^1.0.0"
+  }
+}