Migrated most service tests to use new expectBadge (#3122)

services/gem/gem-downloads.tester.js

@@ -1,74 +1,65 @@
 'use strict'
 
-const Joi = require('joi')
 const { isMetric } = require('../test-validators')
 const t = (module.exports = require('../tester').createServiceTester())
 
 t.create('total downloads (valid)')
   .get('/dt/rails.json')
-  .expectJSONTypes(
-    Joi.object().keys({
-      name: 'downloads',
-      value: isMetric,
-    })
-  )
+  .expectBadge({
+    label: 'downloads',
+    message: isMetric,
+  })
 
 t.create('total downloads (not found)')
   .get('/dt/not-a-package.json')
-  .expectJSON({ name: 'downloads', value: 'gem not found' })
+  .expectBadge({ label: 'downloads', message: 'gem not found' })
 
 t.create('version downloads (valid, stable version)')
   .get('/dv/rails/stable.json')
-  .expectJSONTypes(
-    Joi.object().keys({
-      name: 'downloads@stable',
-      value: isMetric,
-    })
-  )
+  .expectBadge({
+    label: 'downloads@stable',
+    message: isMetric,
+  })
 
 t.create('version downloads (valid, specific version)')
   .get('/dv/rails/4.1.0.json')
-  .expectJSONTypes(
-    Joi.object().keys({
-      name: 'downloads@4.1.0',
-      value: isMetric,
-    })
-  )
+  .expectBadge({
+    label: 'downloads@4.1.0',
+    message: isMetric,
+  })
 
 t.create('version downloads (package not found)')
   .get('/dv/not-a-package/4.1.0.json')
-  .expectJSON({ name: 'downloads', value: 'gem not found' })
+  .expectBadge({ label: 'downloads', message: 'gem not found' })
 
 t.create('version downloads (valid package, invalid version)')
   .get('/dv/rails/not-a-version.json')
-  .expectJSON({
-    name: 'downloads',
-    value: 'version should be "stable" or valid semver',
+  .expectBadge({
+    label: 'downloads',
+    message: 'version should be "stable" or valid semver',
   })
 
 t.create('version downloads (valid package, version not found)')
   .get('/dv/rails/8.8.8.json')
-  .expectJSON({
-    name: 'downloads',
-    value: 'version not found',
+  .expectBadge({
+    label: 'downloads',
+    message: 'version not found',
   })
 
 t.create('version downloads (valid package, version not specified)')
   .get('/dv/rails.json')
-  .expectJSON({
-    name: 'downloads',
-    value: 'version downloads requires a version',
+  .expectBadge({
+    label: 'downloads',
+    message: 'version downloads requires a version',
   })
 
 t.create('latest version downloads (valid)')
   .get('/dtv/rails.json')
-  .expectJSONTypes(
-    Joi.object().keys({
-      name: 'downloads@latest',
-      value: isMetric,
-    })
-  )
+  .expectBadge({
+    label: 'downloads@latest',
+    message: isMetric,
+  })
 
 t.create('latest version downloads (not found)')
   .get('/dtv/not-a-package.json')
-  .expectJSON({ name: 'downloads', value: 'gem not found' })
+  .expectBadge({ label: 'downloads', message: 'gem not found' })

services/gem/gem-owner.tester.js

@@ -5,13 +5,11 @@ const t = (module.exports = require('../tester').createServiceTester())
 
 t.create('users (valid)')
   .get('/raphink.json')
-  .expectJSONTypes(
-    Joi.object().keys({
-      name: 'gems',
-      value: Joi.string().regex(/^[0-9]+$/),
-    })
-  )
+  .expectBadge({
+    label: 'gems',
+    message: Joi.string().regex(/^[0-9]+$/),
+  })
 
 t.create('users (not found)')
   .get('/not-a-package.json')
-  .expectJSON({ name: 'gems', value: 'not found' })
+  .expectBadge({ label: 'gems', message: 'not found' })

services/gem/gem-rank.tester.js

@@ -10,25 +10,21 @@ const isOrdinalNumberDaily = Joi.string().regex(
 
 t.create('total rank (valid)')
   .get('/rt/rspec-puppet-facts.json')
-  .expectJSONTypes(
-    Joi.object().keys({
-      name: 'rank',
-      value: isOrdinalNumber,
-    })
-  )
+  .expectBadge({
+    label: 'rank',
+    message: isOrdinalNumber,
+  })
 
 t.create('daily rank (valid)')
   .get('/rd/rails.json')
-  .expectJSONTypes(
-    Joi.object().keys({
-      name: 'rank',
-      value: isOrdinalNumberDaily,
-    })
-  )
+  .expectBadge({
+    label: 'rank',
+    message: isOrdinalNumberDaily,
+  })
 
 t.create('rank (not found)')
   .get('/rt/not-a-package.json')
-  .expectJSON({ name: 'rank', value: 'not found' })
+  .expectBadge({ label: 'rank', message: 'not found' })
 
 t.create('rank is null')
   .get('/rd/rails.json')
@@ -42,4 +38,4 @@ t.create('rank is null')
         },
       ])
   )
-  .expectJSON({ name: 'rank', value: 'invalid rank' })
+  .expectBadge({ label: 'rank', message: 'invalid rank' })

services/gem/gem-version.tester.js

@@ -1,18 +1,15 @@
 'use strict'
 
-const Joi = require('joi')
 const { isVPlusDottedVersionAtLeastOne } = require('../test-validators')
 const t = (module.exports = require('../tester').createServiceTester())
 
 t.create('version (valid)')
   .get('/formatador.json')
-  .expectJSONTypes(
-    Joi.object().keys({
-      name: 'gem',
-      value: isVPlusDottedVersionAtLeastOne,
-    })
-  )
+  .expectBadge({
+    label: 'gem',
+    message: isVPlusDottedVersionAtLeastOne,
+  })
 
 t.create('version (not found)')
   .get('/not-a-package.json')
-  .expectJSON({ name: 'gem', value: 'not found' })
+  .expectBadge({ label: 'gem', message: 'not found' })