From f4d20fedeeab6bd4abb63d4965256b51869e275d Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 9 Mar 2020 17:52:15 +0100 Subject: [PATCH] test tweaks --- .../updates-commits.json | 0 .../updates-tags.json | 0 .../@babel%2fpreset-env.json | 0 .../gulp-sourcemaps.json | 0 .../html-webpack-plugin.json | 0 .../jpeg-buffer-orientation.json | 0 fixtures/{registry-responses => npm}/noty.json | 0 .../{registry-responses => npm}/prismjs.json | 0 .../styled-components.json | 0 .../{registry-responses => npm}/svgstore.json | 0 .../{registry-responses => npm}/updates.json | 0 test.js | 16 ++++++++-------- 12 files changed, 8 insertions(+), 8 deletions(-) rename fixtures/{github-responses => github}/updates-commits.json (100%) rename fixtures/{github-responses => github}/updates-tags.json (100%) rename fixtures/{registry-responses => npm}/@babel%2fpreset-env.json (100%) rename fixtures/{registry-responses => npm}/gulp-sourcemaps.json (100%) rename fixtures/{registry-responses => npm}/html-webpack-plugin.json (100%) rename fixtures/{registry-responses => npm}/jpeg-buffer-orientation.json (100%) rename fixtures/{registry-responses => npm}/noty.json (100%) rename fixtures/{registry-responses => npm}/prismjs.json (100%) rename fixtures/{registry-responses => npm}/styled-components.json (100%) rename fixtures/{registry-responses => npm}/svgstore.json (100%) rename fixtures/{registry-responses => npm}/updates.json (100%) diff --git a/fixtures/github-responses/updates-commits.json b/fixtures/github/updates-commits.json similarity index 100% rename from fixtures/github-responses/updates-commits.json rename to fixtures/github/updates-commits.json diff --git a/fixtures/github-responses/updates-tags.json b/fixtures/github/updates-tags.json similarity index 100% rename from fixtures/github-responses/updates-tags.json rename to fixtures/github/updates-tags.json diff --git a/fixtures/registry-responses/@babel%2fpreset-env.json b/fixtures/npm/@babel%2fpreset-env.json similarity index 100% rename from fixtures/registry-responses/@babel%2fpreset-env.json rename to fixtures/npm/@babel%2fpreset-env.json diff --git a/fixtures/registry-responses/gulp-sourcemaps.json b/fixtures/npm/gulp-sourcemaps.json similarity index 100% rename from fixtures/registry-responses/gulp-sourcemaps.json rename to fixtures/npm/gulp-sourcemaps.json diff --git a/fixtures/registry-responses/html-webpack-plugin.json b/fixtures/npm/html-webpack-plugin.json similarity index 100% rename from fixtures/registry-responses/html-webpack-plugin.json rename to fixtures/npm/html-webpack-plugin.json diff --git a/fixtures/registry-responses/jpeg-buffer-orientation.json b/fixtures/npm/jpeg-buffer-orientation.json similarity index 100% rename from fixtures/registry-responses/jpeg-buffer-orientation.json rename to fixtures/npm/jpeg-buffer-orientation.json diff --git a/fixtures/registry-responses/noty.json b/fixtures/npm/noty.json similarity index 100% rename from fixtures/registry-responses/noty.json rename to fixtures/npm/noty.json diff --git a/fixtures/registry-responses/prismjs.json b/fixtures/npm/prismjs.json similarity index 100% rename from fixtures/registry-responses/prismjs.json rename to fixtures/npm/prismjs.json diff --git a/fixtures/registry-responses/styled-components.json b/fixtures/npm/styled-components.json similarity index 100% rename from fixtures/registry-responses/styled-components.json rename to fixtures/npm/styled-components.json diff --git a/fixtures/registry-responses/svgstore.json b/fixtures/npm/svgstore.json similarity index 100% rename from fixtures/registry-responses/svgstore.json rename to fixtures/npm/svgstore.json diff --git a/fixtures/registry-responses/updates.json b/fixtures/npm/updates.json similarity index 100% rename from fixtures/registry-responses/updates.json rename to fixtures/npm/updates.json diff --git a/test.js b/test.js index 3f6ecd7..32bf9b0 100644 --- a/test.js +++ b/test.js @@ -10,7 +10,7 @@ const {writeFile, readFile} = require("fs").promises; const packageJson = require("./fixtures/test.json"); const testDir = tempy.directory(); -let registryServer, githubServer, githubApiUrl; +let npmServer, githubServer, githubApiUrl; const dependencyTypes = [ "dependencies", @@ -27,29 +27,29 @@ for (const dependencyType of dependencyTypes) { } beforeAll(async () => { - registryServer = await createTestServer(); // registry response + npmServer = await createTestServer(); // npm api response githubServer = await createTestServer(); // github api response for (const packageName of testPackages) { const name = packageName.replace(/\//g, "%2f"); - const path = join(__dirname, `fixtures/registry-responses/${name}.json`); - registryServer.get(`/${name}`, await readFile(path)); + const path = join(__dirname, `fixtures/npm/${name}.json`); + npmServer.get(`/${name}`, await readFile(path)); } - const commits = await readFile(join(__dirname, "fixtures/github-responses/updates-commits.json")); - const tags = await readFile(join(__dirname, "fixtures/github-responses/updates-tags.json")); + const commits = await readFile(join(__dirname, "fixtures/github/updates-commits.json")); + const tags = await readFile(join(__dirname, "fixtures/github/updates-tags.json")); githubServer.get("/repos/silverwind/updates/commits", commits); githubServer.get("/repos/silverwind/updates/git/refs/tags", tags); githubApiUrl = githubServer.sslUrl; - await writeFile(join(testDir, ".npmrc"), `registry=${registryServer.sslUrl}`); // Fake registry + await writeFile(join(testDir, ".npmrc"), `registry=${npmServer.sslUrl}`); // Fake registry await writeFile(join(testDir, "package.json"), JSON.stringify(packageJson, null, 2)); // Copy fixture }); afterAll(async () => { await Promise.all([ del(testDir, {force: true}), - registryServer && registryServer.close(), + npmServer && npmServer.close(), githubServer && githubServer.close(), ]); });