From 3960da6e38816e9e5ae3693e0d8e114ee903e163 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@keylocation.sg>
Date: Tue, 24 Oct 2017 13:12:44 +0200
Subject: [PATCH] refactor: use manager subdirectory for grouping (#1040)
---
lib/config/presets.js | 2 +-
lib/{registry/docker.js => manager/docker/registry.js} | 0
lib/{registry/npm.js => manager/npm/registry.js} | 0
lib/workers/package-file/index.js | 2 +-
lib/workers/package/docker.js | 2 +-
lib/workers/package/npm.js | 2 +-
test/config/presets.spec.js | 2 +-
test/{api/docker.spec.js => manager/docker/registry.spec.js} | 4 ++--
.../npm/__snapshots__/registry.spec.js.snap} | 0
test/{api/npm.spec.js => manager/npm/registry.spec.js} | 4 ++--
test/workers/package/docker.spec.js | 4 ++--
test/workers/package/npm.spec.js | 4 ++--
test/workers/repository/apis.spec.js | 4 ++--
13 files changed, 15 insertions(+), 15 deletions(-)
rename lib/{registry/docker.js => manager/docker/registry.js} (100%)
rename lib/{registry/npm.js => manager/npm/registry.js} (100%)
rename test/{api/docker.spec.js => manager/docker/registry.spec.js} (94%)
rename test/{api/__snapshots__/npm.spec.js.snap => manager/npm/__snapshots__/registry.spec.js.snap} (100%)
rename test/{api/npm.spec.js => manager/npm/registry.spec.js} (97%)
diff --git a/lib/config/presets.js b/lib/config/presets.js
index 4a6239d93a..096fedcf66 100644
--- a/lib/config/presets.js
+++ b/lib/config/presets.js
@@ -1,7 +1,7 @@
const configParser = require('./index');
const massage = require('./massage');
const migration = require('./migration');
-const npm = require('../registry/npm');
+const npm = require('../manager/npm/registry');
module.exports = {
resolveConfigPresets,
diff --git a/lib/registry/docker.js b/lib/manager/docker/registry.js
similarity index 100%
rename from lib/registry/docker.js
rename to lib/manager/docker/registry.js
diff --git a/lib/registry/npm.js b/lib/manager/npm/registry.js
similarity index 100%
rename from lib/registry/npm.js
rename to lib/manager/npm/registry.js
diff --git a/lib/workers/package-file/index.js b/lib/workers/package-file/index.js
index 28be475eca..43dfe35c19 100644
--- a/lib/workers/package-file/index.js
+++ b/lib/workers/package-file/index.js
@@ -1,6 +1,6 @@
const configParser = require('../../config');
const depTypeWorker = require('../dep-type');
-const npmApi = require('../../registry/npm');
+const npmApi = require('../../manager/npm/registry');
let logger = require('../../logger');
diff --git a/lib/workers/package/docker.js b/lib/workers/package/docker.js
index b6d7201e5f..5eba21223a 100644
--- a/lib/workers/package/docker.js
+++ b/lib/workers/package/docker.js
@@ -1,5 +1,5 @@
const semver = require('semver');
-const dockerApi = require('../../registry/docker');
+const dockerApi = require('../../manager/docker/registry');
const versions = require('./versions');
const compareVersions = require('compare-versions');
diff --git a/lib/workers/package/npm.js b/lib/workers/package/npm.js
index df5236c510..f25b14588d 100644
--- a/lib/workers/package/npm.js
+++ b/lib/workers/package/npm.js
@@ -1,4 +1,4 @@
-const npmApi = require('../../registry/npm');
+const npmApi = require('../../manager/npm/registry');
const versions = require('./versions');
module.exports = {
diff --git a/test/config/presets.spec.js b/test/config/presets.spec.js
index 87ec4a5685..fe1db18088 100644
--- a/test/config/presets.spec.js
+++ b/test/config/presets.spec.js
@@ -1,4 +1,4 @@
-const npm = require('../../lib/registry/npm');
+const npm = require('../../lib/manager/npm/registry');
const presets = require('../../lib/config/presets');
const logger = require('../_fixtures/logger');
const presetDefaults = require('../_fixtures/npm/renovate-config-default');
diff --git a/test/api/docker.spec.js b/test/manager/docker/registry.spec.js
similarity index 94%
rename from test/api/docker.spec.js
rename to test/manager/docker/registry.spec.js
index f5fa958406..0819730b24 100644
--- a/test/api/docker.spec.js
+++ b/test/manager/docker/registry.spec.js
@@ -1,6 +1,6 @@
-const docker = require('../../lib/registry/docker');
+const docker = require('../../../lib/manager/docker/registry');
const got = require('got');
-const logger = require('../_fixtures/logger');
+const logger = require('../../_fixtures/logger');
jest.mock('got');
diff --git a/test/api/__snapshots__/npm.spec.js.snap b/test/manager/npm/__snapshots__/registry.spec.js.snap
similarity index 100%
rename from test/api/__snapshots__/npm.spec.js.snap
rename to test/manager/npm/__snapshots__/registry.spec.js.snap
diff --git a/test/api/npm.spec.js b/test/manager/npm/registry.spec.js
similarity index 97%
rename from test/api/npm.spec.js
rename to test/manager/npm/registry.spec.js
index 630d29cefa..8a6229e99e 100644
--- a/test/api/npm.spec.js
+++ b/test/manager/npm/registry.spec.js
@@ -1,7 +1,7 @@
-const npm = require('../../lib/registry/npm');
+const npm = require('../../../lib/manager/npm/registry');
const got = require('got');
const registryAuthToken = require('registry-auth-token');
-const logger = require('../_fixtures/logger');
+const logger = require('../../_fixtures/logger');
jest.mock('registry-auth-token');
jest.mock('got');
diff --git a/test/workers/package/docker.spec.js b/test/workers/package/docker.spec.js
index 7225ca24ce..7b2da67ce0 100644
--- a/test/workers/package/docker.spec.js
+++ b/test/workers/package/docker.spec.js
@@ -1,9 +1,9 @@
-const dockerApi = require('../../../lib/registry/docker');
+const dockerApi = require('../../../lib/manager/docker/registry');
const docker = require('../../../lib/workers/package/docker');
const defaultConfig = require('../../../lib/config/defaults').getConfig();
const logger = require('../../_fixtures/logger');
-// jest.mock('../../../lib/registry/docker');
+// jest.mock('../../../lib/manager/docker/registry');
dockerApi.getDigest = jest.fn();
dockerApi.getTags = jest.fn();
diff --git a/test/workers/package/npm.spec.js b/test/workers/package/npm.spec.js
index 81cc1f817c..4ddc95b93c 100644
--- a/test/workers/package/npm.spec.js
+++ b/test/workers/package/npm.spec.js
@@ -1,10 +1,10 @@
-const npmApi = require('../../../lib/registry/npm');
+const npmApi = require('../../../lib/manager/npm/registry');
const versions = require('../../../lib/workers/package/versions');
const npm = require('../../../lib/workers/package/npm');
const defaultConfig = require('../../../lib/config/defaults').getConfig();
const logger = require('../../_fixtures/logger');
-jest.mock('../../../lib/registry/npm');
+jest.mock('../../../lib/manager/npm/registry');
npmApi.getDependency = jest.fn();
describe('lib/workers/package/npm', () => {
diff --git a/test/workers/repository/apis.spec.js b/test/workers/repository/apis.spec.js
index 2d946b5feb..04c837baab 100644
--- a/test/workers/repository/apis.spec.js
+++ b/test/workers/repository/apis.spec.js
@@ -5,13 +5,13 @@ const logger = require('../../_fixtures/logger');
const githubApi = require('../../../lib/platform/github');
const gitlabApi = require('../../../lib/platform/gitlab');
-const npmApi = require('../../../lib/registry/npm');
+const npmApi = require('../../../lib/manager/npm/registry');
const defaultConfig = require('../../../lib/config/defaults').getConfig();
jest.mock('../../../lib/platform/github');
jest.mock('../../../lib/platform/gitlab');
-jest.mock('../../../lib/registry/npm');
+jest.mock('../../../lib/manager/npm/registry');
describe('workers/repository/apis', () => {
describe('getNpmrc', () => {
--
GitLab