Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: remove getRepoStatus from platform #6672

Merged
merged 5 commits into from Jul 4, 2020
Merged

refactor: remove getRepoStatus from platform #6672

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a339ed
refactor: remove getRepoStatus from platform
rarkins Jul 4, 2020
2b88e6e
Merge branch 'master' into refactor/platform-get-repo-status
rarkins Jul 4, 2020
7731811
git import
rarkins Jul 4, 2020
1f894d8
Merge remote-tracking branch 'aaa-origin/master' into refactor/platfo…
rarkins Jul 4, 2020
2afb59a
mock
rarkins Jul 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 11 additions & 10 deletions lib/manager/bundler/artifacts.spec.ts
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@ import { exec as _exec } from 'child_process';
import Git from 'simple-git/promise';
import { join } from 'upath';
import { envMock, mockExecAll } from '../../../test/execUtil';
import { fs, mocked, platform } from '../../../test/util';
import { fs, git, mocked } from '../../../test/util';
import * as _datasource from '../../datasource';
import { setUtilConfig } from '../../util';
import { BinarySource } from '../../util/exec/common';
Expand All @@ -21,6 +21,7 @@ jest.mock('child_process');
jest.mock('../../../lib/util/exec/env');
jest.mock('../../../lib/datasource');
jest.mock('../../../lib/util/fs');
jest.mock('../../../lib/util/git');
jest.mock('../../../lib/util/host-rules');
jest.mock('./host-rules');

