diff --git a/services/coveralls/coveralls-redirector.service.js b/services/coveralls/coveralls-redirector.service.js index feef26774b372dedcf7742bcac5fe4b005d4068e..f77e9578e23cf2e8dcbb727d8088b808077aaae4 100644 --- a/services/coveralls/coveralls-redirector.service.js +++ b/services/coveralls/coveralls-redirector.service.js @@ -25,7 +25,7 @@ export default [ dateAdded: new Date('2021-02-23'), }), redirector({ - name: 'CoverallsPreGitlabRedirect', + name: 'CoverallsPreGitlabRedirectWithBranch', category: 'coverage', route: { base: 'coveralls', @@ -36,4 +36,15 @@ export default [ transformQueryParams: ({ branch }) => ({ branch }), dateAdded: new Date('2022-11-10'), }), + redirector({ + name: 'CoverallsPreGitlabRedirectWithoutBranch', + category: 'coverage', + route: { + base: 'coveralls', + pattern: ':vcsType(github|bitbucket)/:user/:repo', + }, + transformPath: ({ vcsType, user, repo }) => + `/coverallsCoverage/${vcsType}/${user}/${repo}`, + dateAdded: new Date('2022-11-20'), + }), ] diff --git a/services/coveralls/coveralls-redirector.tester.js b/services/coveralls/coveralls-redirector.tester.js index 1b5fa894584881af182ed32e4ad1709494e988ee..d258169c0f323729b595ab0b22536da0831472f6 100644 --- a/services/coveralls/coveralls-redirector.tester.js +++ b/services/coveralls/coveralls-redirector.tester.js @@ -20,6 +20,12 @@ t.create( .get('/github/jekyll/jekyll/master.svg') .expectRedirect('/coverallsCoverage/github/jekyll/jekyll.svg?branch=master') +t.create( + 'Redirect from before branch was a query param - github, without specified branch' +) + .get('/github/badges/shields') + .expectRedirect('/coverallsCoverage/github/badges/shields.svg') + t.create( 'Redirect from before branch was a query param - bitbucket, with specified branch' ) @@ -27,3 +33,9 @@ t.create( .expectRedirect( '/coverallsCoverage/bitbucket/pyKLIP/pyklip.svg?branch=master' ) + +t.create( + 'Redirect from before branch was a query param - bitbucket, without specified branch' +) + .get('/bitbucket/pyKLIP/pyklip.svg') + .expectRedirect('/coverallsCoverage/bitbucket/pyKLIP/pyklip.svg')