Fix failing service tests for [bintray npmlicense github crates] (#2401)

Closes #2343 #2348 #2402

Ref: #2345 #1359

services/bintray/bintray.tester.js

@@ -1,12 +1,12 @@
 'use strict'
 
 const Joi = require('joi')
-const createServiceTester = require('../create-service-tester')
 const { colorScheme } = require('../test-helpers')
-const { isVPlusDottedVersionNClauses } = require('../test-validators')
-
-const t = createServiceTester()
+const {
+  isVPlusDottedVersionNClausesWithOptionalSuffix,
+} = require('../test-validators')
 
+const t = require('../create-service-tester')()
 module.exports = t
 
 t.create('version')
@@ -14,7 +14,7 @@ t.create('version')
   .expectJSONTypes(
     Joi.object().keys({
       name: 'bintray',
-      value: isVPlusDottedVersionNClauses,
+      value: isVPlusDottedVersionNClausesWithOptionalSuffix,
     })
   )
 

services/crates/crates-license.tester.js

@@ -0,0 +1,18 @@
+'use strict'
+
+const ServiceTester = require('../service-tester')
+
+const t = new ServiceTester({
+  id: 'crates',
+  title: 'crates.io',
+  pathPrefix: '/crates/l',
+})
+module.exports = t
+
+t.create('license')
+  .get('/libc.json')
+  .expectJSON({ name: 'license', value: 'MIT OR Apache-2.0' })
+
+t.create('license (with version)')
+  .get('/libc/0.2.31.json')
+  .expectJSON({ name: 'license', value: 'MIT OR Apache-2.0' })

services/crates/crates.tester.js

@@ -1,14 +0,0 @@
-'use strict'
-
-const ServiceTester = require('../service-tester')
-
-const t = new ServiceTester({ id: 'crates', title: 'crates.io' })
-module.exports = t
-
-t.create('license')
-  .get('/l/libc.json')
-  .expectJSON({ name: 'license', value: 'MIT/Apache-2.0' })
-
-t.create('license (with version)')
-  .get('/l/libc/0.2.31.json')
-  .expectJSON({ name: 'license', value: 'MIT/Apache-2.0' })

services/github/github.tester.js

@@ -484,11 +484,11 @@ t.create('Package version (repo not found)')
 
 t.create('Package name')
   .get('/package-json/n/badges/shields.json')
-  .expectJSON({ name: 'package name', value: 'gh-badges' })
+  .expectJSON({ name: 'package name', value: 'shields.io' })
 
 t.create('Package name - Custom label')
   .get('/package-json/name/badges/shields.json?label=Dev Name')
-  .expectJSON({ name: 'Dev Name', value: 'gh-badges' })
+  .expectJSON({ name: 'Dev Name', value: 'shields.io' })
 
 t.create('Package array')
   .get('/package-json/keywords/badges/shields.json')

services/npm/npm-license.tester.js

@@ -80,7 +80,7 @@ t.create('license for package with a license array')
   .expectJSON({
     name: 'license',
     value: 'MPL-2.0, MIT',
-    colorB: colorsB.lightgrey,
+    colorB: colorsB.green,
   })
 
 t.create('license for unknown package')