Expand Down Expand Up @@ -60,7 +61,7 @@ describe('bundler.updateArtifacts()', () => {
fs.readLocalFile.mockResolvedValueOnce('Current Gemfile.lock');
fs.writeLocalFile.mockResolvedValueOnce(null as never);
const execSnapshots = mockExecAll(exec);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: [],
} as Git.StatusResult);
fs.readLocalFile.mockResolvedValueOnce('Updated Gemfile.lock' as any);
Expand All @@ -79,7 +80,7 @@ describe('bundler.updateArtifacts()', () => {
fs.writeLocalFile.mockResolvedValueOnce(null as never);
fs.readLocalFile.mockResolvedValueOnce(null);
const execSnapshots = mockExecAll(exec);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['Gemfile.lock'],
} as Git.StatusResult);
fs.readLocalFile.mockResolvedValueOnce('Updated Gemfile.lock' as any);
Expand All @@ -98,7 +99,7 @@ describe('bundler.updateArtifacts()', () => {
fs.writeLocalFile.mockResolvedValueOnce(null as never);
fs.readLocalFile.mockResolvedValueOnce(null);
const execSnapshots = mockExecAll(exec);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['Gemfile.lock'],
} as Git.StatusResult);
fs.readLocalFile.mockResolvedValueOnce('Updated Gemfile.lock' as any);
Expand Down Expand Up @@ -132,7 +133,7 @@ describe('bundler.updateArtifacts()', () => {
],
});
const execSnapshots = mockExecAll(exec);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['Gemfile.lock'],
} as Git.StatusResult);
fs.readLocalFile.mockResolvedValueOnce('Updated Gemfile.lock' as any);
Expand Down Expand Up @@ -160,7 +161,7 @@ describe('bundler.updateArtifacts()', () => {
],
});
const execSnapshots = mockExecAll(exec);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['Gemfile.lock'],
} as Git.StatusResult);
fs.readLocalFile.mockResolvedValueOnce('Updated Gemfile.lock' as any);
Expand Down Expand Up @@ -193,7 +194,7 @@ describe('bundler.updateArtifacts()', () => {
],
});
const execSnapshots = mockExecAll(exec);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['Gemfile.lock'],
} as Git.StatusResult);
fs.readLocalFile.mockResolvedValueOnce('Updated Gemfile.lock' as any);
Expand Down Expand Up @@ -240,7 +241,7 @@ describe('bundler.updateArtifacts()', () => {
'some-user:some-password'
);
const execSnapshots = mockExecAll(exec);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['Gemfile.lock'],
} as Git.StatusResult);
fs.readLocalFile.mockResolvedValueOnce('Updated Gemfile.lock' as any);
Expand All @@ -265,7 +266,7 @@ describe('bundler.updateArtifacts()', () => {
fs.readLocalFile.mockResolvedValueOnce('Current Gemfile.lock');
fs.writeLocalFile.mockResolvedValueOnce(null as never);
const execSnapshots = mockExecAll(exec, execError);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['Gemfile.lock'],
} as Git.StatusResult);
expect(
Expand All @@ -285,7 +286,7 @@ describe('bundler.updateArtifacts()', () => {
fs.readLocalFile.mockResolvedValueOnce('Current Gemfile.lock');
fs.writeLocalFile.mockResolvedValueOnce(null as never);
const execSnapshots = mockExecAll(exec);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['Gemfile.lock'],
} as Git.StatusResult);
fs.readLocalFile.mockResolvedValueOnce('Updated Gemfile.lock' as any);
Expand Down
4 changes: 2 additions & 2 deletions lib/manager/bundler/artifacts.ts
View file
Open in desktop
@@ -1,7 +1,6 @@
import { quote } from 'shlex';
import { BUNDLER_INVALID_CREDENTIALS } from '../../constants/error-messages';
import { logger } from '../../logger';
import { platform } from '../../platform';
import { HostRule } from '../../types';
import * as memCache from '../../util/cache/memory';
import { ExecOptions, exec } from '../../util/exec';
Expand All @@ -11,6 +10,7 @@ import {
readLocalFile,
writeLocalFile,
} from '../../util/fs';
import { getRepoStatus } from '../../util/git';
import { isValid } from '../../versioning/ruby';
import { UpdateArtifact, UpdateArtifactsResult } from '../common';
import {
Expand Down Expand Up @@ -139,7 +139,7 @@ export async function updateArtifacts(
},
};
await exec(cmd, execOptions);
const status = await platform.getRepoStatus();
const status = await getRepoStatus();
if (!status.modified.includes(lockFileName)) {
return null;
}
Expand Down
15 changes: 7 additions & 8 deletions lib/manager/cocoapods/artifacts.spec.ts
View file
Open in desktop
Expand Up @@ -3,9 +3,8 @@ import _fs from 'fs-extra';
import Git from 'simple-git/promise';
import { join } from 'upath';
import { envMock, mockExecAll } from '../../../test/execUtil';
import { mocked } from '../../../test/util';
import { git, mocked } from '../../../test/util';
import * as _datasource from '../../datasource';
import { platform as _platform } from '../../platform';
import { setExecConfig } from '../../util/exec';
import { BinarySource } from '../../util/exec/common';
import * as _env from '../../util/exec/env';
Expand All @@ -14,13 +13,13 @@ import { updateArtifacts } from '.';
jest.mock('fs-extra');
jest.mock('child_process');
jest.mock('../../util/exec/env');
jest.mock('../../util/git');
jest.mock('../../platform');
jest.mock('../../datasource');

const fs: jest.Mocked<typeof _fs> = _fs as any;
const exec: jest.Mock<typeof _exec> = _exec as any;
const env = mocked(_env);
const platform = mocked(_platform);
const datasource = mocked(_datasource);

delete process.env.CP_HOME_DIR;
Expand Down Expand Up @@ -101,7 +100,7 @@ describe('.updateArtifacts()', () => {
it('returns null if unchanged', async () => {
const execSnapshots = mockExecAll(exec);
fs.readFile.mockResolvedValueOnce('Current Podfile' as any);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: [],
} as Git.StatusResult);
fs.readFile.mockResolvedValueOnce('Current Podfile' as any);
Expand All @@ -119,7 +118,7 @@ describe('.updateArtifacts()', () => {
const execSnapshots = mockExecAll(exec);
await setExecConfig({ ...config, binarySource: BinarySource.Docker });
fs.readFile.mockResolvedValueOnce('Old Podfile' as any);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['Podfile.lock'],
} as Git.StatusResult);
fs.readFile.mockResolvedValueOnce('New Podfile' as any);
Expand All @@ -139,7 +138,7 @@ describe('.updateArtifacts()', () => {
fs.readFile.mockResolvedValueOnce('Old Manifest.lock' as any);
fs.readFile.mockResolvedValueOnce('New Podfile' as any);
fs.readFile.mockResolvedValueOnce('Pods manifest' as any);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
not_added: ['Pods/New'],
modified: ['Podfile.lock', 'Pods/Manifest.lock'],
deleted: ['Pods/Deleted'],
Expand Down Expand Up @@ -198,7 +197,7 @@ describe('.updateArtifacts()', () => {

fs.readFile.mockResolvedValueOnce('New Podfile' as any);

platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['Podfile.lock'],
} as Git.StatusResult);

Expand Down Expand Up @@ -226,7 +225,7 @@ describe('.updateArtifacts()', () => {

fs.readFile.mockResolvedValueOnce('New Podfile' as any);

platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['Podfile.lock'],
} as Git.StatusResult);

Expand Down
4 changes: 2 additions & 2 deletions lib/manager/cocoapods/artifacts.ts
View file
Open in desktop
@@ -1,13 +1,13 @@
import { quote } from 'shlex';
import { dirname, join } from 'upath';
import { logger } from '../../logger';
import { platform } from '../../platform';
import { ExecOptions, exec } from '../../util/exec';
import {
getSiblingFileName,
readLocalFile,
writeLocalFile,
} from '../../util/fs';
import { getRepoStatus } from '../../util/git';
import { UpdateArtifact, UpdateArtifactsResult } from '../common';
import { getCocoaPodsHome } from './utils';

Expand Down Expand Up @@ -93,7 +93,7 @@ export async function updateArtifacts({
];
}

const status = await platform.getRepoStatus();
const status = await getRepoStatus();
if (!status.modified.includes(lockFileName)) {
return null;
}
Expand Down
13 changes: 7 additions & 6 deletions lib/manager/composer/artifacts.spec.ts
View file
Open in desktop
@@ -1,7 +1,7 @@
import { exec as _exec } from 'child_process';
import { join } from 'upath';
import { envMock, mockExecAll } from '../../../test/execUtil';
import { fs, mocked, platform } from '../../../test/util';
import { fs, git, mocked } from '../../../test/util';
import { setUtilConfig } from '../../util';
import { BinarySource } from '../../util/exec/common';
import * as docker from '../../util/exec/docker';
Expand All @@ -12,6 +12,7 @@ import * as composer from './artifacts';
jest.mock('child_process');
jest.mock('../../util/exec/env');
jest.mock('../../util/fs');
jest.mock('../../util/git');
jest.mock('../../util/host-rules');

const hostRules = require('../../util/host-rules');
Expand Down Expand Up @@ -49,7 +50,7 @@ describe('.updateArtifacts()', () => {
fs.readLocalFile.mockResolvedValueOnce('Current composer.lock' as any);
const execSnapshots = mockExecAll(exec);
fs.readLocalFile.mockReturnValueOnce('Current composer.lock' as any);
platform.getRepoStatus.mockResolvedValue({ modified: [] } as StatusResult);
git.getRepoStatus.mockResolvedValue({ modified: [] } as StatusResult);
expect(
await composer.updateArtifacts({
packageFileName: 'composer.json',
Expand All @@ -72,7 +73,7 @@ describe('.updateArtifacts()', () => {
username: 'some-username',
password: 'some-password',
});
platform.getRepoStatus.mockResolvedValue({ modified: [] } as StatusResult);
git.getRepoStatus.mockResolvedValue({ modified: [] } as StatusResult);
expect(
await composer.updateArtifacts({
packageFileName: 'composer.json',
Expand All @@ -87,7 +88,7 @@ describe('.updateArtifacts()', () => {
fs.readLocalFile.mockResolvedValueOnce('Current composer.lock' as any);
const execSnapshots = mockExecAll(exec);
fs.readLocalFile.mockReturnValueOnce('New composer.lock' as any);
platform.getRepoStatus.mockResolvedValue({
git.getRepoStatus.mockResolvedValue({
modified: ['composer.lock'],
} as StatusResult);
expect(
Expand All @@ -104,7 +105,7 @@ describe('.updateArtifacts()', () => {
fs.readLocalFile.mockResolvedValueOnce('Current composer.lock' as any);
const execSnapshots = mockExecAll(exec);
fs.readLocalFile.mockReturnValueOnce('New composer.lock' as any);
platform.getRepoStatus.mockResolvedValue({
git.getRepoStatus.mockResolvedValue({
modified: ['composer.lock'],
} as StatusResult);
expect(
Expand Down Expand Up @@ -205,7 +206,7 @@ describe('.updateArtifacts()', () => {
fs.readLocalFile.mockResolvedValueOnce('Current composer.lock' as any);
const execSnapshots = mockExecAll(exec);
fs.readLocalFile.mockReturnValueOnce('New composer.lock' as any);
platform.getRepoStatus.mockResolvedValue({
git.getRepoStatus.mockResolvedValue({
modified: ['composer.lock'],
} as StatusResult);
expect(
Expand Down
4 changes: 2 additions & 2 deletions lib/manager/composer/artifacts.ts
View file
Open in desktop
Expand Up @@ -9,7 +9,6 @@ import {
} from '../../constants/platforms';
import * as datasourcePackagist from '../../datasource/packagist';
import { logger } from '../../logger';
import { platform } from '../../platform';
import { ExecOptions, exec } from '../../util/exec';
import {
deleteLocalFile,
Expand All @@ -19,6 +18,7 @@ import {
readLocalFile,
writeLocalFile,
} from '../../util/fs';
import { getRepoStatus } from '../../util/git';
import * as hostRules from '../../util/host-rules';
import { UpdateArtifact, UpdateArtifactsResult } from '../common';

Expand Down Expand Up @@ -131,7 +131,7 @@ export async function updateArtifacts({
}
logger.debug({ cmd, args }, 'composer command');
await exec(`${cmd} ${args}`, execOptions);
const status = await platform.getRepoStatus();
const status = await getRepoStatus();
if (!status.modified.includes(lockFileName)) {
return null;
}
Expand Down
15 changes: 8 additions & 7 deletions lib/manager/gomod/artifacts.spec.ts
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@ import { exec as _exec } from 'child_process';
import _fs from 'fs-extra';
import { join } from 'upath';
import { envMock, mockExecAll } from '../../../test/execUtil';
import { mocked, platform } from '../../../test/util';
import { git, mocked } from '../../../test/util';
import { setUtilConfig } from '../../util';
import { BinarySource } from '../../util/exec/common';
import * as docker from '../../util/exec/docker';
Expand All @@ -14,6 +14,7 @@ import * as gomod from './artifacts';
jest.mock('fs-extra');
jest.mock('child_process');
jest.mock('../../util/exec/env');
jest.mock('../../util/git');
jest.mock('../../util/host-rules');
jest.mock('../../util/http');

Expand Down Expand Up @@ -73,7 +74,7 @@ describe('.updateArtifacts()', () => {
it('returns null if unchanged', async () => {
fs.readFile.mockResolvedValueOnce('Current go.sum' as any);
const execSnapshots = mockExecAll(exec);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: [],
} as StatusResult);
expect(
Expand All @@ -89,7 +90,7 @@ describe('.updateArtifacts()', () => {
it('returns updated go.sum', async () => {
fs.readFile.mockResolvedValueOnce('Current go.sum' as any);
const execSnapshots = mockExecAll(exec);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['go.sum'],
} as StatusResult);
fs.readFile.mockReturnValueOnce('New go.sum' as any);
Expand All @@ -108,7 +109,7 @@ describe('.updateArtifacts()', () => {
await setUtilConfig({ ...config, binarySource: BinarySource.Docker });
fs.readFile.mockResolvedValueOnce('Current go.sum' as any);
const execSnapshots = mockExecAll(exec);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['go.sum'],
} as StatusResult);
fs.readFile.mockReturnValueOnce('New go.sum' as any);
Expand All @@ -128,7 +129,7 @@ describe('.updateArtifacts()', () => {
it('supports global mode', async () => {
fs.readFile.mockResolvedValueOnce('Current go.sum' as any);
const execSnapshots = mockExecAll(exec);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['go.sum'],
} as StatusResult);
fs.readFile.mockReturnValueOnce('New go.sum' as any);
Expand All @@ -153,7 +154,7 @@ describe('.updateArtifacts()', () => {
});
fs.readFile.mockResolvedValueOnce('Current go.sum' as any);
const execSnapshots = mockExecAll(exec);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['go.sum'],
} as StatusResult);
fs.readFile.mockReturnValueOnce('New go.sum' as any);
Expand All @@ -178,7 +179,7 @@ describe('.updateArtifacts()', () => {
});
fs.readFile.mockResolvedValueOnce('Current go.sum' as any);
const execSnapshots = mockExecAll(exec);
platform.getRepoStatus.mockResolvedValueOnce({
git.getRepoStatus.mockResolvedValueOnce({
modified: ['go.sum'],
} as StatusResult);
fs.readFile.mockResolvedValueOnce('New go.sum 1' as any);
Expand Down