From 3efe143edc17a3bd16d07b532ee0021c3485ff35 Mon Sep 17 00:00:00 2001
From: Paula Barszcz <paula.anna.barszcz@gmail.com>
Date: Tue, 22 Nov 2022 17:34:30 +0100
Subject: [PATCH] add a missing redirect to coveralls (#8644)
Co-authored-by: repo-ranger[bot] <39074581+repo-ranger[bot]@users.noreply.github.com>
---
services/coveralls/coveralls-redirector.service.js | 13 ++++++++++++-
services/coveralls/coveralls-redirector.tester.js | 12 ++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/services/coveralls/coveralls-redirector.service.js b/services/coveralls/coveralls-redirector.service.js
index feef26774b..f77e9578e2 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 1b5fa89458..d258169c0f 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')
--
GitLab