fix: fix maintenance branch regex

This commit is contained in:
Pierre Vanduynslager
2019-05-09 10:38:02 -04:00
parent d10268a8fa
commit a0229962ce
9 changed files with 14 additions and 14 deletions
+4 -4
View File
@@ -6,9 +6,9 @@ test('Expand branches defined with globs', async t => {
const {cwd, repositoryUrl} = await gitRepo(true);
await gitCommits(['First'], {cwd});
await gitPush(repositoryUrl, 'master', {cwd});
await gitCheckout('1.1.x', true, {cwd});
await gitCheckout('1.0.x', true, {cwd});
await gitCommits(['Second'], {cwd});
await gitPush(repositoryUrl, '1.1.x', {cwd});
await gitPush(repositoryUrl, '1.0.x', {cwd});
await gitCheckout('1.x.x', true, {cwd});
await gitCommits(['Third'], {cwd});
await gitPush(repositoryUrl, '1.x.x', {cwd});
@@ -30,7 +30,7 @@ test('Expand branches defined with globs', async t => {
const branches = [
// Should match all maintenance type branches
{name: '+([1-9])?(.{+([1-9]),x}).x'},
{name: '+([0-9])?(.{+([0-9]),x}).x'},
{name: 'master', channel: 'latest'},
{name: 'next'},
{name: 'pre/{foo,bar}', channel: `\${name.replace(/^pre\\//g, '')}`, prerelease: true},
@@ -42,7 +42,7 @@ test('Expand branches defined with globs', async t => {
];
t.deepEqual(await expand({cwd}, branches), [
{name: '1.1.x'},
{name: '1.0.x'},
{name: '1.x.x'},
{name: '2.x'},
{name: 'master', channel: 'latest'},
+3 -3
View File
@@ -36,7 +36,7 @@ test('Default values, reading repositoryUrl from package.json', async t => {
// Verify the default options are set
t.deepEqual(result.branches, [
'+([1-9])?(.{+([1-9]),x}).x',
'+([0-9])?(.{+([0-9]),x}).x',
'master',
'next',
'next-major',
@@ -57,7 +57,7 @@ test('Default values, reading repositoryUrl from repo if not set in package.json
// Verify the default options are set
t.deepEqual(result.branches, [
'+([1-9])?(.{+([1-9]),x}).x',
'+([0-9])?(.{+([0-9]),x}).x',
'master',
'next',
'next-major',
@@ -79,7 +79,7 @@ test('Default values, reading repositoryUrl (http url) from package.json if not
// Verify the default options are set
t.deepEqual(result.branches, [
'+([1-9])?(.{+([1-9]),x}).x',
'+([0-9])?(.{+([0-9]),x}).x',
'master',
'next',
'next-major',