style: prettier formatting
This commit is contained in:
		
							parent
							
								
									e06eb82cff
								
							
						
					
					
						commit
						20e7a38cdb
					
				
							
								
								
									
										12
									
								
								lib/git.js
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								lib/git.js
									
									
									
									
									
								
							| @ -42,12 +42,14 @@ async function getTags(branch, execaOpts) { | |||||||
|  * @return {Promise<Array<Object>>} The list of commits between `from` and `to`. |  * @return {Promise<Array<Object>>} The list of commits between `from` and `to`. | ||||||
|  */ |  */ | ||||||
| async function getCommits(from, to, execaOpts) { | async function getCommits(from, to, execaOpts) { | ||||||
|   return (await getStream.array( |   return ( | ||||||
|     gitLogParser.parse( |     await getStream.array( | ||||||
|       {_: `${from ? from + '..' : ''}${to}`}, |       gitLogParser.parse( | ||||||
|       {cwd: execaOpts.cwd, env: {...process.env, ...execaOpts.env}} |         {_: `${from ? from + '..' : ''}${to}`}, | ||||||
|  |         {cwd: execaOpts.cwd, env: {...process.env, ...execaOpts.env}} | ||||||
|  |       ) | ||||||
|     ) |     ) | ||||||
|   )).map(({message, gitTags, ...commit}) => ({...commit, message: message.trim(), gitTags: gitTags.trim()})); |   ).map(({message, gitTags, ...commit}) => ({...commit, message: message.trim(), gitTags: gitTags.trim()})); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| /** | /** | ||||||
|  | |||||||
| @ -171,7 +171,10 @@ test('Throw SemanticReleaseError for invalid configurations', async t => { | |||||||
| }); | }); | ||||||
| 
 | 
 | ||||||
| test('Throw a SemanticReleaseError if there is duplicate branches', async t => { | test('Throw a SemanticReleaseError if there is duplicate branches', async t => { | ||||||
|   const branches = [{name: 'master', tags: []}, {name: 'master', tags: []}]; |   const branches = [ | ||||||
|  |     {name: 'master', tags: []}, | ||||||
|  |     {name: 'master', tags: []}, | ||||||
|  |   ]; | ||||||
|   const getBranches = proxyquire('../../lib/branches', {'./get-tags': () => branches, './expand': () => []}); |   const getBranches = proxyquire('../../lib/branches', {'./get-tags': () => branches, './expand': () => []}); | ||||||
| 
 | 
 | ||||||
|   const errors = [...(await t.throwsAsync(getBranches('repositoryUrl', {options: {branches}})))]; |   const errors = [...(await t.throwsAsync(getBranches('repositoryUrl', {options: {branches}})))]; | ||||||
| @ -183,7 +186,10 @@ test('Throw a SemanticReleaseError if there is duplicate branches', async t => { | |||||||
| }); | }); | ||||||
| 
 | 
 | ||||||
| test('Throw a SemanticReleaseError for each invalid branch name', async t => { | test('Throw a SemanticReleaseError for each invalid branch name', async t => { | ||||||
|   const branches = [{name: '~master', tags: []}, {name: '^master', tags: []}]; |   const branches = [ | ||||||
|  |     {name: '~master', tags: []}, | ||||||
|  |     {name: '^master', tags: []}, | ||||||
|  |   ]; | ||||||
|   const getBranches = proxyquire('../../lib/branches', {'./get-tags': () => branches, './expand': () => []}); |   const getBranches = proxyquire('../../lib/branches', {'./get-tags': () => branches, './expand': () => []}); | ||||||
| 
 | 
 | ||||||
|   const errors = [...(await t.throwsAsync(getBranches('repositoryUrl', {options: {branches}})))]; |   const errors = [...(await t.throwsAsync(getBranches('repositoryUrl', {options: {branches}})))]; | ||||||
|  | |||||||
| @ -129,7 +129,10 @@ test('Return branches with and empty tags array if no valid tag is found in hist | |||||||
| 
 | 
 | ||||||
|   const result = await getTags({cwd, options: {tagFormat: `prefix@v\${version}`}}, [{name: 'master'}, {name: 'next'}]); |   const result = await getTags({cwd, options: {tagFormat: `prefix@v\${version}`}}, [{name: 'master'}, {name: 'next'}]); | ||||||
| 
 | 
 | ||||||
|   t.deepEqual(result, [{name: 'master', tags: []}, {name: 'next', tags: []}]); |   t.deepEqual(result, [ | ||||||
|  |     {name: 'master', tags: []}, | ||||||
|  |     {name: 'next', tags: []}, | ||||||
|  |   ]); | ||||||
| }); | }); | ||||||
| 
 | 
 | ||||||
| test('Get the highest valid tag corresponding to the "tagFormat"', async t => { | test('Get the highest valid tag corresponding to the "tagFormat"', async t => { | ||||||
|  | |||||||
| @ -4,7 +4,11 @@ import normalize from '../../lib/branches/normalize'; | |||||||
| const toTags = versions => versions.map(version => ({version})); | const toTags = versions => versions.map(version => ({version})); | ||||||
| 
 | 
 | ||||||
| test('Maintenance branches - initial state', t => { | test('Maintenance branches - initial state', t => { | ||||||
|   const maintenance = [{name: '1.x', channel: '1.x', tags: []}, {name: '1.1.x', tags: []}, {name: '1.2.x', tags: []}]; |   const maintenance = [ | ||||||
|  |     {name: '1.x', channel: '1.x', tags: []}, | ||||||
|  |     {name: '1.1.x', tags: []}, | ||||||
|  |     {name: '1.2.x', tags: []}, | ||||||
|  |   ]; | ||||||
|   const release = [{name: 'master', tags: []}]; |   const release = [{name: 'master', tags: []}]; | ||||||
|   t.deepEqual( |   t.deepEqual( | ||||||
|     normalize.maintenance({maintenance, release}).map(({type, name, range, accept, channel, mergeRange}) => ({ |     normalize.maintenance({maintenance, release}).map(({type, name, range, accept, channel, mergeRange}) => ({ | ||||||
| @ -303,24 +307,35 @@ test('Prerelease branches', t => { | |||||||
|     {name: 'alpha', prerelease: 'preview', tags: []}, |     {name: 'alpha', prerelease: 'preview', tags: []}, | ||||||
|   ]; |   ]; | ||||||
| 
 | 
 | ||||||
|   t.deepEqual(normalize.prerelease({prerelease}).map(({type, name, channel}) => ({type, name, channel})), [ |   t.deepEqual( | ||||||
|     {type: 'prerelease', name: 'beta', channel: 'beta'}, |     normalize.prerelease({prerelease}).map(({type, name, channel}) => ({type, name, channel})), | ||||||
|     {type: 'prerelease', name: 'alpha', channel: 'alpha'}, |     [ | ||||||
|   ]); |       {type: 'prerelease', name: 'beta', channel: 'beta'}, | ||||||
|  |       {type: 'prerelease', name: 'alpha', channel: 'alpha'}, | ||||||
|  |     ] | ||||||
|  |   ); | ||||||
| }); | }); | ||||||
| 
 | 
 | ||||||
| test('Allow to set channel to "false" to prevent default', t => { | test('Allow to set channel to "false" to prevent default', t => { | ||||||
|   const maintenance = [{name: '1.x', channel: false, tags: []}]; |   const maintenance = [{name: '1.x', channel: false, tags: []}]; | ||||||
|   const release = [{name: 'master', channel: false, tags: []}, {name: 'next', channel: false, tags: []}]; |   const release = [ | ||||||
|  |     {name: 'master', channel: false, tags: []}, | ||||||
|  |     {name: 'next', channel: false, tags: []}, | ||||||
|  |   ]; | ||||||
|   const prerelease = [{name: 'beta', channel: false, prerelease: true, tags: []}]; |   const prerelease = [{name: 'beta', channel: false, prerelease: true, tags: []}]; | ||||||
|   t.deepEqual(normalize.maintenance({maintenance, release}).map(({name, channel}) => ({name, channel})), [ |   t.deepEqual( | ||||||
|     {name: '1.x', channel: false}, |     normalize.maintenance({maintenance, release}).map(({name, channel}) => ({name, channel})), | ||||||
|   ]); |     [{name: '1.x', channel: false}] | ||||||
|   t.deepEqual(normalize.release({release}).map(({name, channel}) => ({name, channel})), [ |   ); | ||||||
|     {name: 'master', channel: false}, |   t.deepEqual( | ||||||
|     {name: 'next', channel: false}, |     normalize.release({release}).map(({name, channel}) => ({name, channel})), | ||||||
|   ]); |     [ | ||||||
|   t.deepEqual(normalize.prerelease({prerelease}).map(({name, channel}) => ({name, channel})), [ |       {name: 'master', channel: false}, | ||||||
|     {name: 'beta', channel: false}, |       {name: 'next', channel: false}, | ||||||
|   ]); |     ] | ||||||
|  |   ); | ||||||
|  |   t.deepEqual( | ||||||
|  |     normalize.prerelease({prerelease}).map(({name, channel}) => ({name, channel})), | ||||||
|  |     [{name: 'beta', channel: false}] | ||||||
|  |   ); | ||||||
| }); | }); | ||||||
|  | |||||||
| @ -268,7 +268,10 @@ test('Exclude versions merged from release to maintenance branch if they have th | |||||||
|         {gitTag: 'v1.1.0', version: '1.1.0'}, |         {gitTag: 'v1.1.0', version: '1.1.0'}, | ||||||
|       ], |       ], | ||||||
|     }, |     }, | ||||||
|     branches: [{name: '2.x', channel: 'latest'}, {name: 'master', channel: 'latest'}], |     branches: [ | ||||||
|  |       {name: '2.x', channel: 'latest'}, | ||||||
|  |       {name: 'master', channel: 'latest'}, | ||||||
|  |     ], | ||||||
|     options: {tagFormat: `v\${version}`}, |     options: {tagFormat: `v\${version}`}, | ||||||
|   }); |   }); | ||||||
| 
 | 
 | ||||||
| @ -308,7 +311,11 @@ test('Exclude versions merged between release branches if they all have "channel | |||||||
|         {gitTag: 'v2.0.0', version: '2.0.0'}, |         {gitTag: 'v2.0.0', version: '2.0.0'}, | ||||||
|       ], |       ], | ||||||
|     }, |     }, | ||||||
|     branches: [{name: 'master', channel: false}, {name: 'next', channel: false}, {name: 'next-major', channel: false}], |     branches: [ | ||||||
|  |       {name: 'master', channel: false}, | ||||||
|  |       {name: 'next', channel: false}, | ||||||
|  |       {name: 'next-major', channel: false}, | ||||||
|  |     ], | ||||||
|     options: {tagFormat: `v\${version}`}, |     options: {tagFormat: `v\${version}`}, | ||||||
|   }); |   }); | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -86,9 +86,11 @@ export async function gitCommits(messages, execaOpts) { | |||||||
|  */ |  */ | ||||||
| export async function gitGetCommits(from, execaOpts) { | export async function gitGetCommits(from, execaOpts) { | ||||||
|   Object.assign(gitLogParser.fields, {hash: 'H', message: 'B', gitTags: 'd', committerDate: {key: 'ci', type: Date}}); |   Object.assign(gitLogParser.fields, {hash: 'H', message: 'B', gitTags: 'd', committerDate: {key: 'ci', type: Date}}); | ||||||
|   return (await getStream.array( |   return ( | ||||||
|     gitLogParser.parse({_: `${from ? from + '..' : ''}HEAD`}, {...execaOpts, env: {...process.env, ...execaOpts.env}}) |     await getStream.array( | ||||||
|   )).map(commit => { |       gitLogParser.parse({_: `${from ? from + '..' : ''}HEAD`}, {...execaOpts, env: {...process.env, ...execaOpts.env}}) | ||||||
|  |     ) | ||||||
|  |   ).map(commit => { | ||||||
|     commit.message = commit.message.trim(); |     commit.message = commit.message.trim(); | ||||||
|     commit.gitTags = commit.gitTags.trim(); |     commit.gitTags = commit.gitTags.trim(); | ||||||
|     return commit; |     return commit; | ||||||
|  | |||||||
| @ -47,7 +47,12 @@ test('Execute each function in series passing the "lastResult" and "result" to " | |||||||
|   const result = await pipeline([step1, step2, step3, step4], {settleAll: false, getNextInput})(5); |   const result = await pipeline([step1, step2, step3, step4], {settleAll: false, getNextInput})(5); | ||||||
| 
 | 
 | ||||||
|   t.deepEqual(result, [1, 2, 3, 4]); |   t.deepEqual(result, [1, 2, 3, 4]); | ||||||
|   t.deepEqual(getNextInput.args, [[5, 1], [5, 2], [5, 3], [5, 4]]); |   t.deepEqual(getNextInput.args, [ | ||||||
|  |     [5, 1], | ||||||
|  |     [5, 2], | ||||||
|  |     [5, 3], | ||||||
|  |     [5, 4], | ||||||
|  |   ]); | ||||||
| }); | }); | ||||||
| 
 | 
 | ||||||
| test('Execute each function in series calling "transform" to modify the results', async t => { | test('Execute each function in series calling "transform" to modify the results', async t => { | ||||||
| @ -61,7 +66,12 @@ test('Execute each function in series calling "transform" to modify the results' | |||||||
|   const result = await pipeline([step1, step2, step3, step4], {getNextInput, transform})(5); |   const result = await pipeline([step1, step2, step3, step4], {getNextInput, transform})(5); | ||||||
| 
 | 
 | ||||||
|   t.deepEqual(result, [1 + 1, 2 + 1, 3 + 1, 4 + 1]); |   t.deepEqual(result, [1 + 1, 2 + 1, 3 + 1, 4 + 1]); | ||||||
|   t.deepEqual(getNextInput.args, [[5, 1 + 1], [5, 2 + 1], [5, 3 + 1], [5, 4 + 1]]); |   t.deepEqual(getNextInput.args, [ | ||||||
|  |     [5, 1 + 1], | ||||||
|  |     [5, 2 + 1], | ||||||
|  |     [5, 3 + 1], | ||||||
|  |     [5, 4 + 1], | ||||||
|  |   ]); | ||||||
| }); | }); | ||||||
| 
 | 
 | ||||||
| test('Execute each function in series calling "transform" to modify the results with "settleAll"', async t => { | test('Execute each function in series calling "transform" to modify the results with "settleAll"', async t => { | ||||||
| @ -75,7 +85,12 @@ test('Execute each function in series calling "transform" to modify the results | |||||||
|   const result = await pipeline([step1, step2, step3, step4], {settleAll: true, getNextInput, transform})(5); |   const result = await pipeline([step1, step2, step3, step4], {settleAll: true, getNextInput, transform})(5); | ||||||
| 
 | 
 | ||||||
|   t.deepEqual(result, [1 + 1, 2 + 1, 3 + 1, 4 + 1]); |   t.deepEqual(result, [1 + 1, 2 + 1, 3 + 1, 4 + 1]); | ||||||
|   t.deepEqual(getNextInput.args, [[5, 1 + 1], [5, 2 + 1], [5, 3 + 1], [5, 4 + 1]]); |   t.deepEqual(getNextInput.args, [ | ||||||
|  |     [5, 1 + 1], | ||||||
|  |     [5, 2 + 1], | ||||||
|  |     [5, 3 + 1], | ||||||
|  |     [5, 4 + 1], | ||||||
|  |   ]); | ||||||
| }); | }); | ||||||
| 
 | 
 | ||||||
| test('Stop execution and throw error if a step rejects', async t => { | test('Stop execution and throw error if a step rejects', async t => { | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user