Merge branch 'bestander-e2e-fbsource-tests'

Author: sebmck

src/cli/commands/uninstall.js

@@ -34,7 +34,7 @@ export async function run(
   let step = 0;
 
   async function runInstall() {
-    let lockfile = new Lockfile(null, false);
+    let lockfile = await Lockfile.fromDirectory(config.cwd, reporter, {});
     let install = new Install("uninstall", flags, [], config, new NoopReporter, lockfile);
     await install.init();
     return install;
@@ -53,7 +53,7 @@ export async function run(
 
   // remove
   for (let name of args) {
-    let loc = path.join("node_modules", name);
+    let loc = path.join(config.cwd, "node_modules", name);
     let range;
     reporter.step(++step, totalSteps, `Removing module ${name}`);
 

src/package-request.js

@@ -262,6 +262,7 @@ export default class PackageRequest {
       // while we're fetching the package we have some idle time to warm the cache with
       // registry responses for known dependencies
       for (let name in info.dependencies) {
+        // TODO not needed for offline installation
         this.warmCacheIfRegistry(`${name}@${info.dependencies[name]}`);
       }
 

test/commands/install.js

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

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

@@ -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.after

@@ -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/fbkpm.lock.before

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