From c8593c77c4a11bdb48c2e537993f0e25d10e3a3c Mon Sep 17 00:00:00 2001
From: Eugene Zhlobo <ezhlobo@gmail.com>
Date: Tue, 18 Sep 2018 11:03:00 +0300
Subject: [PATCH] Handle CircleCI urls with token correctly (#2087)

---
 services/circleci/circleci.service.js |  2 +-
 services/circleci/circleci.tester.js  | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/services/circleci/circleci.service.js b/services/circleci/circleci.service.js
index a9109ca579..60e57d6cc3 100644
--- a/services/circleci/circleci.service.js
+++ b/services/circleci/circleci.service.js
@@ -57,7 +57,7 @@ module.exports = class CircleCi extends BaseJsonService {
     return {
       base: 'circleci',
       format:
-        '(?:token/(w+))?[+/]?project/(?:(github|bitbucket)/)?([^/]+/[^/]+)(?:/(.*))?',
+        '(?:token/(\\w+)/)?project/(?:(github|bitbucket)/)?([^/]+/[^/]+)(?:/(.*))?',
       capture: ['token', 'vcsType', 'userRepo', 'branch'],
     }
   }
diff --git a/services/circleci/circleci.tester.js b/services/circleci/circleci.tester.js
index cfdf72cc18..05ddee44c8 100644
--- a/services/circleci/circleci.tester.js
+++ b/services/circleci/circleci.tester.js
@@ -25,6 +25,17 @@ t.create('circle ci (valid, with branch)')
     })
   )
 
+t.create('circle ci (valid, with token)')
+  .get(
+    '/token/b90b5c49e59a4c67ba3a92f7992587ac7a0408c2/project/github/RedSparr0w/node-csgo-parser/master.json'
+  )
+  .expectJSONTypes(
+    Joi.object().keys({
+      name: 'build',
+      value: isBuildStatus,
+    })
+  )
+
 t.create('circle ci (not found)')
   .get('/project/github/PyvesB/EmptyRepo.json')
   .expectJSON({ name: 'build', value: 'project not found' })