simon/semantic-release
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: harmonize git-utils functions name

Browse Source
This commit is contained in:
Pierre Vanduynslager 2018-07-02 18:24:28 -04:00
parent 4abda31f83
commit 2d3a5e53e9
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/git.test.js
View File

@ -23,7 +23,7 @@ import {
gitAddConfig, gitAddConfig,
gitCommitTag, gitCommitTag,
gitRemoteTagHead, gitRemoteTagHead,
push as pushUtil, gitPush,
} from './helpers/git-utils'; } from './helpers/git-utils';
// Save the current working diretory // Save the current working diretory
@ -190,7 +190,7 @@ test.serial('Throws error if obtaining the tags fails', async t => {
test.serial('Return "true" if repository is up to date', async t => { test.serial('Return "true" if repository is up to date', async t => {
const repositoryUrl = await gitRepo(true); const repositoryUrl = await gitRepo(true);
await gitCommits(['First']); await gitCommits(['First']);
await pushUtil(); await gitPush();
t.true(await isBranchUpToDate(repositoryUrl, 'master')); t.true(await isBranchUpToDate(repositoryUrl, 'master'));
}); });
@ -200,13 +200,13 @@ test.serial('Return falsy if repository is not up to date', async t => {
const repoDir = process.cwd(); const repoDir = process.cwd();
await gitCommits(['First']); await gitCommits(['First']);
await gitCommits(['Second']); await gitCommits(['Second']);
await pushUtil(); await gitPush();
t.true(await isBranchUpToDate(repositoryUrl, 'master')); t.true(await isBranchUpToDate(repositoryUrl, 'master'));
await gitShallowClone(repositoryUrl); await gitShallowClone(repositoryUrl);
await gitCommits(['Third']); await gitCommits(['Third']);
await pushUtil(); await gitPush();
process.chdir(repoDir); process.chdir(repoDir);
t.falsy(await isBranchUpToDate(repositoryUrl, 'master')); t.falsy(await isBranchUpToDate(repositoryUrl, 'master'));
@ -215,7 +215,7 @@ test.serial('Return falsy if repository is not up to date', async t => {
test.serial('Return "true" if local repository is ahead', async t => { test.serial('Return "true" if local repository is ahead', async t => {
const repositoryUrl = await gitRepo(true); const repositoryUrl = await gitRepo(true);
await gitCommits(['First']); await gitCommits(['First']);
await pushUtil(); await gitPush();
await gitCommits(['Second']); await gitCommits(['Second']);
t.true(await isBranchUpToDate(repositoryUrl, 'master')); t.true(await isBranchUpToDate(repositoryUrl, 'master'));

2
test/helpers/git-utils.js
View File

@ -209,6 +209,6 @@ export async function gitCommitTag(gitHead) {
* @param {String} branch The branch to push. * @param {String} branch The branch to push.
* @throws {Error} if the push failed. * @throws {Error} if the push failed.
*/ */
export async function push(repositoryUrl = 'origin', branch = 'master') { export async function gitPush(repositoryUrl = 'origin', branch = 'master') {
await execa('git', ['push', '--tags', repositoryUrl, `HEAD:${branch}`]); await execa('git', ['push', '--tags', repositoryUrl, `HEAD:${branch}`]);
} }

36
test/index.test.js
View File

@ -13,7 +13,7 @@ import {
gitCommits, gitCommits,
gitTagVersion, gitTagVersion,
gitRemoteTagHead, gitRemoteTagHead,
push, gitPush,
gitShallowClone, gitShallowClone,
} from './helpers/git-utils'; } from './helpers/git-utils';
@ -58,7 +58,7 @@ test.serial('Plugins are called with expected values', async t => {
await gitTagVersion('v1.0.0'); await gitTagVersion('v1.0.0');
// Add new commits to the master branch // Add new commits to the master branch
commits = (await gitCommits(['Second'])).concat(commits); commits = (await gitCommits(['Second'])).concat(commits);
await push(); await gitPush();
const lastRelease = {version: '1.0.0', gitHead: commits[commits.length - 1].hash, gitTag: 'v1.0.0'}; const lastRelease = {version: '1.0.0', gitHead: commits[commits.length - 1].hash, gitTag: 'v1.0.0'};
const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'}; const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'};
@ -170,7 +170,7 @@ test.serial('Use custom tag format', async t => {
await gitCommits(['First']); await gitCommits(['First']);
await gitTagVersion('test-1.0.0'); await gitTagVersion('test-1.0.0');
await gitCommits(['Second']); await gitCommits(['Second']);
await push(); await gitPush();
const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'test-2.0.0'}; const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'test-2.0.0'};
const notes = 'Release notes'; const notes = 'Release notes';
@ -207,7 +207,7 @@ test.serial('Use new gitHead, and recreate release notes if a prepare plugin cre
await gitTagVersion('v1.0.0'); await gitTagVersion('v1.0.0');
// Add new commits to the master branch // Add new commits to the master branch
commits = (await gitCommits(['Second'])).concat(commits); commits = (await gitCommits(['Second'])).concat(commits);
await push(); await gitPush();
const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'}; const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'};
const notes = 'Release notes'; const notes = 'Release notes';
@ -267,7 +267,7 @@ test.serial('Call all "success" plugins even if one errors out', async t => {
await gitTagVersion('v1.0.0'); await gitTagVersion('v1.0.0');
// Add new commits to the master branch // Add new commits to the master branch
await gitCommits(['Second']); await gitCommits(['Second']);
await push(); await gitPush();
const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'}; const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'};
const notes = 'Release notes'; const notes = 'Release notes';
@ -315,7 +315,7 @@ test.serial('Log all "verifyConditions" errors', async t => {
const repositoryUrl = await gitRepo(true); const repositoryUrl = await gitRepo(true);
// Add commits to the master branch // Add commits to the master branch
await gitCommits(['First']); await gitCommits(['First']);
await push(); await gitPush();
const error1 = new Error('error 1'); const error1 = new Error('error 1');
const error2 = new SemanticReleaseError('error 2', 'ERR2'); const error2 = new SemanticReleaseError('error 2', 'ERR2');
@ -358,7 +358,7 @@ test.serial('Log all "verifyRelease" errors', async t => {
await gitTagVersion('v1.0.0'); await gitTagVersion('v1.0.0');
// Add new commits to the master branch // Add new commits to the master branch
await gitCommits(['Second']); await gitCommits(['Second']);
await push(); await gitPush();
const error1 = new SemanticReleaseError('error 1', 'ERR1'); const error1 = new SemanticReleaseError('error 1', 'ERR1');
const error2 = new SemanticReleaseError('error 2', 'ERR2'); const error2 = new SemanticReleaseError('error 2', 'ERR2');
@ -395,7 +395,7 @@ test.serial('Dry-run skips publish and success', async t => {
await gitTagVersion('v1.0.0'); await gitTagVersion('v1.0.0');
// Add new commits to the master branch // Add new commits to the master branch
await gitCommits(['Second']); await gitCommits(['Second']);
await push(); await gitPush();
const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'}; const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'};
const notes = 'Release notes'; const notes = 'Release notes';
@ -444,7 +444,7 @@ test.serial('Dry-run skips fail', async t => {
await gitTagVersion('v1.0.0'); await gitTagVersion('v1.0.0');
// Add new commits to the master branch // Add new commits to the master branch
await gitCommits(['Second']); await gitCommits(['Second']);
await push(); await gitPush();
const error1 = new SemanticReleaseError('error 1', 'ERR1'); const error1 = new SemanticReleaseError('error 1', 'ERR1');
const error2 = new SemanticReleaseError('error 2', 'ERR2'); const error2 = new SemanticReleaseError('error 2', 'ERR2');
@ -479,7 +479,7 @@ test.serial('Force a dry-run if not on a CI and "noCi" is not explicitly set', a
await gitTagVersion('v1.0.0'); await gitTagVersion('v1.0.0');
// Add new commits to the master branch // Add new commits to the master branch
await gitCommits(['Second']); await gitCommits(['Second']);
await push(); await gitPush();
const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'}; const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'};
const notes = 'Release notes'; const notes = 'Release notes';
@ -529,7 +529,7 @@ test.serial('Allow local releases with "noCi" option', async t => {
await gitTagVersion('v1.0.0'); await gitTagVersion('v1.0.0');
// Add new commits to the master branch // Add new commits to the master branch
await gitCommits(['Second']); await gitCommits(['Second']);
await push(); await gitPush();
const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'}; const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'};
const notes = 'Release notes'; const notes = 'Release notes';
@ -583,7 +583,7 @@ test.serial('Accept "undefined" value returned by the "generateNotes" plugins',
await gitTagVersion('v1.0.0'); await gitTagVersion('v1.0.0');
// Add new commits to the master branch // Add new commits to the master branch
commits = (await gitCommits(['Second'])).concat(commits); commits = (await gitCommits(['Second'])).concat(commits);
await push(); await gitPush();
const lastRelease = {version: '1.0.0', gitHead: commits[commits.length - 1].hash, gitTag: 'v1.0.0'}; const lastRelease = {version: '1.0.0', gitHead: commits[commits.length - 1].hash, gitTag: 'v1.0.0'};
const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'}; const nextRelease = {type: 'major', version: '2.0.0', gitHead: await getGitHead(), gitTag: 'v2.0.0'};
@ -648,10 +648,10 @@ test.serial('Returns falsy value if triggered on an outdated clone', async t =>
// Add commits to the master branch // Add commits to the master branch
await gitCommits(['First']); await gitCommits(['First']);
await gitCommits(['Second']); await gitCommits(['Second']);
await push(); await gitPush();
await gitShallowClone(repositoryUrl); await gitShallowClone(repositoryUrl);
await gitCommits(['Third']); await gitCommits(['Third']);
await push(); await gitPush();
process.chdir(repoDir); process.chdir(repoDir);
const semanticRelease = proxyquire('..', { const semanticRelease = proxyquire('..', {
@ -699,7 +699,7 @@ test.serial('Returns falsy value if there is no relevant changes', async t => {
const repositoryUrl = await gitRepo(true); const repositoryUrl = await gitRepo(true);
// Add commits to the master branch // Add commits to the master branch
await gitCommits(['First']); await gitCommits(['First']);
await push(); await gitPush();
const analyzeCommits = stub().resolves(); const analyzeCommits = stub().resolves();
const verifyRelease = stub().resolves(); const verifyRelease = stub().resolves();
@ -749,7 +749,7 @@ test.serial('Exclude commits with [skip release] or [release skip] from analysis
'Test commit\n\n commit body\n[skip release]', 'Test commit\n\n commit body\n[skip release]',
'Test commit\n\n commit body\n[release skip]', 'Test commit\n\n commit body\n[release skip]',
]); ]);
await push(); await gitPush();
const analyzeCommits = stub().resolves(); const analyzeCommits = stub().resolves();
const config = {branch: 'master', repositoryUrl, globalOpt: 'global'}; const config = {branch: 'master', repositoryUrl, globalOpt: 'global'};
const options = { const options = {
@ -874,7 +874,7 @@ test.serial('Throw an Error if plugin returns an unexpected value', async t => {
await gitTagVersion('v1.0.0'); await gitTagVersion('v1.0.0');
// Add new commits to the master branch // Add new commits to the master branch
await gitCommits(['Second']); await gitCommits(['Second']);
await push(); await gitPush();
const verifyConditions = stub().resolves(); const verifyConditions = stub().resolves();
const analyzeCommits = stub().resolves('string'); const analyzeCommits = stub().resolves('string');
@ -903,7 +903,7 @@ test.serial('Get all commits including the ones not in the shallow clone', async
const repositoryUrl = await gitRepo(true); const repositoryUrl = await gitRepo(true);
await gitTagVersion('v1.0.0'); await gitTagVersion('v1.0.0');
await gitCommits(['First', 'Second', 'Third']); await gitCommits(['First', 'Second', 'Third']);
await push(repositoryUrl, 'master'); await gitPush(repositoryUrl, 'master');
await gitShallowClone(repositoryUrl); await gitShallowClone(repositoryUrl);

4
test/integration.test.js
View File

@ -2,7 +2,7 @@ import test from 'ava';
import {writeJson, readJson} from 'fs-extra'; import {writeJson, readJson} from 'fs-extra';
import {stub} from 'sinon'; import {stub} from 'sinon';
import execa from 'execa'; import execa from 'execa';
import {gitHead as getGitHead, gitTagHead, gitRepo, gitCommits, gitRemoteTagHead, push} from './helpers/git-utils'; import {gitHead as getGitHead, gitTagHead, gitRepo, gitCommits, gitRemoteTagHead, gitPush} from './helpers/git-utils';
import gitbox from './helpers/gitbox'; import gitbox from './helpers/gitbox';
import mockServer from './helpers/mockserver'; import mockServer from './helpers/mockserver';
import npmRegistry from './helpers/npm-registry'; import npmRegistry from './helpers/npm-registry';
@ -609,7 +609,7 @@ test.serial('Exit with 1 if missing permission to push to the remote repository'
/* Initial release */ /* Initial release */
t.log('Commit a feature'); t.log('Commit a feature');
await gitCommits(['feat: Initial commit']); await gitCommits(['feat: Initial commit']);
await push(); await gitPush();
t.log('$ semantic-release'); t.log('$ semantic-release');
const {stdout, code} = await execa( const {stdout, code} = await execa(
cli, cli,