From 83f0b112aaf2abf92be51f5c81e7c149f7900eb5 Mon Sep 17 00:00:00 2001 From: Hzunax Date: Thu, 9 Jul 2020 15:16:46 +0200 Subject: [PATCH] test(validators): validatorName instead of name --- packages/form-core/src/validate/ValidateMixin.js | 2 +- .../form-core/test-suites/ValidateMixin.suite.js | 2 +- .../test-suites/ValidateMixinFeedbackPart.suite.js | 2 +- packages/form-core/test/lion-field.test.js | 10 ++++------ .../form-core/test/validate/DateValidators.test.js | 10 +++++----- .../form-core/test/validate/NumberValidators.test.js | 8 ++++---- .../form-core/test/validate/StringValidators.test.js | 12 ++++++------ 7 files changed, 22 insertions(+), 24 deletions(-) diff --git a/packages/form-core/src/validate/ValidateMixin.js b/packages/form-core/src/validate/ValidateMixin.js index c3b39f6b0..db80ea4fe 100644 --- a/packages/form-core/src/validate/ValidateMixin.js +++ b/packages/form-core/src/validate/ValidateMixin.js @@ -423,7 +423,7 @@ export const ValidateMixin = dedupeMixin( if (!validationStates[v.type]) { validationStates[v.type] = {}; } - validationStates[v.type][v.constructor.name] = true; + validationStates[v.type][v.constructor.validatorName] = true; }); this.validationStates = validationStates; diff --git a/packages/form-core/test-suites/ValidateMixin.suite.js b/packages/form-core/test-suites/ValidateMixin.suite.js index 5ff8bb9de..268a2a791 100644 --- a/packages/form-core/test-suites/ValidateMixin.suite.js +++ b/packages/form-core/test-suites/ValidateMixin.suite.js @@ -294,7 +294,7 @@ export function runValidateMixinSuite(customConfig) { } static get validatorName() { - return 'isCat'; + return 'IsCat'; } } diff --git a/packages/form-core/test-suites/ValidateMixinFeedbackPart.suite.js b/packages/form-core/test-suites/ValidateMixinFeedbackPart.suite.js index 1091e2f7d..ffddaf82d 100644 --- a/packages/form-core/test-suites/ValidateMixinFeedbackPart.suite.js +++ b/packages/form-core/test-suites/ValidateMixinFeedbackPart.suite.js @@ -240,7 +240,7 @@ export function runValidateMixinFeedbackPart() { } render() { - return html`Custom for ${this.feedbackData[0].validator.constructor.name}`; + return html`Custom for ${this.feedbackData[0].validator.constructor.validatorName}`; } }, ); diff --git a/packages/form-core/test/lion-field.test.js b/packages/form-core/test/lion-field.test.js index 7a87784a7..29cbb0f9f 100644 --- a/packages/form-core/test/lion-field.test.js +++ b/packages/form-core/test/lion-field.test.js @@ -348,9 +348,8 @@ describe('', () => { }); it('should not run validation when disabled', async () => { const HasX = class extends Validator { - constructor() { - super(); - this.name = 'HasX'; + static get validatorName() { + return 'HasX'; } execute(value) { @@ -385,9 +384,8 @@ describe('', () => { it('should remove validation when disabled state toggles', async () => { const HasX = class extends Validator { - constructor() { - super(); - this.name = 'HasX'; + static get validatorName() { + return 'HasX'; } execute(value) { diff --git a/packages/form-core/test/validate/DateValidators.test.js b/packages/form-core/test/validate/DateValidators.test.js index bb83f832b..8371e718f 100644 --- a/packages/form-core/test/validate/DateValidators.test.js +++ b/packages/form-core/test/validate/DateValidators.test.js @@ -13,7 +13,7 @@ describe('Date Validation', () => { it('provides new isDate() to allow only dates', () => { let isEnabled; const validator = new IsDate(); - expect(validator.constructor.name).to.equal('IsDate'); + expect(validator.constructor.validatorName).to.equal('IsDate'); isEnabled = validator.execute(new Date()); expect(isEnabled).to.be.false; @@ -28,7 +28,7 @@ describe('Date Validation', () => { it('provides new minDate(x) to allow only dates after min', () => { let isEnabled; const validator = new MinDate(new Date('2018/02/02')); - expect(validator.constructor.name).to.equal('MinDate'); + expect(validator.constructor.validatorName).to.equal('MinDate'); isEnabled = validator.execute(new Date('2018-02-03')); expect(isEnabled).to.be.false; @@ -46,7 +46,7 @@ describe('Date Validation', () => { it('provides maxDate() to allow only dates before max', () => { let isEnabled; const validator = new MaxDate(new Date('2018/02/02')); - expect(validator.constructor.name).to.equal('MaxDate'); + expect(validator.constructor.validatorName).to.equal('MaxDate'); isEnabled = validator.execute(new Date('2018-02-01')); expect(isEnabled).to.be.false; @@ -67,7 +67,7 @@ describe('Date Validation', () => { min: new Date('2018/02/02'), max: new Date('2018/02/04'), }); - expect(validator.constructor.name).to.equal('MinMaxDate'); + expect(validator.constructor.validatorName).to.equal('MinMaxDate'); isEnabled = validator.execute(new Date('2018/02/03')); expect(isEnabled).to.be.false; @@ -88,7 +88,7 @@ describe('Date Validation', () => { it('provides new IsDateDisabled() to disable dates matching specified condition', () => { let isDisabled; const validator = new IsDateDisabled(d => d.getDate() === 3); - expect(validator.constructor.name).to.equal('IsDateDisabled'); + expect(validator.constructor.validatorName).to.equal('IsDateDisabled'); isDisabled = validator.execute(new Date('2018/02/04')); expect(isDisabled).to.be.false; diff --git a/packages/form-core/test/validate/NumberValidators.test.js b/packages/form-core/test/validate/NumberValidators.test.js index 6d35ac325..6d79e955f 100644 --- a/packages/form-core/test/validate/NumberValidators.test.js +++ b/packages/form-core/test/validate/NumberValidators.test.js @@ -11,7 +11,7 @@ describe('Number Validation', () => { it('provides new IsNumber() to allow only numbers', () => { let isEnabled; const validator = new IsNumber(); - expect(validator.constructor.name).to.equal('IsNumber'); + expect(validator.constructor.validatorName).to.equal('IsNumber'); isEnabled = validator.execute(4); expect(isEnabled).to.be.false; @@ -26,7 +26,7 @@ describe('Number Validation', () => { it('provides new MinNumber(x) to allow only numbers longer then min', () => { let isEnabled; const validator = new MinNumber(3); - expect(validator.constructor.name).to.equal('MinNumber'); + expect(validator.constructor.validatorName).to.equal('MinNumber'); isEnabled = validator.execute(3); expect(isEnabled).to.be.false; @@ -38,7 +38,7 @@ describe('Number Validation', () => { it('provides new MaxNumber(x) to allow only number shorter then max', () => { let isEnabled; const validator = new MaxNumber(3); - expect(validator.constructor.name).to.equal('MaxNumber'); + expect(validator.constructor.validatorName).to.equal('MaxNumber'); isEnabled = validator.execute(3); expect(isEnabled).to.be.false; @@ -50,7 +50,7 @@ describe('Number Validation', () => { it('provides new MinMaxNumber({ min: x, max: y}) to allow only numbers between min and max', () => { let isEnabled; const validator = new MinMaxNumber({ min: 2, max: 4 }); - expect(validator.constructor.name).to.equal('MinMaxNumber'); + expect(validator.constructor.validatorName).to.equal('MinMaxNumber'); isEnabled = validator.execute(2); expect(isEnabled).to.be.false; diff --git a/packages/form-core/test/validate/StringValidators.test.js b/packages/form-core/test/validate/StringValidators.test.js index f5c4c5bf4..ecb268671 100644 --- a/packages/form-core/test/validate/StringValidators.test.js +++ b/packages/form-core/test/validate/StringValidators.test.js @@ -14,7 +14,7 @@ describe('String Validation', () => { it('provides new IsString() to allow only strings', () => { let isEnabled; const validator = new IsString(); - expect(validator.constructor.name).to.equal('IsString'); + expect(validator.constructor.validatorName).to.equal('IsString'); isEnabled = validator.execute('foo'); expect(isEnabled).to.be.false; @@ -29,7 +29,7 @@ describe('String Validation', () => { it('provides new EqualsLength(x) to allow only a specific string length', () => { let isEnabled; const validator = new EqualsLength(3); - expect(validator.constructor.name).to.equal('EqualsLength'); + expect(validator.constructor.validatorName).to.equal('EqualsLength'); isEnabled = validator.execute('foo'); expect(isEnabled).to.be.false; @@ -44,7 +44,7 @@ describe('String Validation', () => { it('provides new MinLength(x) to allow only strings longer then min', () => { let isEnabled; const validator = new MinLength(3); - expect(validator.constructor.name).to.equal('MinLength'); + expect(validator.constructor.validatorName).to.equal('MinLength'); isEnabled = validator.execute('foo'); expect(isEnabled).to.be.false; @@ -56,7 +56,7 @@ describe('String Validation', () => { it('provides new MaxLength(x) to allow only strings shorter then max', () => { let isEnabled; const validator = new MaxLength(3); - expect(validator.constructor.name).to.equal('MaxLength'); + expect(validator.constructor.validatorName).to.equal('MaxLength'); isEnabled = validator.execute('foo'); expect(isEnabled).to.be.false; @@ -68,7 +68,7 @@ describe('String Validation', () => { it('provides new MinMaxValidator({ min: x, max: y}) to allow only strings between min and max', () => { let isEnabled; const validator = new MinMaxLength({ min: 2, max: 4 }); - expect(validator.constructor.name).to.equal('MinMaxLength'); + expect(validator.constructor.validatorName).to.equal('MinMaxLength'); isEnabled = validator.execute('foo'); expect(isEnabled).to.be.false; @@ -83,7 +83,7 @@ describe('String Validation', () => { it('provides new IsEmail() to allow only valid email formats', () => { let isEnabled; const validator = new IsEmail(); - expect(validator.constructor.name).to.equal('IsEmail'); + expect(validator.constructor.validatorName).to.equal('IsEmail'); isEnabled = validator.execute('foo@bar.com'); expect(isEnabled).to.be.false;