added test case for PR import scenario

Author: bestander

test/commands/install.js

@@ -337,7 +337,7 @@ test("upgrade scenario", () => {
   }, clean);
 });
 
-test.only("upgrade scenario 2 (with sub dependencies)", async () => {
+test("upgrade scenario 2 (with sub dependencies)", async () => {
   // mime-types@2.0.0 is saved in local mirror and gets updated to mime-types@2.1.11
   // files in mirror, fbkpm.lock, package.json and node_modules should reflect that
 
@@ -591,7 +591,6 @@ test("uninstall should remove subdependencies", () => {
     await uninstall(config, reporter, {}, ["dep-a"]);
 
     assert(!await fs.exists(path.join(config.cwd, "node_modules/dep-a")));
-    // TODO dep-b did not get removed
     assert(!await fs.exists(path.join(config.cwd, "node_modules/dep-b")));
     assert(await fs.exists(path.join(config.cwd, "node_modules/dep-c")));
 
@@ -618,4 +617,36 @@ test("uninstall should remove subdependencies", () => {
   });
 });
 
+test("install --save should add missing deps to fbkpm and mirror (PR import scenario)", async () => {
+  let mirrorPath = "mirror-for-offline";
+  let fixture = "install-init-mirror";
+  let cwd = path.join(fixturesLoc, fixture);
+  await fs.copy(path.join(cwd, "fbkpm.lock.before"), path.join(cwd, "fbkpm.lock"));
+
+  return run({save: true}, [], fixture, async (config, reporter) => {
+    assert.equal(JSON.parse(await fs.readFile(path.join(config.cwd,
+      "node_modules/mime-types/package.json"))).version, "2.0.0");
+    assert(semver.satisfies(JSON.parse(await fs.readFile(path.join(config.cwd,
+      "node_modules/mime-db/package.json"))).version, "~1.0.1"));
+    assert.equal(JSON.parse(await fs.readFile(path.join(config.cwd,
+      "node_modules/fake-fbkpm-dependency/package.json"))).version, "1.0.1");
+
+    let mirror = await fs.walk(path.join(config.cwd, mirrorPath));
+    assert.equal(mirror.length, 3);
+    assert.equal(mirror[0].relative, "fake-fbkpm-dependency-1.0.1.tgz");
+    assert.equal(mirror[1].relative.indexOf("mime-db-1.0."), 0);
+    assert.equal(mirror[2].relative, "mime-types-2.0.0.tgz");
+
+    let lockFileContent = await fs.readFile(path.join(config.cwd, "fbkpm.lock"));
+    let lockFileLines = lockFileContent.split("\n").filter((line) => !!line);
+    assert.equal(lockFileLines.length, 14);
+    assert.equal(lockFileLines[4].indexOf("mime-db@"), 0);
+    assert.equal(lockFileLines[8].indexOf("mime-types@2.0.0"), 0);
+
+    await fs.unlink(path.join(mirror[1].absolute));
+    await fs.unlink(path.join(mirror[2].absolute));
+    await fs.unlink(path.join(config.cwd, "fbkpm.lock"));
+
+  });
+});
 

test/fixtures/install/install-init-mirror/.npmrc

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

test/fixtures/install/install-init-mirror/fbkpm.lock.before

@@ -0,0 +1,4 @@
+fake-fbkpm-dependency@1.0.1:
+  name fake-fbkpm-dependency
+  version "1.0.1"
+  resolved fake-fbkpm-dependency-1.0.1.tgz#ef965c2c237a58e3d4c3f09569d303a1dc9c0d72

test/fixtures/install/install-init-mirror/mirror-for-offline/fake-fbkpm-dependency-1.0.1.tgz

@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "fake-fbkpm-dependency": "1.0.1",
+    "mime-types": "2.0.0"
+  }
+}