Skip to content

Commit

Permalink
test(helpers): Make serialize-tempdir placeholder consistent with nor…
Browse files Browse the repository at this point in the history 
…malize-test-root
  • Loading branch information
@evocateur
evocateur committed Sep 11, 2018
1 parent 00842d6 commit ed16536
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 49 deletions.
14 changes: 7 additions & 7 deletions commands/changed/__tests__/changed-command.test.js
View file
Expand Up @@ -156,11 +156,11 @@ package-4
await lernaChanged(testDir)("-alp");

expect(output.logged()).toMatchInlineSnapshot(`
<PROJECT_ROOT>/packages/package-1:package-1:1.0.0
<PROJECT_ROOT>/packages/package-2:package-2:1.0.0
<PROJECT_ROOT>/packages/package-3:package-3:1.0.0
<PROJECT_ROOT>/packages/package-4:package-4:1.0.0
<PROJECT_ROOT>/packages/package-5:package-5:1.0.0:PRIVATE
__TEST_ROOTDIR__/packages/package-1:package-1:1.0.0
__TEST_ROOTDIR__/packages/package-2:package-2:1.0.0
__TEST_ROOTDIR__/packages/package-3:package-3:1.0.0
__TEST_ROOTDIR__/packages/package-4:package-4:1.0.0
__TEST_ROOTDIR__/packages/package-5:package-5:1.0.0:PRIVATE
`);
});
});
Expand Down Expand Up @@ -258,13 +258,13 @@ package-4
expect(jsonOutput).toMatchInlineSnapshot(`
Array [
Object {
"location": "<PROJECT_ROOT>/packages/package-2",
"location": "__TEST_ROOTDIR__/packages/package-2",
"name": "package-2",
"private": false,
"version": "1.0.0",
},
Object {
"location": "<PROJECT_ROOT>/packages/package-3",
"location": "__TEST_ROOTDIR__/packages/package-3",
"name": "package-3",
"private": false,
"version": "1.0.0",
Expand Down
38 changes: 19 additions & 19 deletions commands/list/__tests__/list-command.test.js
View file
Expand Up @@ -77,42 +77,42 @@ package-5 v1.0.0 packages/package-5 (PRIVATE)
it("lists public package locations with --parseable", async () => {
await lernaLs(testDir)("--parseable");
expect(output.logged()).toMatchInlineSnapshot(`
<PROJECT_ROOT>/packages/package-1
<PROJECT_ROOT>/packages/package-2
<PROJECT_ROOT>/packages/package-3
<PROJECT_ROOT>/packages/package-4
__TEST_ROOTDIR__/packages/package-1
__TEST_ROOTDIR__/packages/package-2
__TEST_ROOTDIR__/packages/package-3
__TEST_ROOTDIR__/packages/package-4
`);
});

it("lists all package locations with --parseable --all", async () => {
await lernaLs(testDir)("-pa");
expect(output.logged()).toMatchInlineSnapshot(`
<PROJECT_ROOT>/packages/package-1
<PROJECT_ROOT>/packages/package-2
<PROJECT_ROOT>/packages/package-3
<PROJECT_ROOT>/packages/package-4
<PROJECT_ROOT>/packages/package-5
__TEST_ROOTDIR__/packages/package-1
__TEST_ROOTDIR__/packages/package-2
__TEST_ROOTDIR__/packages/package-3
__TEST_ROOTDIR__/packages/package-4
__TEST_ROOTDIR__/packages/package-5
`);
});

it("lists public package locations with --parseable --long", async () => {
await lernaLs(testDir)("--parseable", "--long");
expect(output.logged()).toMatchInlineSnapshot(`
<PROJECT_ROOT>/packages/package-1:package-1:1.0.0
<PROJECT_ROOT>/packages/package-2:package-2:1.0.0
<PROJECT_ROOT>/packages/package-3:package-3:1.0.0
<PROJECT_ROOT>/packages/package-4:package-4:1.0.0
__TEST_ROOTDIR__/packages/package-1:package-1:1.0.0
__TEST_ROOTDIR__/packages/package-2:package-2:1.0.0
__TEST_ROOTDIR__/packages/package-3:package-3:1.0.0
__TEST_ROOTDIR__/packages/package-4:package-4:1.0.0
`);
});

it("lists all package locations with --parseable --long --all", async () => {
await lernaLs(testDir)("-pal");
expect(output.logged()).toMatchInlineSnapshot(`
<PROJECT_ROOT>/packages/package-1:package-1:1.0.0
<PROJECT_ROOT>/packages/package-2:package-2:1.0.0
<PROJECT_ROOT>/packages/package-3:package-3:1.0.0
<PROJECT_ROOT>/packages/package-4:package-4:1.0.0
<PROJECT_ROOT>/packages/package-5:package-5:1.0.0:PRIVATE
__TEST_ROOTDIR__/packages/package-1:package-1:1.0.0
__TEST_ROOTDIR__/packages/package-2:package-2:1.0.0
__TEST_ROOTDIR__/packages/package-3:package-3:1.0.0
__TEST_ROOTDIR__/packages/package-4:package-4:1.0.0
__TEST_ROOTDIR__/packages/package-5:package-5:1.0.0:PRIVATE
`);
});

Expand Down Expand Up @@ -176,7 +176,7 @@ package-2
it("appends MISSING flag to long parseable output", async () => {
const testDir = await initFixture("undefined-version");
await lernaLs(testDir)("--long", "--parseable");
expect(output.logged()).toMatchInlineSnapshot(`<PROJECT_ROOT>/packages/package-1:package-1:MISSING`);
expect(output.logged()).toMatchInlineSnapshot(`__TEST_ROOTDIR__/packages/package-1:package-1:MISSING`);
});
});

Expand Down
2 changes: 1 addition & 1 deletion helpers/serialize-tempdir/index.js
View file
Expand Up @@ -21,5 +21,5 @@ module.exports = {
};

function serializeProjectRoot(match, cwd, subPath) {
return normalizePath(path.join("<PROJECT_ROOT>", subPath));
return normalizePath(path.join("__TEST_ROOTDIR__", subPath));
}
14 changes: 7 additions & 7 deletions integration/lerna-ls.test.js
View file
Expand Up @@ -56,19 +56,19 @@ package-3 MISSING packages/pkg-3
test("lerna ls --parseable", async () => {
const { stdout } = await lerna("ls", "--parseable");
expect(stdout).toMatchInlineSnapshot(`
<PROJECT_ROOT>/packages/pkg-1
<PROJECT_ROOT>/packages/pkg-2
<PROJECT_ROOT>/packages/pkg-3
__TEST_ROOTDIR__/packages/pkg-1
__TEST_ROOTDIR__/packages/pkg-2
__TEST_ROOTDIR__/packages/pkg-3
`);
});

test("lerna ls --all --long --parseable", async () => {
const { stdout } = await lerna("ls", "-alp");
expect(stdout).toMatchInlineSnapshot(`
<PROJECT_ROOT>/packages/pkg-1:package-1:1.0.0
<PROJECT_ROOT>/packages/pkg-2:@test/package-2:2.0.0
<PROJECT_ROOT>/packages/pkg-3:package-3:MISSING
<PROJECT_ROOT>/packages/pkg-4:package-4:4.0.0:PRIVATE
__TEST_ROOTDIR__/packages/pkg-1:package-1:1.0.0
__TEST_ROOTDIR__/packages/pkg-2:@test/package-2:2.0.0
__TEST_ROOTDIR__/packages/pkg-3:package-3:MISSING
__TEST_ROOTDIR__/packages/pkg-4:package-4:4.0.0:PRIVATE
`);
});

Expand Down
30 changes: 15 additions & 15 deletions utils/listable/__tests__/listable-format.test.js
View file
Expand Up @@ -81,12 +81,12 @@ pkg-3 v3.0.0 pkgs/pkg-3 (PRIVATE)
"name": "pkg-1",
"version": "1.0.0",
"private": false,
"location": "<PROJECT_ROOT>/pkgs/pkg-1"
"location": "__TEST_ROOTDIR__/pkgs/pkg-1"
},
{
"name": "pkg-2",
"private": false,
"location": "<PROJECT_ROOT>/pkgs/pkg-2"
"location": "__TEST_ROOTDIR__/pkgs/pkg-2"
}
]
`);
Expand All @@ -101,18 +101,18 @@ pkg-3 v3.0.0 pkgs/pkg-3 (PRIVATE)
"name": "pkg-1",
"version": "1.0.0",
"private": false,
"location": "<PROJECT_ROOT>/pkgs/pkg-1"
"location": "__TEST_ROOTDIR__/pkgs/pkg-1"
},
{
"name": "pkg-2",
"private": false,
"location": "<PROJECT_ROOT>/pkgs/pkg-2"
"location": "__TEST_ROOTDIR__/pkgs/pkg-2"
},
{
"name": "pkg-3",
"version": "3.0.0",
"private": true,
"location": "<PROJECT_ROOT>/pkgs/pkg-3"
"location": "__TEST_ROOTDIR__/pkgs/pkg-3"
}
]
`);
Expand All @@ -122,37 +122,37 @@ pkg-3 v3.0.0 pkgs/pkg-3 (PRIVATE)
const { text } = formatWithOptions({ parseable: true });

expect(text).toMatchInlineSnapshot(`
<PROJECT_ROOT>/pkgs/pkg-1
<PROJECT_ROOT>/pkgs/pkg-2
__TEST_ROOTDIR__/pkgs/pkg-1
__TEST_ROOTDIR__/pkgs/pkg-2
`);
});

test("all parseable output", () => {
const { text } = formatWithOptions({ parseable: true, all: true });

expect(text).toMatchInlineSnapshot(`
<PROJECT_ROOT>/pkgs/pkg-1
<PROJECT_ROOT>/pkgs/pkg-2
<PROJECT_ROOT>/pkgs/pkg-3
__TEST_ROOTDIR__/pkgs/pkg-1
__TEST_ROOTDIR__/pkgs/pkg-2
__TEST_ROOTDIR__/pkgs/pkg-3
`);
});

test("long parseable output", () => {
const { text } = formatWithOptions({ parseable: true, long: true });

expect(text).toMatchInlineSnapshot(`
<PROJECT_ROOT>/pkgs/pkg-1:pkg-1:1.0.0
<PROJECT_ROOT>/pkgs/pkg-2:pkg-2:MISSING
__TEST_ROOTDIR__/pkgs/pkg-1:pkg-1:1.0.0
__TEST_ROOTDIR__/pkgs/pkg-2:pkg-2:MISSING
`);
});

test("all long parseable output", () => {
const { text } = formatWithOptions({ parseable: true, all: true, long: true });

expect(text).toMatchInlineSnapshot(`
<PROJECT_ROOT>/pkgs/pkg-1:pkg-1:1.0.0
<PROJECT_ROOT>/pkgs/pkg-2:pkg-2:MISSING
<PROJECT_ROOT>/pkgs/pkg-3:pkg-3:3.0.0:PRIVATE
__TEST_ROOTDIR__/pkgs/pkg-1:pkg-1:1.0.0
__TEST_ROOTDIR__/pkgs/pkg-2:pkg-2:MISSING
__TEST_ROOTDIR__/pkgs/pkg-3:pkg-3:3.0.0:PRIVATE
`);
});
});
Expand Down

0 comments on commit ed16536

Please sign in to comment.