From 32671dfd870d9da3663bb1309fcaf07f05bbb3b8 Mon Sep 17 00:00:00 2001 From: Pyves Date: Mon, 18 Dec 2017 05:58:28 +0100 Subject: [PATCH] Removal of hasPrefix function in badge-data.js (#1376) * Removed hasPrefix method and added tests to cover prependPrefix --- lib/badge-data.js | 8 ++------ lib/badge-data.spec.js | 12 +++++------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/lib/badge-data.js b/lib/badge-data.js index 6af02b15ee..31ca18c93f 100644 --- a/lib/badge-data.js +++ b/lib/badge-data.js @@ -17,14 +17,10 @@ function isDataUri(s) { return s !== undefined && /^(data:)([^;]+);([^,]+),(.+)$/.test(s); } -function hasPrefix(s, prefix) { - return s !== undefined && s.slice(0, prefix.length) === prefix; -} - function prependPrefix(s, prefix) { if (s === undefined) { return undefined; - } else if (hasPrefix(s, prefix)) { + } else if (s.startsWith(prefix)) { return s; } else { return prefix + s; @@ -102,7 +98,7 @@ function makeBadgeData(defaultLabel, overrides) { } module.exports = { - hasPrefix, + prependPrefix, isDataUri, isValidStyle, isSixHex, diff --git a/lib/badge-data.spec.js b/lib/badge-data.spec.js index b7d131c43f..aed74df587 100644 --- a/lib/badge-data.spec.js +++ b/lib/badge-data.spec.js @@ -4,7 +4,7 @@ const assert = require('assert'); const { test, given, forCases } = require('sazerac'); const { isDataUri, - hasPrefix, + prependPrefix, isSixHex, makeLabel, makeLogo, @@ -13,12 +13,10 @@ const { } = require('./badge-data'); describe('Badge data helpers', function() { - test(hasPrefix, () => { - forCases([ - given('data:image/svg+xml;base64,PHN2ZyB4bWxu', 'data:'), - given('data:foobar', 'data:'), - ]).expect(true); - given('foobar', 'data:').expect(false); + test(prependPrefix, () => { + given('data:image/svg+xml;base64,PHN2ZyB4bWxu', 'data:').expect('data:image/svg+xml;base64,PHN2ZyB4bWxu'); + given('foobar', 'data:').expect('data:foobar'); + given(undefined, 'data:').expect(undefined); }); test(isDataUri, () => {