Align label and message props of coalesceBadge() with internal …

…`makeBadge()`

Part of #3370, and also helps with #4950.

This is cherry-picked from #4980 but stops short of the mor substantive changes of that PR.

Also rewrites most of the tests of `coalesceBadge()` to use `.includes()`, providing IMO a slight improvement in readability.

badge-maker/lib/index.js

@@ -51,10 +51,10 @@ function _clean(format) {
     }
   })
 
+  // Legacy.
+  cleaned.label = cleaned.label || ''
+
   // convert "public" format to "internal" format
-  cleaned.text = [cleaned.label || '', cleaned.message]
-  delete cleaned.label
-  delete cleaned.message
   if ('style' in cleaned) {
     cleaned.template = cleaned.style
     delete cleaned.style

badge-maker/lib/make-badge.js

@@ -10,7 +10,8 @@ it is likely this will impact on the package's public interface in index.js
 module.exports = function makeBadge({
   format,
   template = 'flat',
-  text,
+  label,
+  message,
   color,
   labelColor,
   logo,
@@ -19,9 +20,8 @@ module.exports = function makeBadge({
   links = ['', ''],
 }) {
   // String coercion and whitespace removal.
-  text = text.map(value => `${value}`.trim())
-
-  const [label, message] = text
+  label = `${label}`.trim()
+  message = `${message}`.trim()
 
   // This ought to be the responsibility of the server, not `makeBadge`.
   if (format === 'json') {