mirror of
https://github.com/rastapasta/mapscii.git
synced 2024-11-25 01:23:58 +01:00
Merge pull request #46 from rastapasta/color-bug
Bug fix: utils.hex2rgb does not fail on invalid hex strings
This commit is contained in:
commit
712898aa97
@ -59,8 +59,8 @@ const utils = {
|
|||||||
hex2rgb: (color) => {
|
hex2rgb: (color) => {
|
||||||
if (typeof color !== 'string') return [255, 0, 0];
|
if (typeof color !== 'string') return [255, 0, 0];
|
||||||
|
|
||||||
if (/^#[a-fA-F0-9]{3,6}$/.test()) {
|
if (!/^#[a-fA-F0-9]{3,6}$/.test(color)) {
|
||||||
throw new Error('#{color} isn\'t a supported hex color');
|
throw new Error(`${color} isn't a supported hex color`);
|
||||||
}
|
}
|
||||||
|
|
||||||
color = color.substr(1);
|
color = color.substr(1);
|
||||||
|
28
src/utils.spec.js
Normal file
28
src/utils.spec.js
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
'use strict';
|
||||||
|
const utils = require('./utils');
|
||||||
|
|
||||||
|
describe('utils', () => {
|
||||||
|
describe('hex2rgb', () => {
|
||||||
|
test('#ff0000', () => {
|
||||||
|
expect(utils.hex2rgb('#ff0000')).toEqual([255,0,0]);
|
||||||
|
});
|
||||||
|
test('#ffff00', () => {
|
||||||
|
expect(utils.hex2rgb('#ffff00')).toEqual([255,255,0]);
|
||||||
|
});
|
||||||
|
test('#0000ff', () => {
|
||||||
|
expect(utils.hex2rgb('#0000ff')).toEqual([0,0,255]);
|
||||||
|
});
|
||||||
|
test('#112233', () => {
|
||||||
|
expect(utils.hex2rgb('#112233')).toEqual([17,34,51]);
|
||||||
|
});
|
||||||
|
test('#888', () => {
|
||||||
|
expect(utils.hex2rgb('#888')).toEqual([136,136,136]);
|
||||||
|
});
|
||||||
|
test('33', () => {
|
||||||
|
function wrapper() {
|
||||||
|
utils.hex2rgb('33');
|
||||||
|
}
|
||||||
|
expect(wrapper).toThrowError('isn\'t a supported hex color');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
Loading…
Reference in New Issue
Block a user