diff --git a/test/datasource/__snapshots__/index.spec.ts.snap b/lib/datasource/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/index.spec.ts.snap rename to lib/datasource/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/__snapshots__/metadata.spec.ts.snap b/lib/datasource/__snapshots__/metadata.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/metadata.spec.ts.snap rename to lib/datasource/__snapshots__/metadata.spec.ts.snap diff --git a/test/datasource/cargo/_fixtures/amethyst b/lib/datasource/cargo/__fixtures__/amethyst similarity index 100% rename from test/datasource/cargo/_fixtures/amethyst rename to lib/datasource/cargo/__fixtures__/amethyst diff --git a/test/datasource/cargo/_fixtures/invalid_crate_data b/lib/datasource/cargo/__fixtures__/invalid_crate_data similarity index 100% rename from test/datasource/cargo/_fixtures/invalid_crate_data rename to lib/datasource/cargo/__fixtures__/invalid_crate_data diff --git a/test/datasource/cargo/_fixtures/libc b/lib/datasource/cargo/__fixtures__/libc similarity index 100% rename from test/datasource/cargo/_fixtures/libc rename to lib/datasource/cargo/__fixtures__/libc diff --git a/test/datasource/__snapshots__/cargo.spec.ts.snap b/lib/datasource/cargo/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/cargo.spec.ts.snap rename to lib/datasource/cargo/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/cargo.spec.ts b/lib/datasource/cargo/index.spec.ts similarity index 90% rename from test/datasource/cargo.spec.ts rename to lib/datasource/cargo/index.spec.ts index 4c8d93b0e3339ac9263d52b52b46beb08fc0228d..07deb2c4aaa79e6ee73060a8d61d38b3088336b4 100644 --- a/test/datasource/cargo.spec.ts +++ b/lib/datasource/cargo/index.spec.ts @@ -1,21 +1,21 @@ import fs from 'fs'; -import _got from '../../lib/util/got'; -import { getPkgReleases } from '../../lib/datasource/cargo'; +import _got from '../../util/got'; +import { getPkgReleases } from '.'; const got: any = _got; -const res1 = fs.readFileSync('test/datasource/cargo/_fixtures/libc', 'utf8'); +const res1 = fs.readFileSync('lib/datasource/cargo/__fixtures__/libc', 'utf8'); const res2 = fs.readFileSync( - 'test/datasource/cargo/_fixtures/amethyst', + 'lib/datasource/cargo/__fixtures__/amethyst', 'utf8' ); const res3 = fs.readFileSync( - 'test/datasource/cargo/_fixtures/invalid_crate_data', + 'lib/datasource/cargo/__fixtures__/invalid_crate_data', 'utf8' ); -jest.mock('../../lib/util/got'); +jest.mock('../../util/got'); describe('datasource/cargo', () => { describe('getPkgReleases', () => { diff --git a/test/datasource/cdnjs/_fixtures/bulma.json b/lib/datasource/cdnjs/__fixtures__/bulma.json similarity index 100% rename from test/datasource/cdnjs/_fixtures/bulma.json rename to lib/datasource/cdnjs/__fixtures__/bulma.json diff --git a/test/datasource/cdnjs/_fixtures/d3-force.json b/lib/datasource/cdnjs/__fixtures__/d3-force.json similarity index 100% rename from test/datasource/cdnjs/_fixtures/d3-force.json rename to lib/datasource/cdnjs/__fixtures__/d3-force.json diff --git a/test/datasource/__snapshots__/cdnjs.spec.ts.snap b/lib/datasource/cdnjs/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/cdnjs.spec.ts.snap rename to lib/datasource/cdnjs/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/cdnjs.spec.ts b/lib/datasource/cdnjs/index.spec.ts similarity index 88% rename from test/datasource/cdnjs.spec.ts rename to lib/datasource/cdnjs/index.spec.ts index f6c9d4262ca8aa995d53cfc1eaf24167fbc31a4d..d7c4229a52162071562966f57f726346b560ed74 100644 --- a/test/datasource/cdnjs.spec.ts +++ b/lib/datasource/cdnjs/index.spec.ts @@ -1,19 +1,19 @@ import fs from 'fs'; -import _got from '../../lib/util/got'; -import { getPkgReleases } from '../../lib/datasource/cdnjs'; -import { DATASOURCE_FAILURE } from '../../lib/constants/error-messages'; +import _got from '../../util/got'; +import { getPkgReleases } from '.'; +import { DATASOURCE_FAILURE } from '../../constants/error-messages'; const got: jest.Mock<any> = _got as any; -jest.mock('../../lib/util/got'); +jest.mock('../../util/got'); let res1 = fs.readFileSync( - 'test/datasource/cdnjs/_fixtures/d3-force.json', + 'lib/datasource/cdnjs/__fixtures__/d3-force.json', 'utf8' ); res1 = JSON.parse(res1); let res2 = fs.readFileSync( - 'test/datasource/cdnjs/_fixtures/bulma.json', + 'lib/datasource/cdnjs/__fixtures__/bulma.json', 'utf8' ); res2 = JSON.parse(res2); diff --git a/test/datasource/dart/_fixtures/shared_preferences.json b/lib/datasource/dart/__fixtures__/shared_preferences.json similarity index 100% rename from test/datasource/dart/_fixtures/shared_preferences.json rename to lib/datasource/dart/__fixtures__/shared_preferences.json diff --git a/test/datasource/__snapshots__/dart.spec.ts.snap b/lib/datasource/dart/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/dart.spec.ts.snap rename to lib/datasource/dart/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/dart.spec.ts b/lib/datasource/dart/index.spec.ts similarity index 91% rename from test/datasource/dart.spec.ts rename to lib/datasource/dart/index.spec.ts index c852e3db1c17875e3c52256ecd69cc5172af469c..3e63fdb88d926df9e978e77a17d68c43fffe946e 100644 --- a/test/datasource/dart.spec.ts +++ b/lib/datasource/dart/index.spec.ts @@ -1,17 +1,17 @@ import fs from 'fs'; -import _got from '../../lib/util/got'; -import { getPkgReleases } from '../../lib/datasource/dart'; +import _got from '../../util/got'; +import { getPkgReleases } from '.'; const got: any = _got; const body: any = JSON.parse( fs.readFileSync( - 'test/datasource/dart/_fixtures/shared_preferences.json', + 'lib/datasource/dart/__fixtures__/shared_preferences.json', 'utf8' ) ); -jest.mock('../../lib/util/got'); +jest.mock('../../util/got'); describe('datasource/dart', () => { describe('getPkgReleases', () => { diff --git a/test/datasource/__snapshots__/docker.spec.ts.snap b/lib/datasource/docker/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/docker.spec.ts.snap rename to lib/datasource/docker/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/docker.spec.ts b/lib/datasource/docker/index.spec.ts similarity index 97% rename from test/datasource/docker.spec.ts rename to lib/datasource/docker/index.spec.ts index 1c1f5d490938e18bd89e45a2ea7464d6b44ebda7..0fa01253fb9ca3d45bae4aa84b46ee977577e047 100644 --- a/test/datasource/docker.spec.ts +++ b/lib/datasource/docker/index.spec.ts @@ -1,17 +1,17 @@ import AWSMock from 'aws-sdk-mock'; import AWS from 'aws-sdk'; -import _got from '../../lib/util/got'; -import * as docker from '../../lib/datasource/docker'; -import { getPkgReleases } from '../../lib/datasource'; -import * as _hostRules from '../../lib/util/host-rules'; -import { DATASOURCE_FAILURE } from '../../lib/constants/error-messages'; -import { DATASOURCE_DOCKER } from '../../lib/constants/data-binary-source'; +import _got from '../../util/got'; +import * as docker from '.'; +import { getPkgReleases } from '..'; +import * as _hostRules from '../../util/host-rules'; +import { DATASOURCE_FAILURE } from '../../constants/error-messages'; +import { DATASOURCE_DOCKER } from '../../constants/data-binary-source'; const got: any = _got; const hostRules: any = _hostRules; -jest.mock('../../lib/util/got'); -jest.mock('../../lib/util/host-rules'); +jest.mock('../../util/got'); +jest.mock('../../util/host-rules'); describe('api/docker', () => { describe('getRegistryRepository', () => { diff --git a/test/datasource/git-submodules.spec.ts b/lib/datasource/git-submodules/index.spec.ts similarity index 95% rename from test/datasource/git-submodules.spec.ts rename to lib/datasource/git-submodules/index.spec.ts index 65d070c2d1993f26bd913cc3f6ab9bc77e239039..223e3a6340ee276dec998a9daa30f7d82ded76ea 100644 --- a/test/datasource/git-submodules.spec.ts +++ b/lib/datasource/git-submodules/index.spec.ts @@ -1,5 +1,5 @@ import _simpleGit from 'simple-git/promise'; -import { getPkgReleases, getDigest } from '../../lib/datasource/git-submodules'; +import { getPkgReleases, getDigest } from '.'; jest.mock('simple-git/promise.js'); const simpleGit: any = _simpleGit; diff --git a/test/datasource/git-tags.spec.ts b/lib/datasource/git-tags/index.spec.ts similarity index 95% rename from test/datasource/git-tags.spec.ts rename to lib/datasource/git-tags/index.spec.ts index ef6f0d3b3b71b506900ceaca99aea536558d9d15..ad93a28e55e1ee4a4263e9f2e67ca3509eecafe8 100644 --- a/test/datasource/git-tags.spec.ts +++ b/lib/datasource/git-tags/index.spec.ts @@ -1,5 +1,5 @@ import _simpleGit from 'simple-git/promise'; -import { getPkgReleases } from '../../lib/datasource/git-tags'; +import { getPkgReleases } from '.'; jest.mock('simple-git/promise'); const simpleGit: any = _simpleGit; diff --git a/test/datasource/__snapshots__/github.spec.ts.snap b/lib/datasource/github/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/github.spec.ts.snap rename to lib/datasource/github/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/github.spec.ts b/lib/datasource/github/index.spec.ts similarity index 89% rename from test/datasource/github.spec.ts rename to lib/datasource/github/index.spec.ts index 5e1e5e927c4609f967e034c0ff93c23cf6e6f406..022b8aa923a4afb4133657d797305a214be45070 100644 --- a/test/datasource/github.spec.ts +++ b/lib/datasource/github/index.spec.ts @@ -1,15 +1,15 @@ -import { api } from '../../lib/platform/github/gh-got-wrapper'; +import { api } from '../../platform/github/gh-got-wrapper'; -import * as datasource from '../../lib/datasource'; -import * as github from '../../lib/datasource/github'; -import _got from '../../lib/util/got'; -import * as _hostRules from '../../lib/util/host-rules'; -import { PLATFORM_FAILURE } from '../../lib/constants/error-messages'; -import { DATASOURCE_GITHUB } from '../../lib/constants/data-binary-source'; +import * as datasource from '..'; +import * as github from '.'; +import _got from '../../util/got'; +import * as _hostRules from '../../util/host-rules'; +import { PLATFORM_FAILURE } from '../../constants/error-messages'; +import { DATASOURCE_GITHUB } from '../../constants/data-binary-source'; -jest.mock('../../lib/platform/github/gh-got-wrapper'); -jest.mock('../../lib/util/got'); -jest.mock('../../lib/util/host-rules'); +jest.mock('../../platform/github/gh-got-wrapper'); +jest.mock('../../util/got'); +jest.mock('../../util/host-rules'); const got: any = _got; const ghGot: any = api.get; diff --git a/test/datasource/__snapshots__/gitlab.spec.ts.snap b/lib/datasource/gitlab/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/gitlab.spec.ts.snap rename to lib/datasource/gitlab/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/gitlab.spec.ts b/lib/datasource/gitlab/index.spec.ts similarity index 87% rename from test/datasource/gitlab.spec.ts rename to lib/datasource/gitlab/index.spec.ts index 6da9588f9cc1b6de83d22dace26cdf5f315614ea..a8e134f4a588172bd8c1f6fe2747fbc1ea1bf873 100644 --- a/test/datasource/gitlab.spec.ts +++ b/lib/datasource/gitlab/index.spec.ts @@ -1,10 +1,10 @@ -import * as datasource from '../../lib/datasource'; -import * as gitlab from '../../lib/datasource/gitlab'; -import { api } from '../../lib/platform/gitlab/gl-got-wrapper'; -import { DATASOURCE_GITLAB } from '../../lib/constants/data-binary-source'; +import * as datasource from '..'; +import * as gitlab from '.'; +import { api } from '../../platform/gitlab/gl-got-wrapper'; +import { DATASOURCE_GITLAB } from '../../constants/data-binary-source'; -jest.mock('../../lib/platform/gitlab/gl-got-wrapper'); -jest.mock('../../lib/util/got'); +jest.mock('../../platform/gitlab/gl-got-wrapper'); +jest.mock('../../util/got'); const glGot: any = api.get; diff --git a/test/datasource/__snapshots__/go.spec.ts.snap b/lib/datasource/go/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/go.spec.ts.snap rename to lib/datasource/go/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/go.spec.ts b/lib/datasource/go/index.spec.ts similarity index 84% rename from test/datasource/go.spec.ts rename to lib/datasource/go/index.spec.ts index 2dd6762abf9217df857326a9cfbeee0433199cf8..e98ccd9da779ff56db183ded130cf85ba9037e4b 100644 --- a/test/datasource/go.spec.ts +++ b/lib/datasource/go/index.spec.ts @@ -1,12 +1,14 @@ -import _got from '../../lib/util/got'; -import * as _github from '../../lib/datasource/github'; -import * as go from '../../lib/datasource/go'; +import _got from '../../util/got'; +import * as _github from '../github'; +import * as go from '.'; +import { mocked, partial } from '../../../test/util'; +import { ReleaseResult } from '..'; -jest.mock('../../lib/util/got'); -jest.mock('../../lib/datasource/github'); +jest.mock('../../util/got'); +jest.mock('../github'); -const got: any = _got; -const github: any = _github; +const got: any = mocked(_got); +const github = mocked(_github); const res1 = `<!DOCTYPE html> <html> @@ -30,7 +32,7 @@ describe('datasource/go', () => { got.mockReturnValueOnce({ body: res1, }); - github.getDigest.mockReturnValueOnce('abcdefabcdefabcdefabcdef'); + github.getDigest.mockResolvedValueOnce('abcdefabcdefabcdefabcdef'); const res = await go.getDigest({ lookupName: 'golang.org/y/text' }, null); expect(res).toBeNull(); }); @@ -38,7 +40,7 @@ describe('datasource/go', () => { got.mockReturnValueOnce({ body: res1, }); - github.getDigest.mockReturnValueOnce('abcdefabcdefabcdefabcdef'); + github.getDigest.mockResolvedValueOnce('abcdefabcdefabcdefabcdef'); const res = await go.getDigest({ lookupName: 'golang.org/x/text' }, null); expect(res).toBe('abcdefabcdefabcdefabcdef'); }); @@ -78,7 +80,7 @@ describe('datasource/go', () => { got.mockReturnValueOnce({ body: res1, }); - github.getPkgReleases.mockReturnValueOnce({ + github.getPkgReleases.mockResolvedValueOnce({ releases: [{ version: 'v1.0.0' }, { version: 'v2.0.0' }], }); const res = await go.getPkgReleases({ @@ -117,9 +119,11 @@ describe('datasource/go', () => { { lookupName: 'gopkg.in/x/text' }, { lookupName: 'gopkg.in/x' }, ]; - const githubRes = { releases: [1, 2] }; + const githubRes = { releases: [1, 2] } as any; for (const pkg of packages) { - github.getPkgReleases.mockReturnValueOnce(githubRes); + github.getPkgReleases.mockResolvedValueOnce( + partial<ReleaseResult>(githubRes) + ); expect(await go.getPkgReleases(pkg)).toEqual(githubRes); } expect(got).toHaveBeenCalledTimes(0); diff --git a/test/datasource/gradle-wrapper/_fixtures/all.json b/lib/datasource/gradle-version/__fixtures__/all.json similarity index 100% rename from test/datasource/gradle-wrapper/_fixtures/all.json rename to lib/datasource/gradle-version/__fixtures__/all.json diff --git a/test/datasource/__snapshots__/gradle-version.spec.ts.snap b/lib/datasource/gradle-version/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/gradle-version.spec.ts.snap rename to lib/datasource/gradle-version/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/gradle-version.spec.ts b/lib/datasource/gradle-version/index.spec.ts similarity index 89% rename from test/datasource/gradle-version.spec.ts rename to lib/datasource/gradle-version/index.spec.ts index b1ad8555668200c81a1370d5dea4d8e28ba4f6cf..015c2774b3bb77bdb3296c7beb4c10244e50dfd2 100644 --- a/test/datasource/gradle-version.spec.ts +++ b/lib/datasource/gradle-version/index.spec.ts @@ -1,14 +1,14 @@ import fs from 'fs'; -import _got from '../../lib/util/got'; -import * as datasource from '../../lib/datasource'; -import { DATASOURCE_GRADLE_VERSION } from '../../lib/constants/data-binary-source'; +import _got from '../../util/got'; +import * as datasource from '..'; +import { DATASOURCE_GRADLE_VERSION } from '../../constants/data-binary-source'; -jest.mock('../../lib/util/got'); +jest.mock('../../util/got'); const got: any = _got; const allResponse: any = fs.readFileSync( - 'test/datasource/gradle-wrapper/_fixtures/all.json' + 'lib/datasource/gradle-version/__fixtures__/all.json' ); let config: datasource.PkgReleaseConfig = {}; diff --git a/test/datasource/helm/_fixtures/index.yaml b/lib/datasource/helm/__fixtures__/index.yaml similarity index 100% rename from test/datasource/helm/_fixtures/index.yaml rename to lib/datasource/helm/__fixtures__/index.yaml diff --git a/test/datasource/__snapshots__/helm.spec.ts.snap b/lib/datasource/helm/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/helm.spec.ts.snap rename to lib/datasource/helm/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/helm.spec.ts b/lib/datasource/helm/index.spec.ts similarity index 95% rename from test/datasource/helm.spec.ts rename to lib/datasource/helm/index.spec.ts index 41dcc36836a701727fa0cb208ab05562ede8741a..3fc7b7cfe7142a03d329910ae9c93f44bb5911dd 100644 --- a/test/datasource/helm.spec.ts +++ b/lib/datasource/helm/index.spec.ts @@ -1,16 +1,16 @@ import fs from 'fs'; -import _got from '../../lib/util/got'; -import { getPkgReleases, getRepositoryData } from '../../lib/datasource/helm'; +import _got from '../../util/got'; +import { getPkgReleases, getRepositoryData } from '.'; const got: any = _got; // Truncated index.yaml file const indexYaml = fs.readFileSync( - 'test/datasource/helm/_fixtures/index.yaml', + 'lib/datasource/helm/__fixtures__/index.yaml', 'utf8' ); -jest.mock('../../lib/util/got'); +jest.mock('../../util/got'); describe('datasource/helm', () => { describe('getPkgReleases', () => { diff --git a/test/datasource/hex/_fixtures/certifi.json b/lib/datasource/hex/__fixtures__/certifi.json similarity index 100% rename from test/datasource/hex/_fixtures/certifi.json rename to lib/datasource/hex/__fixtures__/certifi.json diff --git a/test/datasource/__snapshots__/hex.spec.ts.snap b/lib/datasource/hex/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/hex.spec.ts.snap rename to lib/datasource/hex/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/hex.spec.ts b/lib/datasource/hex/index.spec.ts similarity index 89% rename from test/datasource/hex.spec.ts rename to lib/datasource/hex/index.spec.ts index 5d79d88fd5b8ec399096000a08a6709d2a12cae4..f55cd760874357523696d8ef0f6412a090313d89 100644 --- a/test/datasource/hex.spec.ts +++ b/lib/datasource/hex/index.spec.ts @@ -1,20 +1,20 @@ import fs from 'fs'; -import _got from '../../lib/util/got'; -import * as _hostRules from '../../lib/util/host-rules'; -import { getPkgReleases } from '../../lib/datasource/hex'; -import { DATASOURCE_FAILURE } from '../../lib/constants/error-messages'; +import _got from '../../util/got'; +import * as _hostRules from '../../util/host-rules'; +import { getPkgReleases } from '.'; +import { DATASOURCE_FAILURE } from '../../constants/error-messages'; const got: any = _got; const hostRules: any = _hostRules; let res1 = fs.readFileSync( - 'test/datasource/hex/_fixtures/certifi.json', + 'lib/datasource/hex/__fixtures__/certifi.json', 'utf8' ); res1 = JSON.parse(res1); -jest.mock('../../lib/util/got'); -jest.mock('../../lib/util/host-rules'); +jest.mock('../../util/got'); +jest.mock('../../util/host-rules'); describe('datasource/hex', () => { describe('getPkgReleases', () => { diff --git a/test/datasource/index.spec.ts b/lib/datasource/index.spec.ts similarity index 90% rename from test/datasource/index.spec.ts rename to lib/datasource/index.spec.ts index 38263d28bc6862ced8a71294f1a3be4d8a1de364..9263b9d484e08138ddce001b35390b71e0d9bbd6 100644 --- a/test/datasource/index.spec.ts +++ b/lib/datasource/index.spec.ts @@ -1,13 +1,13 @@ -import * as datasource from '../../lib/datasource'; -import * as _npm from '../../lib/datasource/npm'; +import * as datasource from '.'; +import * as _npm from './npm'; import { DATASOURCE_DOCKER, DATASOURCE_GITHUB, DATASOURCE_NPM, -} from '../../lib/constants/data-binary-source'; +} from '../constants/data-binary-source'; -jest.mock('../../lib/datasource/docker'); -jest.mock('../../lib/datasource/npm'); +jest.mock('./docker'); +jest.mock('./npm'); const npmDatasource: any = _npm; diff --git a/test/datasource/gradle/_fixtures/maven/custom_maven_repo/maven2/mysql/mysql-connector-java/maven-metadata.xml b/lib/datasource/maven/__fixtures__/custom_maven_repo/maven2/mysql/mysql-connector-java/maven-metadata.xml similarity index 100% rename from test/datasource/gradle/_fixtures/maven/custom_maven_repo/maven2/mysql/mysql-connector-java/maven-metadata.xml rename to lib/datasource/maven/__fixtures__/custom_maven_repo/maven2/mysql/mysql-connector-java/maven-metadata.xml diff --git a/test/datasource/gradle/_fixtures/maven/jcenter/io/realm/realm-gradle-plugin/5.13.0/realm-gradle-plugin-5.13.0.pom b/lib/datasource/maven/__fixtures__/jcenter/io/realm/realm-gradle-plugin/5.13.0/realm-gradle-plugin-5.13.0.pom similarity index 100% rename from test/datasource/gradle/_fixtures/maven/jcenter/io/realm/realm-gradle-plugin/5.13.0/realm-gradle-plugin-5.13.0.pom rename to lib/datasource/maven/__fixtures__/jcenter/io/realm/realm-gradle-plugin/5.13.0/realm-gradle-plugin-5.13.0.pom diff --git a/test/datasource/gradle/_fixtures/maven/jcenter/io/realm/realm-gradle-plugin/maven-metadata.xml b/lib/datasource/maven/__fixtures__/jcenter/io/realm/realm-gradle-plugin/maven-metadata.xml similarity index 100% rename from test/datasource/gradle/_fixtures/maven/jcenter/io/realm/realm-gradle-plugin/maven-metadata.xml rename to lib/datasource/maven/__fixtures__/jcenter/io/realm/realm-gradle-plugin/maven-metadata.xml diff --git a/test/datasource/gradle/_fixtures/maven/repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.12/mysql-connector-java-8.0.12.pom b/lib/datasource/maven/__fixtures__/repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.12/mysql-connector-java-8.0.12.pom similarity index 100% rename from test/datasource/gradle/_fixtures/maven/repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.12/mysql-connector-java-8.0.12.pom rename to lib/datasource/maven/__fixtures__/repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.12/mysql-connector-java-8.0.12.pom diff --git a/test/datasource/gradle/_fixtures/maven/repo1.maven.org/maven2/mysql/mysql-connector-java/maven-metadata.xml b/lib/datasource/maven/__fixtures__/repo1.maven.org/maven2/mysql/mysql-connector-java/maven-metadata.xml similarity index 100% rename from test/datasource/gradle/_fixtures/maven/repo1.maven.org/maven2/mysql/mysql-connector-java/maven-metadata.xml rename to lib/datasource/maven/__fixtures__/repo1.maven.org/maven2/mysql/mysql-connector-java/maven-metadata.xml diff --git a/test/datasource/gradle/_fixtures/maven/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/maven-metadata.xml b/lib/datasource/maven/__fixtures__/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/maven-metadata.xml similarity index 100% rename from test/datasource/gradle/_fixtures/maven/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/maven-metadata.xml rename to lib/datasource/maven/__fixtures__/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/maven-metadata.xml diff --git a/test/datasource/maven.spec.ts b/lib/datasource/maven/index.spec.ts similarity index 89% rename from test/datasource/maven.spec.ts rename to lib/datasource/maven/index.spec.ts index e26884d3be28d73aa4747ba669094b8cd23fba41..05a0658cea7e82a285b57918269a90e70f9ba366 100644 --- a/test/datasource/maven.spec.ts +++ b/lib/datasource/maven/index.spec.ts @@ -1,11 +1,11 @@ import nock from 'nock'; import fs from 'fs'; -import * as datasource from '../../lib/datasource'; -import { DATASOURCE_FAILURE } from '../../lib/constants/error-messages'; -import { VERSION_SCHEME_LOOSE } from '../../lib/constants/version-schemes'; -import { DATASOURCE_MAVEN } from '../../lib/constants/data-binary-source'; - -const hostRules = require('../../lib/util/host-rules'); +import { resolve } from 'path'; +import * as datasource from '..'; +import { DATASOURCE_FAILURE } from '../../constants/error-messages'; +import { VERSION_SCHEME_LOOSE } from '../../constants/version-schemes'; +import { DATASOURCE_MAVEN } from '../../constants/data-binary-source'; +import * as hostRules from '../../util/host-rules'; const MYSQL_VERSIONS = [ '6.0.5', @@ -18,12 +18,18 @@ const MYSQL_VERSIONS = [ ]; const MYSQL_MAVEN_METADATA = fs.readFileSync( - 'test/datasource/gradle/_fixtures/maven/repo1.maven.org/maven2/mysql/mysql-connector-java/maven-metadata.xml', + resolve( + __dirname, + './__fixtures__/repo1.maven.org/maven2/mysql/mysql-connector-java/maven-metadata.xml' + ), 'utf8' ); const MYSQL_MAVEN_MYSQL_POM = fs.readFileSync( - 'test/datasource/gradle/_fixtures/maven/repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.12/mysql-connector-java-8.0.12.pom', + resolve( + __dirname, + './__fixtures__/repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.12/mysql-connector-java-8.0.12.pom' + ), 'utf8' ); @@ -99,7 +105,7 @@ describe('datasource/maven', () => { lookupName: 'unknown:unknown', registryUrls: [ 's3://somewhere.s3.aws.amazon.com', - 'file://test/datasource/gradle/_fixtures/maven/repo1.maven.org/maven2/', + 'file://lib/datasource/maven/__fixtures__/repo1.maven.org/maven2/', ], }); expect(releases).toBeNull(); @@ -110,8 +116,8 @@ describe('datasource/maven', () => { ...config, lookupName: 'org.hamcrest:hamcrest-core', registryUrls: [ - 'file://test/datasource/gradle/_fixtures/maven/repo1.maven.org/maven2/', - 'file://test/datasource/gradle/_fixtures/maven/custom_maven_repo/maven2/', + 'file://lib/datasource/maven/__fixtures__/repo1.maven.org/maven2/', + 'file://lib/datasource/maven/__fixtures__/custom_maven_repo/maven2/', 's3://somewhere.s3.aws.amazon.com', ], }); @@ -133,8 +139,8 @@ describe('datasource/maven', () => { ...config, lookupName: 'mysql:mysql-connector-java', registryUrls: [ - 'file://test/datasource/gradle/_fixtures/maven/repo1.maven.org/maven2/', - 'file://test/datasource/gradle/_fixtures/maven/custom_maven_repo/maven2/', + 'file://lib/datasource/maven/__fixtures__/repo1.maven.org/maven2/', + 'file://lib/datasource/maven/__fixtures__/custom_maven_repo/maven2/', ], }); expect(releases.releases).toEqual( @@ -267,9 +273,7 @@ describe('datasource/maven', () => { const releases = await datasource.getPkgReleases({ ...config, lookupName: 'io.realm:realm-gradle-plugin', - registryUrls: [ - 'file://test/datasource/gradle/_fixtures/maven/jcenter/', - ], + registryUrls: ['file://lib/datasource/maven/__fixtures__/jcenter/'], }); expect(releases.sourceUrl).toEqual('https://github.com/realm/realm-java'); }); diff --git a/test/datasource/metadata.spec.ts b/lib/datasource/metadata.spec.ts similarity index 95% rename from test/datasource/metadata.spec.ts rename to lib/datasource/metadata.spec.ts index ff7a1b5d52e0f415c7c459aa53c85f71a84e72c8..5f1cf7a4dba57a482ede3f0ea370d60803857135 100644 --- a/test/datasource/metadata.spec.ts +++ b/lib/datasource/metadata.spec.ts @@ -1,8 +1,8 @@ -import { addMetaData } from '../../lib/datasource/metadata'; +import { addMetaData } from './metadata'; import { DATASOURCE_MAVEN, DATASOURCE_PYPI, -} from '../../lib/constants/data-binary-source'; +} from '../constants/data-binary-source'; describe('datasource/metadata', () => { it('Should do nothing if dep is not specified', () => { diff --git a/test/datasource/npm/__snapshots__/index.spec.ts.snap b/lib/datasource/npm/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/npm/__snapshots__/index.spec.ts.snap rename to lib/datasource/npm/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/npm/index.spec.ts b/lib/datasource/npm/index.spec.ts similarity index 99% rename from test/datasource/npm/index.spec.ts rename to lib/datasource/npm/index.spec.ts index 4d553b4cbb89bda3a600b5776b1616268316bab9..dc9b953272d8e0e27d7490743c7d782b94030118 100644 --- a/test/datasource/npm/index.spec.ts +++ b/lib/datasource/npm/index.spec.ts @@ -1,8 +1,8 @@ import _registryAuthToken from 'registry-auth-token'; import nock from 'nock'; import moment from 'moment'; -import * as npm from '../../../lib/datasource/npm'; -import { DATASOURCE_FAILURE } from '../../../lib/constants/error-messages'; +import * as npm from '.'; +import { DATASOURCE_FAILURE } from '../../constants/error-messages'; jest.mock('registry-auth-token'); jest.mock('delay'); diff --git a/test/datasource/nuget/_fixtures/indexV3.json b/lib/datasource/nuget/__fixtures__/indexV3.json similarity index 100% rename from test/datasource/nuget/_fixtures/indexV3.json rename to lib/datasource/nuget/__fixtures__/indexV3.json diff --git a/test/datasource/nuget/_fixtures/latestV2.json b/lib/datasource/nuget/__fixtures__/latestV2.json similarity index 100% rename from test/datasource/nuget/_fixtures/latestV2.json rename to lib/datasource/nuget/__fixtures__/latestV2.json diff --git a/test/datasource/nuget/_fixtures/nunitV2.json b/lib/datasource/nuget/__fixtures__/nunitV2.json similarity index 100% rename from test/datasource/nuget/_fixtures/nunitV2.json rename to lib/datasource/nuget/__fixtures__/nunitV2.json diff --git a/test/datasource/nuget/_fixtures/nunitV2.xml b/lib/datasource/nuget/__fixtures__/nunitV2.xml similarity index 100% rename from test/datasource/nuget/_fixtures/nunitV2.xml rename to lib/datasource/nuget/__fixtures__/nunitV2.xml diff --git a/test/datasource/nuget/_fixtures/nunitV2_noGitHubProjectUrl.xml b/lib/datasource/nuget/__fixtures__/nunitV2_noGitHubProjectUrl.xml similarity index 100% rename from test/datasource/nuget/_fixtures/nunitV2_noGitHubProjectUrl.xml rename to lib/datasource/nuget/__fixtures__/nunitV2_noGitHubProjectUrl.xml diff --git a/test/datasource/nuget/_fixtures/nunitV2_no_release.xml b/lib/datasource/nuget/__fixtures__/nunitV2_no_release.xml similarity index 100% rename from test/datasource/nuget/_fixtures/nunitV2_no_release.xml rename to lib/datasource/nuget/__fixtures__/nunitV2_no_release.xml diff --git a/test/datasource/nuget/_fixtures/nunitV2_paginated_1.xml b/lib/datasource/nuget/__fixtures__/nunitV2_paginated_1.xml similarity index 100% rename from test/datasource/nuget/_fixtures/nunitV2_paginated_1.xml rename to lib/datasource/nuget/__fixtures__/nunitV2_paginated_1.xml diff --git a/test/datasource/nuget/_fixtures/nunitV2_paginated_2.xml b/lib/datasource/nuget/__fixtures__/nunitV2_paginated_2.xml similarity index 100% rename from test/datasource/nuget/_fixtures/nunitV2_paginated_2.xml rename to lib/datasource/nuget/__fixtures__/nunitV2_paginated_2.xml diff --git a/test/datasource/nuget/_fixtures/nunitV2_withoutProjectUrl.xml b/lib/datasource/nuget/__fixtures__/nunitV2_withoutProjectUrl.xml similarity index 100% rename from test/datasource/nuget/_fixtures/nunitV2_withoutProjectUrl.xml rename to lib/datasource/nuget/__fixtures__/nunitV2_withoutProjectUrl.xml diff --git a/test/datasource/nuget/_fixtures/nunitV3.json b/lib/datasource/nuget/__fixtures__/nunitV3.json similarity index 100% rename from test/datasource/nuget/_fixtures/nunitV3.json rename to lib/datasource/nuget/__fixtures__/nunitV3.json diff --git a/test/datasource/nuget/_fixtures/nunitV3_noGitHubProjectUrl.json b/lib/datasource/nuget/__fixtures__/nunitV3_noGitHubProjectUrl.json similarity index 100% rename from test/datasource/nuget/_fixtures/nunitV3_noGitHubProjectUrl.json rename to lib/datasource/nuget/__fixtures__/nunitV3_noGitHubProjectUrl.json diff --git a/test/datasource/nuget/_fixtures/nunitV3_withoutProjectUrl.json b/lib/datasource/nuget/__fixtures__/nunitV3_withoutProjectUrl.json similarity index 100% rename from test/datasource/nuget/_fixtures/nunitV3_withoutProjectUrl.json rename to lib/datasource/nuget/__fixtures__/nunitV3_withoutProjectUrl.json diff --git a/test/datasource/nuget/_fixtures/nunitv3_nuget-org.xml b/lib/datasource/nuget/__fixtures__/nunitv3_nuget-org.xml similarity index 100% rename from test/datasource/nuget/_fixtures/nunitv3_nuget-org.xml rename to lib/datasource/nuget/__fixtures__/nunitv3_nuget-org.xml diff --git a/test/datasource/__snapshots__/nuget.spec.ts.snap b/lib/datasource/nuget/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/nuget.spec.ts.snap rename to lib/datasource/nuget/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/nuget.spec.ts b/lib/datasource/nuget/index.spec.ts similarity index 91% rename from test/datasource/nuget.spec.ts rename to lib/datasource/nuget/index.spec.ts index 081e5b71c8fe41e118731f0c360f3dcfbe52dca0..0a67d4ebfe2dcd5b3e4e85d436145f1786274d21 100644 --- a/test/datasource/nuget.spec.ts +++ b/lib/datasource/nuget/index.spec.ts @@ -1,61 +1,61 @@ import fs from 'fs'; -import _got from '../../lib/util/got'; -import * as datasource from '../../lib/datasource'; -import * as _hostRules from '../../lib/util/host-rules'; -import { DATASOURCE_NUGET } from '../../lib/constants/data-binary-source'; +import _got from '../../util/got'; +import * as datasource from '..'; +import * as _hostRules from '../../util/host-rules'; +import { DATASOURCE_NUGET } from '../../constants/data-binary-source'; const hostRules: any = _hostRules; -jest.mock('../../lib/util/got'); -jest.mock('../../lib/util/host-rules'); +jest.mock('../../util/got'); +jest.mock('../../util/host-rules'); const got: any = _got; const pkgListV3 = fs.readFileSync( - 'test/datasource/nuget/_fixtures/nunitV3.json', + 'lib/datasource/nuget/__fixtures__/nunitV3.json', 'utf8' ); const pkgListV3WithoutProkjectUrl = fs.readFileSync( - 'test/datasource/nuget/_fixtures/nunitV3_withoutProjectUrl.json', + 'lib/datasource/nuget/__fixtures__/nunitV3_withoutProjectUrl.json', 'utf8' ); const pkgListV3NoGitHubProjectUrl = fs.readFileSync( - 'test/datasource/nuget/_fixtures/nunitV3_noGitHubProjectUrl.json', + 'lib/datasource/nuget/__fixtures__/nunitV3_noGitHubProjectUrl.json', 'utf8' ); const pkgInfoV3FromNuget = fs.readFileSync( - 'test/datasource/nuget/_fixtures/nunitv3_nuget-org.xml', + 'lib/datasource/nuget/__fixtures__/nunitv3_nuget-org.xml', 'utf8' ); const pkgListV2 = fs.readFileSync( - 'test/datasource/nuget/_fixtures/nunitV2.xml', + 'lib/datasource/nuget/__fixtures__/nunitV2.xml', 'utf8' ); const pkgListV2NoGitHubProjectUrl = fs.readFileSync( - 'test/datasource/nuget/_fixtures/nunitV2_noGitHubProjectUrl.xml', + 'lib/datasource/nuget/__fixtures__/nunitV2_noGitHubProjectUrl.xml', 'utf8' ); const pkgListV2NoRelease = fs.readFileSync( - 'test/datasource/nuget/_fixtures/nunitV2_no_release.xml', + 'lib/datasource/nuget/__fixtures__/nunitV2_no_release.xml', 'utf8' ); const pkgListV2WithoutProjectUrl = fs.readFileSync( - 'test/datasource/nuget/_fixtures/nunitV2_withoutProjectUrl.xml', + 'lib/datasource/nuget/__fixtures__/nunitV2_withoutProjectUrl.xml', 'utf8' ); const pkgListV2Page1of2 = fs.readFileSync( - 'test/datasource/nuget/_fixtures/nunitV2_paginated_1.xml', + 'lib/datasource/nuget/__fixtures__/nunitV2_paginated_1.xml', 'utf8' ); const pkgListV2Page2of2 = fs.readFileSync( - 'test/datasource/nuget/_fixtures/nunitV2_paginated_2.xml', + 'lib/datasource/nuget/__fixtures__/nunitV2_paginated_2.xml', 'utf8' ); const nugetIndexV3 = fs.readFileSync( - 'test/datasource/nuget/_fixtures/indexV3.json', + 'lib/datasource/nuget/__fixtures__/indexV3.json', 'utf8' ); diff --git a/test/datasource/__snapshots__/orb.spec.ts.snap b/lib/datasource/orb/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/orb.spec.ts.snap rename to lib/datasource/orb/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/orb.spec.ts b/lib/datasource/orb/index.spec.ts similarity index 94% rename from test/datasource/orb.spec.ts rename to lib/datasource/orb/index.spec.ts index 89faab44f62307fa3ff7833802afb875041f9778..949b32b35678bcfec24f3b357107240d42ec1b63 100644 --- a/test/datasource/orb.spec.ts +++ b/lib/datasource/orb/index.spec.ts @@ -1,8 +1,8 @@ -import _got from '../../lib/util/got'; -import * as datasource from '../../lib/datasource'; -import { DATASOURCE_ORB } from '../../lib/constants/data-binary-source'; +import _got from '../../util/got'; +import * as datasource from '..'; +import { DATASOURCE_ORB } from '../../constants/data-binary-source'; -jest.mock('../../lib/util/got'); +jest.mock('../../util/got'); const got: any = _got; diff --git a/test/datasource/packagist/_fixtures/1beyt.json b/lib/datasource/packagist/__fixtures__/1beyt.json similarity index 100% rename from test/datasource/packagist/_fixtures/1beyt.json rename to lib/datasource/packagist/__fixtures__/1beyt.json diff --git a/test/datasource/packagist/_fixtures/includes.json b/lib/datasource/packagist/__fixtures__/includes.json similarity index 100% rename from test/datasource/packagist/_fixtures/includes.json rename to lib/datasource/packagist/__fixtures__/includes.json diff --git a/test/datasource/packagist/_fixtures/mailchimp-api.json b/lib/datasource/packagist/__fixtures__/mailchimp-api.json similarity index 100% rename from test/datasource/packagist/_fixtures/mailchimp-api.json rename to lib/datasource/packagist/__fixtures__/mailchimp-api.json diff --git a/test/datasource/__snapshots__/packagist.spec.ts.snap b/lib/datasource/packagist/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/packagist.spec.ts.snap rename to lib/datasource/packagist/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/packagist.spec.ts b/lib/datasource/packagist/index.spec.ts similarity index 92% rename from test/datasource/packagist.spec.ts rename to lib/datasource/packagist/index.spec.ts index 9d36d8a77f330945eb498812b025486050c21134..23fa3177bfb95887e42243762d7095b13b6795d7 100644 --- a/test/datasource/packagist.spec.ts +++ b/lib/datasource/packagist/index.spec.ts @@ -1,24 +1,24 @@ import fs from 'fs'; -import _got from '../../lib/util/got'; -import * as datasource from '../../lib/datasource'; -import * as _hostRules from '../../lib/util/host-rules'; -import { VERSION_SCHEME_COMPOSER } from '../../lib/constants/version-schemes'; -import { DATASOURCE_PACKAGIST } from '../../lib/constants/data-binary-source'; +import _got from '../../util/got'; +import * as datasource from '..'; +import * as _hostRules from '../../util/host-rules'; +import { VERSION_SCHEME_COMPOSER } from '../../constants/version-schemes'; +import { DATASOURCE_PACKAGIST } from '../../constants/data-binary-source'; -jest.mock('../../lib/util/got'); -jest.mock('../../lib/util/host-rules'); +jest.mock('../../util/got'); +jest.mock('../../util/host-rules'); const got: any = _got; const hostRules = _hostRules; const includesJson: any = fs.readFileSync( - 'test/datasource/packagist/_fixtures/includes.json' + 'lib/datasource/packagist/__fixtures__/includes.json' ); const beytJson: any = fs.readFileSync( - 'test/datasource/packagist/_fixtures/1beyt.json' + 'lib/datasource/packagist/__fixtures__/1beyt.json' ); const mailchimpJson: any = fs.readFileSync( - 'test/datasource/packagist/_fixtures/mailchimp-api.json' + 'lib/datasource/packagist/__fixtures__/mailchimp-api.json' ); describe('datasource/packagist', () => { diff --git a/test/datasource/pypi/_fixtures/azure-cli-monitor.json b/lib/datasource/pypi/__fixtures__/azure-cli-monitor.json similarity index 100% rename from test/datasource/pypi/_fixtures/azure-cli-monitor.json rename to lib/datasource/pypi/__fixtures__/azure-cli-monitor.json diff --git a/test/datasource/pypi/_fixtures/versions-html-badfile.html b/lib/datasource/pypi/__fixtures__/versions-html-badfile.html similarity index 100% rename from test/datasource/pypi/_fixtures/versions-html-badfile.html rename to lib/datasource/pypi/__fixtures__/versions-html-badfile.html diff --git a/test/datasource/pypi/_fixtures/versions-html-mixed-hyphens.html b/lib/datasource/pypi/__fixtures__/versions-html-mixed-hyphens.html similarity index 100% rename from test/datasource/pypi/_fixtures/versions-html-mixed-hyphens.html rename to lib/datasource/pypi/__fixtures__/versions-html-mixed-hyphens.html diff --git a/test/datasource/pypi/_fixtures/versions-html.html b/lib/datasource/pypi/__fixtures__/versions-html.html similarity index 100% rename from test/datasource/pypi/_fixtures/versions-html.html rename to lib/datasource/pypi/__fixtures__/versions-html.html diff --git a/test/datasource/__snapshots__/pypi.spec.ts.snap b/lib/datasource/pypi/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/pypi.spec.ts.snap rename to lib/datasource/pypi/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/pypi.spec.ts b/lib/datasource/pypi/index.spec.ts similarity index 94% rename from test/datasource/pypi.spec.ts rename to lib/datasource/pypi/index.spec.ts index dee24b15b4af0641c075d32d8f5bf3ada72b9d8d..7f1e7f68f44d10c905e299276347e03f7cfe959e 100644 --- a/test/datasource/pypi.spec.ts +++ b/lib/datasource/pypi/index.spec.ts @@ -1,23 +1,23 @@ import fs from 'fs'; -import _got from '../../lib/util/got'; -import * as datasource from '../../lib/datasource'; -import { DATASOURCE_PYPI } from '../../lib/constants/data-binary-source'; +import _got from '../../util/got'; +import * as datasource from '..'; +import { DATASOURCE_PYPI } from '../../constants/data-binary-source'; -jest.mock('../../lib/util/got'); +jest.mock('../../util/got'); const got: any = _got; const res1: any = fs.readFileSync( - 'test/datasource/pypi/_fixtures/azure-cli-monitor.json' + 'lib/datasource/pypi/__fixtures__/azure-cli-monitor.json' ); const htmlResponse = fs.readFileSync( - 'test/datasource/pypi/_fixtures/versions-html.html' + 'lib/datasource/pypi/__fixtures__/versions-html.html' ); const badResponse = fs.readFileSync( - 'test/datasource/pypi/_fixtures/versions-html-badfile.html' + 'lib/datasource/pypi/__fixtures__/versions-html-badfile.html' ); const mixedHyphensResponse = fs.readFileSync( - 'test/datasource/pypi/_fixtures/versions-html-mixed-hyphens.html' + 'lib/datasource/pypi/__fixtures__/versions-html-mixed-hyphens.html' ); describe('datasource/pypi', () => { diff --git a/test/datasource/ruby-version/_fixtures/releases.html b/lib/datasource/ruby-version/__fixtures__/releases.html similarity index 100% rename from test/datasource/ruby-version/_fixtures/releases.html rename to lib/datasource/ruby-version/__fixtures__/releases.html diff --git a/test/datasource/__snapshots__/ruby-version.spec.ts.snap b/lib/datasource/ruby-version/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/ruby-version.spec.ts.snap rename to lib/datasource/ruby-version/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/ruby-version.spec.ts b/lib/datasource/ruby-version/index.spec.ts similarity index 81% rename from test/datasource/ruby-version.spec.ts rename to lib/datasource/ruby-version/index.spec.ts index c4235f0e21309f09626e6190d8d9fc3af9f7be23..cfb8e1569a98fb27ca6dfb52833efce3089e97f8 100644 --- a/test/datasource/ruby-version.spec.ts +++ b/lib/datasource/ruby-version/index.spec.ts @@ -1,13 +1,13 @@ import fs from 'fs'; -import _got from '../../lib/util/got'; -import { getPkgReleases } from '../../lib/datasource/ruby-version'; +import _got from '../../util/got'; +import { getPkgReleases } from '.'; -jest.mock('../../lib/util/got'); +jest.mock('../../util/got'); const got: any = _got; const rubyReleasesHtml = fs.readFileSync( - 'test/datasource/ruby-version/_fixtures/releases.html', + 'lib/datasource/ruby-version/__fixtures__/releases.html', 'utf8' ); diff --git a/test/datasource/rubygems/_fixtures/rails/info.json b/lib/datasource/rubygems/__fixtures__/rails/info.json similarity index 100% rename from test/datasource/rubygems/_fixtures/rails/info.json rename to lib/datasource/rubygems/__fixtures__/rails/info.json diff --git a/test/datasource/rubygems/_fixtures/rails/versions.json b/lib/datasource/rubygems/__fixtures__/rails/versions.json similarity index 100% rename from test/datasource/rubygems/_fixtures/rails/versions.json rename to lib/datasource/rubygems/__fixtures__/rails/versions.json diff --git a/test/datasource/rubygems/__snapshots__/index.spec.ts.snap b/lib/datasource/rubygems/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/rubygems/__snapshots__/index.spec.ts.snap rename to lib/datasource/rubygems/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/rubygems/index.spec.ts b/lib/datasource/rubygems/index.spec.ts similarity index 93% rename from test/datasource/rubygems/index.spec.ts rename to lib/datasource/rubygems/index.spec.ts index d4be3ea9f5c4cb84f9aafba9cb81d247e18d00f1..d1b9f0d46596597be4f3deca19e127581e77d0b4 100644 --- a/test/datasource/rubygems/index.spec.ts +++ b/lib/datasource/rubygems/index.spec.ts @@ -1,7 +1,7 @@ -import _got from '../../../lib/util/got'; -import railsInfo from './_fixtures/rails/info.json'; -import railsVersions from './_fixtures/rails/versions.json'; -import * as rubygems from '../../../lib/datasource/rubygems'; +import _got from '../../util/got'; +import railsInfo from './__fixtures__/rails/info.json'; +import railsVersions from './__fixtures__/rails/versions.json'; +import * as rubygems from '.'; const got: any = _got; @@ -24,7 +24,7 @@ const rubygemsOrgVersions = `created_at: 2017-03-27T04:38:13+00:00 1pass -0.1.2 abcdef 21-day-challenge-countdown 0.1.0,0.1.1,0.1.2 57e8873fe713063f4e54e85bbbd709bb`; -jest.mock('../../../lib/util/got'); +jest.mock('../../util/got'); describe('datasource/rubygems', () => { describe('getPkgReleases', () => { diff --git a/test/datasource/rubygems/retriable.spec.ts b/lib/datasource/rubygems/retriable.spec.ts similarity index 91% rename from test/datasource/rubygems/retriable.spec.ts rename to lib/datasource/rubygems/retriable.spec.ts index cb9d96f0742ff8e0256e0c8444827dc79d13f0b7..19ddba9fe7c76a635730d68f3dafa831ee5565b3 100644 --- a/test/datasource/rubygems/retriable.spec.ts +++ b/lib/datasource/rubygems/retriable.spec.ts @@ -1,4 +1,4 @@ -import retriable from '../../../lib/datasource/rubygems/retriable'; +import retriable from './retriable'; describe('datasource/rubygems/retriable', () => { it('returns 0 when numberOfRetries equals 0', () => { diff --git a/test/datasource/sbt/_fixtures/maven-index.html b/lib/datasource/sbt/__fixtures__/maven-index.html similarity index 100% rename from test/datasource/sbt/_fixtures/maven-index.html rename to lib/datasource/sbt/__fixtures__/maven-index.html diff --git a/test/datasource/sbt/_fixtures/sbt-plugins-index.html b/lib/datasource/sbt/__fixtures__/sbt-plugins-index.html similarity index 100% rename from test/datasource/sbt/_fixtures/sbt-plugins-index.html rename to lib/datasource/sbt/__fixtures__/sbt-plugins-index.html diff --git a/test/datasource/sbt/__snapshots__/index.spec.ts.snap b/lib/datasource/sbt/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/sbt/__snapshots__/index.spec.ts.snap rename to lib/datasource/sbt/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/sbt/index.spec.ts b/lib/datasource/sbt/index.spec.ts similarity index 92% rename from test/datasource/sbt/index.spec.ts rename to lib/datasource/sbt/index.spec.ts index 5582b84e843c09f486326cbf85e8cbf6c54f00a1..2908ba9c82d4af09e97b0e3ad78959b376d38ed3 100644 --- a/test/datasource/sbt/index.spec.ts +++ b/lib/datasource/sbt/index.spec.ts @@ -1,22 +1,19 @@ import path from 'path'; import fs from 'fs'; import nock from 'nock'; -import { getPkgReleases } from '../../../lib/datasource/sbt'; -import { DEFAULT_MAVEN_REPO } from '../../../lib/manager/maven/extract'; -import { - parseIndexDir, - SBT_PLUGINS_REPO, -} from '../../../lib/datasource/sbt/util'; -import { VERSION_SCHEME_IVY } from '../../../lib/constants/version-schemes'; -import { DATASOURCE_SBT } from '../../../lib/constants/data-binary-source'; +import { getPkgReleases } from '.'; +import { DEFAULT_MAVEN_REPO } from '../../manager/maven/extract'; +import { parseIndexDir, SBT_PLUGINS_REPO } from './util'; +import { VERSION_SCHEME_IVY } from '../../constants/version-schemes'; +import { DATASOURCE_SBT } from '../../constants/data-binary-source'; const mavenIndexHtml = fs.readFileSync( - path.resolve(__dirname, `./_fixtures/maven-index.html`), + path.resolve(__dirname, `./__fixtures__/maven-index.html`), 'utf8' ); const sbtPluginIndex = fs.readFileSync( - path.resolve(__dirname, `./_fixtures/sbt-plugins-index.html`), + path.resolve(__dirname, `./__fixtures__/sbt-plugins-index.html`), 'utf8' ); diff --git a/test/datasource/terraform-provider/_fixtures/azurerm-provider.json b/lib/datasource/terraform-provider/__fixtures__/azurerm-provider.json similarity index 100% rename from test/datasource/terraform-provider/_fixtures/azurerm-provider.json rename to lib/datasource/terraform-provider/__fixtures__/azurerm-provider.json diff --git a/test/datasource/__snapshots__/terraform-provider.spec.ts.snap b/lib/datasource/terraform-provider/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/terraform-provider.spec.ts.snap rename to lib/datasource/terraform-provider/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/terraform-provider.spec.ts b/lib/datasource/terraform-provider/index.spec.ts similarity index 84% rename from test/datasource/terraform-provider.spec.ts rename to lib/datasource/terraform-provider/index.spec.ts index 6dd1a52eec980414e274f4a4eceed15b041892fc..9184942bb86614e4564166c044cc6cc28bc0374a 100644 --- a/test/datasource/terraform-provider.spec.ts +++ b/lib/datasource/terraform-provider/index.spec.ts @@ -1,14 +1,14 @@ import fs from 'fs'; -import _got from '../../lib/util/got'; -import * as datasource from '../../lib/datasource'; -import { DATASOURCE_TERRAFORM_PROVIDER } from '../../lib/constants/data-binary-source'; +import _got from '../../util/got'; +import * as datasource from '..'; +import { DATASOURCE_TERRAFORM_PROVIDER } from '../../constants/data-binary-source'; -jest.mock('../../lib/util/got'); +jest.mock('../../util/got'); const got: any = _got; const consulData: any = fs.readFileSync( - 'test/datasource/terraform-provider/_fixtures/azurerm-provider.json' + 'lib/datasource/terraform-provider/__fixtures__/azurerm-provider.json' ); describe('datasource/terraform', () => { diff --git a/test/datasource/terraform/_fixtures/registry-consul.json b/lib/datasource/terraform/__fixtures__/registry-consul.json similarity index 100% rename from test/datasource/terraform/_fixtures/registry-consul.json rename to lib/datasource/terraform/__fixtures__/registry-consul.json diff --git a/test/datasource/__snapshots__/terraform.spec.ts.snap b/lib/datasource/terraform/__snapshots__/index.spec.ts.snap similarity index 100% rename from test/datasource/__snapshots__/terraform.spec.ts.snap rename to lib/datasource/terraform/__snapshots__/index.spec.ts.snap diff --git a/test/datasource/terraform.spec.ts b/lib/datasource/terraform/index.spec.ts similarity index 92% rename from test/datasource/terraform.spec.ts rename to lib/datasource/terraform/index.spec.ts index f264e355e900abf644043df78571d8e74633dae3..c08c81d359e6a5e2bac056cc077724c7f8366e4f 100644 --- a/test/datasource/terraform.spec.ts +++ b/lib/datasource/terraform/index.spec.ts @@ -1,13 +1,13 @@ import fs from 'fs'; -import _got from '../../lib/util/got'; -import * as datasource from '../../lib/datasource'; +import _got from '../../util/got'; +import * as datasource from '..'; -jest.mock('../../lib/util/got'); +jest.mock('../../util/got'); const got: any = _got; const consulData: any = fs.readFileSync( - 'test/datasource/terraform/_fixtures/registry-consul.json' + 'lib/datasource/terraform/__fixtures__/registry-consul.json' ); describe('datasource/terraform', () => { diff --git a/test/datasource/gradle-wrapper/_fixtures/gradle-wrapper-1.properties b/lib/manager/gradle-wrapper/__fixtures__/gradle-wrapper-1.properties similarity index 100% rename from test/datasource/gradle-wrapper/_fixtures/gradle-wrapper-1.properties rename to lib/manager/gradle-wrapper/__fixtures__/gradle-wrapper-1.properties diff --git a/test/datasource/gradle-wrapper/_fixtures/gradle-wrapper-2.properties b/lib/manager/gradle-wrapper/__fixtures__/gradle-wrapper-2.properties old mode 100755 new mode 100644 similarity index 100% rename from test/datasource/gradle-wrapper/_fixtures/gradle-wrapper-2.properties rename to lib/manager/gradle-wrapper/__fixtures__/gradle-wrapper-2.properties diff --git a/lib/manager/gradle-wrapper/extract.spec.ts b/lib/manager/gradle-wrapper/extract.spec.ts index 122f1f5ca4a8da477d645832668776edbfbf3ca0..20d2f5e5738720745398149bccaa3dccdaf27a45 100644 --- a/lib/manager/gradle-wrapper/extract.spec.ts +++ b/lib/manager/gradle-wrapper/extract.spec.ts @@ -1,12 +1,13 @@ import { readFileSync } from 'fs'; +import { resolve } from 'path'; import { extractPackageFile } from './extract'; const propertiesFile1 = readFileSync( - 'test/datasource/gradle-wrapper/_fixtures/gradle-wrapper-1.properties', + resolve(__dirname, './__fixtures__/gradle-wrapper-1.properties'), 'utf8' ); const propertiesFile2 = readFileSync( - 'test/datasource/gradle-wrapper/_fixtures/gradle-wrapper-2.properties', + resolve(__dirname, './__fixtures__/gradle-wrapper-2.properties'), 'utf8' ); diff --git a/lib/manager/gradle-wrapper/update.spec.ts b/lib/manager/gradle-wrapper/update.spec.ts index fc23c3217ac50c7eb0838d3903b3dbe9fa93e0e9..b568c343ca74f510f1f85af44aaa3d0b12eaa49e 100644 --- a/lib/manager/gradle-wrapper/update.spec.ts +++ b/lib/manager/gradle-wrapper/update.spec.ts @@ -7,7 +7,7 @@ jest.mock('../../util/got'); const got: jest.Mock<any> = _got as any; const propertiesFile2 = fs.readFileSync( - 'test/datasource/gradle-wrapper/_fixtures/gradle-wrapper-2.properties', + 'lib/manager/gradle-wrapper/__fixtures__/gradle-wrapper-2.properties', 'utf8' ); diff --git a/test/datasource/gradle/_fixtures/MultiProjectUpdatesReport.json b/lib/manager/gradle/__fixtures__/MultiProjectUpdatesReport.json similarity index 100% rename from test/datasource/gradle/_fixtures/MultiProjectUpdatesReport.json rename to lib/manager/gradle/__fixtures__/MultiProjectUpdatesReport.json diff --git a/test/datasource/gradle/_fixtures/build.gradle.example1 b/lib/manager/gradle/__fixtures__/build.gradle.example1 similarity index 100% rename from test/datasource/gradle/_fixtures/build.gradle.example1 rename to lib/manager/gradle/__fixtures__/build.gradle.example1 diff --git a/test/datasource/gradle/_fixtures/updatesReport.json b/lib/manager/gradle/__fixtures__/updatesReport.json similarity index 100% rename from test/datasource/gradle/_fixtures/updatesReport.json rename to lib/manager/gradle/__fixtures__/updatesReport.json diff --git a/test/datasource/gradle/_fixtures/updatesReportEmpty.json b/lib/manager/gradle/__fixtures__/updatesReportEmpty.json similarity index 100% rename from test/datasource/gradle/_fixtures/updatesReportEmpty.json rename to lib/manager/gradle/__fixtures__/updatesReportEmpty.json diff --git a/lib/manager/gradle/index.spec.ts b/lib/manager/gradle/index.spec.ts index a7d7fad279bead8d348a283d1c33c65458857fa5..323182c17cb4322354af67bec8de60776bf7815d 100644 --- a/lib/manager/gradle/index.spec.ts +++ b/lib/manager/gradle/index.spec.ts @@ -27,7 +27,7 @@ const config = { }; const updatesDependenciesReport = fsReal.readFileSync( - 'test/datasource/gradle/_fixtures/updatesReport.json', + 'lib/manager/gradle/__fixtures__/updatesReport.json', 'utf8' ); @@ -79,7 +79,7 @@ describe('manager/gradle', () => { fs.readFile.mockResolvedValue( fsReal.readFileSync( - 'test/datasource/gradle/_fixtures/updatesReportEmpty.json', + 'lib/manager/gradle/__fixtures__/updatesReportEmpty.json', 'utf8' ) as any ); @@ -131,7 +131,7 @@ describe('manager/gradle', () => { const execSnapshots = mockExecAll(exec, gradleOutput); const multiProjectUpdatesReport = fsReal.readFileSync( - 'test/datasource/gradle/_fixtures/MultiProjectUpdatesReport.json', + 'lib/manager/gradle/__fixtures__/MultiProjectUpdatesReport.json', 'utf8' ); fs.readFile.mockResolvedValue(multiProjectUpdatesReport as any); @@ -226,7 +226,7 @@ describe('manager/gradle', () => { const execSnapshots = mockExecAll(exec, gradleOutput); const buildGradleContent = fsReal.readFileSync( - 'test/datasource/gradle/_fixtures/build.gradle.example1', + 'lib/manager/gradle/__fixtures__/build.gradle.example1', 'utf8' ); // prettier-ignore diff --git a/test/config/npm/_fixtures/plocktest1/package-lock.json b/lib/manager/npm/__fixtures__/plocktest1/package-lock.json similarity index 100% rename from test/config/npm/_fixtures/plocktest1/package-lock.json rename to lib/manager/npm/__fixtures__/plocktest1/package-lock.json diff --git a/test/config/npm/_fixtures/plocktest1/package.json b/lib/manager/npm/__fixtures__/plocktest1/package.json similarity index 100% rename from test/config/npm/_fixtures/plocktest1/package.json rename to lib/manager/npm/__fixtures__/plocktest1/package.json diff --git a/test/config/npm/_fixtures/plocktest1/yarn.lock b/lib/manager/npm/__fixtures__/plocktest1/yarn.lock similarity index 100% rename from test/config/npm/_fixtures/plocktest1/yarn.lock rename to lib/manager/npm/__fixtures__/plocktest1/yarn.lock diff --git a/lib/manager/npm/extract/npm.spec.ts b/lib/manager/npm/extract/npm.spec.ts index 1a5b7c5626dfed570c6b7c908822bd3af396071c..463bc74e0b35205432be09a166664946e1ff577c 100644 --- a/lib/manager/npm/extract/npm.spec.ts +++ b/lib/manager/npm/extract/npm.spec.ts @@ -13,7 +13,7 @@ describe('manager/npm/extract/npm', () => { }); it('extracts', async () => { const plocktest1Lock = readFileSync( - 'test/config/npm/_fixtures/plocktest1/package-lock.json' + 'lib/manager/npm/__fixtures__/plocktest1/package-lock.json' ); platform.getFile.mockReturnValueOnce(plocktest1Lock); const res = await getNpmLock('package.json'); diff --git a/lib/manager/npm/extract/yarn.spec.ts b/lib/manager/npm/extract/yarn.spec.ts index e8cf1f19d56c24c67a62c8754a40e00b23ac2725..01e39e4e7ff99c5fece256285caab2c6aa2b7663 100644 --- a/lib/manager/npm/extract/yarn.spec.ts +++ b/lib/manager/npm/extract/yarn.spec.ts @@ -13,7 +13,7 @@ describe('manager/npm/extract/yarn', () => { }); it('extracts', async () => { const plocktest1Lock = readFileSync( - 'test/config/npm/_fixtures/plocktest1/yarn.lock', + 'lib/manager/npm/__fixtures__/plocktest1/yarn.lock', 'utf8' ); platform.getFile.mockReturnValueOnce(plocktest1Lock); diff --git a/test/datasource/nuget/_fixtures/.gitignore b/lib/manager/nuget/__fixtures__/.gitignore similarity index 100% rename from test/datasource/nuget/_fixtures/.gitignore rename to lib/manager/nuget/__fixtures__/.gitignore diff --git a/test/datasource/nuget/_fixtures/sample.csproj b/lib/manager/nuget/__fixtures__/sample.csproj similarity index 100% rename from test/datasource/nuget/_fixtures/sample.csproj rename to lib/manager/nuget/__fixtures__/sample.csproj diff --git a/lib/manager/nuget/extract.spec.ts b/lib/manager/nuget/extract.spec.ts index 87c6235944aa3a7b5a220a557ca4b07dae086b82..f37007c10d53f9276bdce8a10ebb78f86e5d8577 100644 --- a/lib/manager/nuget/extract.spec.ts +++ b/lib/manager/nuget/extract.spec.ts @@ -2,7 +2,7 @@ import { readFileSync } from 'fs'; import { extractPackageFile } from './extract'; const sample = readFileSync( - 'test/datasource/nuget/_fixtures/sample.csproj', + 'lib/manager/nuget/__fixtures__/sample.csproj', 'utf8' ); diff --git a/lib/manager/nuget/update.spec.ts b/lib/manager/nuget/update.spec.ts index 71cad62857149acc24ae208313ff2c5ea6f506eb..7aa521e41cbf7706ae52818cc8513fa04a38b45b 100644 --- a/lib/manager/nuget/update.spec.ts +++ b/lib/manager/nuget/update.spec.ts @@ -2,7 +2,7 @@ import { readFileSync } from 'fs'; import { updateDependency } from './update'; const csProj = readFileSync( - 'test/datasource/nuget/_fixtures/sample.csproj', + 'lib/manager/nuget/__fixtures__/sample.csproj', 'utf8' ); diff --git a/test/datasource/terraform/_fixtures/1.tf b/lib/manager/terraform/__fixtures__/1.tf similarity index 100% rename from test/datasource/terraform/_fixtures/1.tf rename to lib/manager/terraform/__fixtures__/1.tf diff --git a/lib/manager/terraform/extract.spec.ts b/lib/manager/terraform/extract.spec.ts index 6815e0be83d66bb24685548de17240f0817a039c..fefeef86f2d1edd4a8363b971d04b91fca488ac2 100644 --- a/lib/manager/terraform/extract.spec.ts +++ b/lib/manager/terraform/extract.spec.ts @@ -5,7 +5,7 @@ import { getTerraformDependencyType, } from './extract'; -const tf1 = readFileSync('test/datasource/terraform/_fixtures/1.tf', 'utf8'); +const tf1 = readFileSync('lib/manager/terraform/__fixtures__/1.tf', 'utf8'); const tf2 = `module "relative" { source = "../../modules/fe" } diff --git a/lib/manager/terraform/update.spec.ts b/lib/manager/terraform/update.spec.ts index 93345d8b1fa9ff02c83ca7211f9b8b88ccced6df..ca76e8227f9422ab8a94675ac9c6caff52a12f18 100644 --- a/lib/manager/terraform/update.spec.ts +++ b/lib/manager/terraform/update.spec.ts @@ -1,7 +1,7 @@ import { readFileSync } from 'fs'; import { updateDependency } from './update'; -const tf1 = readFileSync('test/datasource/terraform/_fixtures/1.tf', 'utf8'); +const tf1 = readFileSync('lib/manager/terraform/__fixtures__/1.tf', 'utf8'); describe('manager/terraform/update', () => { describe('updateDependency', () => { diff --git a/test/static-files.spec.ts b/test/static-files.spec.ts index 2ae74831045de9de90bfbc9e51d7de18214de8ef..946164b1abfa861c039ba792668c00ed3004fc5b 100644 --- a/test/static-files.spec.ts +++ b/test/static-files.spec.ts @@ -22,6 +22,6 @@ async function getFiles(dir: string): Promise<string[]> { describe('static-files', () => { it('has same static files in lib and dist', async () => { - expect(await getFiles('lib')).toEqual(await getFiles('dist')); + expect(await getFiles('dist')).toEqual(await getFiles('lib')); }); });