From 584774b2a2d2cf5d9e42515961f68c26e24d8201 Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Thu, 12 Jul 2018 08:58:05 +0900 Subject: [PATCH] refs #434 Fix domain format for subdomain --- src/renderer/utils/validator.js | 2 +- test/mocha/validator.spec.js | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/renderer/utils/validator.js b/src/renderer/utils/validator.js index 87e936e1..0cef514e 100644 --- a/src/renderer/utils/validator.js +++ b/src/renderer/utils/validator.js @@ -1 +1 @@ -export const domainFormat = new RegExp(/^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9]\.[a-zA-Z]{2,}$/) +export const domainFormat = new RegExp(/^[a-zA-Z0-9][a-zA-Z0-9-.]{1,61}[a-zA-Z0-9]\.[a-zA-Z]{2,}$/) diff --git a/test/mocha/validator.spec.js b/test/mocha/validator.spec.js index 75ae5bd8..b41b5f6c 100644 --- a/test/mocha/validator.spec.js +++ b/test/mocha/validator.spec.js @@ -1,4 +1,4 @@ -var assert = require('assert') +import assert from 'assert' import { domainFormat } from '../../src/renderer/utils/validator' describe('validator', () => { @@ -38,5 +38,12 @@ describe('validator', () => { assert.equal(res, 0) }) }) + context('string contains hyphone', () => { + const domain = 'music-mastodon.social' + it('should match', () => { + const res = domain.search(domainFormat) + assert.equal(res, 0) + }) + }) }) })