Merge branch 'master' into feat/9215/commit-activity-author-filter

badges · Jun 14, 2023 · 713374a · 713374a
2 parents 7b46dd9 + 35dfd75
commit 713374a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/services/github/github-commit-activity.service.js b/services/github/github-commit-activity.service.js
@@ -18,7 +18,7 @@ const schema = Joi.object({
         history: Joi.object({
           totalCount: nonNegativeInteger,
         }).required(),
-      }),
+      }).allow(null),
     }).required(),
   }).required(),
 }).required()

diff --git a/services/github/github-commit-activity.tester.js b/services/github/github-commit-activity.tester.js
@@ -97,6 +97,13 @@ t.create('commit activity (repo not found)')
     message: 'repo not found',
   })
 
+t.create('commit activity (invalid branch)')
+  .get('/w/badges/shields/invalidBranchName.json')
+  .expectBadge({
+    label: 'commit activity',
+    message: 'invalid branch',
+  })
+
 // test for error handling of author filter as it uses REST and not GraphQL
 t.create('commit activity (repo not found)')
   .get('/w/badges/helmets.json?authorFilter=zaphod')