Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added 2 more hoisting unit tests #89

Merged
merged 4 commits into from
Jul 4, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ watch:
./node_modules/.bin/gulp watch

test-only:
./node_modules/.bin/nyc --check-coverage --lines 85 --branches 74 --functions 85 ./node_modules/.bin/ava --verbose test/
./node_modules/.bin/nyc --check-coverage --lines 85 --branches 74 --functions 85 ./node_modules/.bin/ava --verbose --concurrency 5 test/
./node_modules/.bin/nyc report --reporter=lcov

lint:
Expand Down
13 changes: 0 additions & 13 deletions src/cli/commands/install.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import type { RegistryNames } from "../../registries/index.js";
import type { Reporter } from "kreporters";
import type Config from "../../config.js";
import type { DependencyRequestPatterns } from "../../types.js";
import Lockfile from "../../lockfile/index.js";
import lockStringify from "../../lockfile/stringify.js";
import PackageInstallScripts from "../../package-install-scripts.js";
Expand All @@ -31,18 +30,6 @@ let invariant = require("invariant");
let emoji = require("node-emoji");
let path = require("path");

type FetchResolveParams = {
totalSteps: number,
patterns: Array<string>,
requests: DependencyRequestPatterns
};

type FetchResolveReturn = {
patterns: Array<string>,
total: number,
step: number
};

type InstallActions = "install" | "update" | "uninstall";

export class Install {
Expand Down
4 changes: 4 additions & 0 deletions src/package-linker.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ export default class PackageLinker {

async copyModules(patterns: Array<string>): Promise<void> {
let flatTree = await this.initCopyModules(patterns);
// sorted tree makes file creation and copying not to interfere with each other
flatTree = flatTree.sort((dep1, dep2) => {
return dep1[0].localeCompare(dep2[0]);
});
let self = this;

//
Expand Down
252 changes: 138 additions & 114 deletions test/commands/install.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
kpm-offline-mirror=./mirror-for-offline
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
dep-b@1.0.0:
name dep-b
version "1.0.0"
resolved dep-b-1.0.0.tgz#3ec41d539ec81cbb0b00f3f77cee143104153783
dependencies:
dep-c "1.0.0"
dep-c@1.0.0:
name dep-c
version "1.0.0"
resolved dep-c-1.0.0.tgz#43df1196c1b62b89ed7169b6b93493d8420763b6
dependencies:
dep-d "1.0.0"
dep-d@1.0.0:
name dep-d
version "1.0.0"
resolved dep-d-1.0.0.tgz#175ce924c6413b1feeb68b976ae769260cfe0d86
dependencies:
dep-e "1.0.0"
dep-d@2.0.0:
name dep-d
version "2.0.0"
resolved dep-d-2.0.0.tgz#ada909b78f52d88a60e9c8583ddc0310ff16da40
dep-e@1.0.0:
name dep-e
version "1.0.0"
resolved dep-e-1.0.0.tgz#8baa9f7eda12e71a95ccfce7e31ace5867617014
dep-e@2.0.0:
name dep-e
version "2.0.0"
resolved dep-e-2.0.0.tgz#c326a657226d79e68a2208f62a3f3f9f657416a9
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"dependencies": {
"dep-b": "1.0.0",
"dep-c": "1.0.0",
"dep-d": "2.0.0",
"dep-e": "2.0.0"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
kpm-offline-mirror=./mirror-for-offline
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
dep-a@1.0.0:
name dep-a
version "1.0.0"
resolved dep-a-1.0.0.tgz#e7f20878f3696af17ef69934c320885ffab98651
dependencies:
dep-c "1.0.0"
dep-b@1.0.0:
name dep-b
version "1.0.0"
resolved dep-b-1.0.0.tgz#3ec41d539ec81cbb0b00f3f77cee143104153783
dependencies:
dep-c "1.0.0"
dep-c@1.0.0:
name dep-c
version "1.0.0"
resolved dep-c-1.0.0.tgz#43df1196c1b62b89ed7169b6b93493d8420763b6
dependencies:
dep-d "1.0.0"
dep-c@2.0.0:
name dep-c
version "2.0.0"
resolved dep-c-2.0.0.tgz#be95e9930b466ac728ba44f63b9888aa5c7a78b8
dep-d@1.0.0:
name dep-d
version "1.0.0"
resolved dep-d-1.0.0.tgz#175ce924c6413b1feeb68b976ae769260cfe0d86
dependencies:
dep-e "1.0.0"
dep-d@2.0.0:
name dep-d
version "2.0.0"
resolved dep-d-2.0.0.tgz#ada909b78f52d88a60e9c8583ddc0310ff16da40
dep-e@1.0.0:
name dep-e
version "1.0.0"
resolved dep-e-1.0.0.tgz#8baa9f7eda12e71a95ccfce7e31ace5867617014
dep-e@2.0.0:
name dep-e
version "2.0.0"
resolved dep-e-2.0.0.tgz#c326a657226d79e68a2208f62a3f3f9f657416a9
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"dependencies": {
"dep-a": "1.0.0",
"dep-b": "1.0.0",
"dep-c": "2.0.0",
"dep-d": "2.0.0",
"dep-e": "2.0.0"
}
}