Skip to content

Commit

Permalink
Prettier on TilesetMergerSpec
Browse files Browse the repository at this point in the history
  • Loading branch information
jo-chemla committed Jul 5, 2024
1 parent 8e5829b commit 573afc4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"test": "npx ts-node node_modules/jasmine/bin/jasmine.js --config=specs/jasmine.json",
"coverage": "npx c8 --clean npm run test",
"prettier-check": "prettier --check \"**/*\"",
"prettier": "prettier --write \"**/*\"",
"prettier": "prettier --end-of-line lf --write \"**/*\"",
"generate-third-party": "node generateThirdParty.js",
"docs-prepare-directory": "mkdirp etc",
"docs-extract-api": "api-extractor run --config api-extractor.jsonc --local --verbose",
Expand All @@ -105,4 +105,4 @@
"package-prepare": "npm run eslint && npm run prettier-check && npm run build && npm run test && npm run coverage && npm run docs-generate && npm run generate-third-party",
"package": "npm run package-clean && npm run package-prepare && npm pack"
}
}
}
16 changes: 3 additions & 13 deletions specs/tools/tilesetProcessing/TilesetMergerSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@ describe("TilesetMerger", function () {
});

it("merges tilesets into a single tileset", async function () {
await TilesetOperations.merge(
basicInputs,
basicOutput,
overwrite
);
await TilesetOperations.merge(basicInputs, basicOutput, overwrite);

// Ensure that the output directory contains the expected files:
// All files of the input, disambiguated for the same base name
Expand Down Expand Up @@ -73,19 +69,13 @@ describe("TilesetMerger", function () {
});

it("merges tilesets into a single tileset for mergeJson", async function () {
await TilesetOperations.mergeJson(
basicInputs,
basicOutput,
overwrite
);
await TilesetOperations.mergeJson(basicInputs, basicOutput, overwrite);

// Ensure that the output directory contains the expected files:
const actualRelativeFiles =
SpecHelpers.collectRelativeFileNames(basicOutput);
actualRelativeFiles.sort();
const expectedRelativeFiles = [
"tileset.json",
];
const expectedRelativeFiles = ["tileset.json"];
expect(actualRelativeFiles).toEqual(expectedRelativeFiles);

// Ensure that the single 'tileset.json' contains the
Expand Down

0 comments on commit 573afc4

Please sign in to comment.