From 4625bcaba6a48befb0e47e8dc960b2cb331ab60a Mon Sep 17 00:00:00 2001 From: Manuel Wiedenmann Date: Fri, 24 Jun 2022 19:05:49 +0200 Subject: [PATCH] Remove deprecations --- addon/-private/result.js | 3 +-- tests/dummy/app/components/validated-input.js | 9 +++++-- tests/dummy/app/controllers/index.js | 22 ++++++++--------- tests/dummy/app/routes/index.js | 1 - tests/dummy/app/templates/application.hbs | 4 ++-- tests/integration/helpers/v-get-test.js | 24 +++++++++---------- tests/unit/validators/base-test.js | 2 +- 7 files changed, 33 insertions(+), 32 deletions(-) diff --git a/addon/-private/result.js b/addon/-private/result.js index 72a667ef..e0d9fd3f 100644 --- a/addon/-private/result.js +++ b/addon/-private/result.js @@ -8,12 +8,11 @@ import EmberObject, { set, get, } from '@ember/object'; +import { readOnly } from '@ember/object/computed'; import ResultCollection from '../validations/result-collection'; import WarningResultCollection from '../validations/warning-result-collection'; import InternalResultObject from './internal-result-object'; -const { readOnly } = computed; - /** * __PRIVATE__ * diff --git a/tests/dummy/app/components/validated-input.js b/tests/dummy/app/components/validated-input.js index db34c9ca..7b931f40 100644 --- a/tests/dummy/app/components/validated-input.js +++ b/tests/dummy/app/components/validated-input.js @@ -22,7 +22,12 @@ export default class ValidatedInput extends Component { return this.showValidations || this.args.didValidate || this.hasContent; } get showErrorClass() { - return this.notValidating && this.showErrorMessage && this.hasContent && this.validation; + return ( + this.notValidating && + this.showErrorMessage && + this.hasContent && + this.validation + ); } get showErrorMessage() { return this.shouldDisplayValidations && this.validation.isInvalid; @@ -34,7 +39,7 @@ export default class ValidatedInput extends Component { return this.args.model.get(`validations.attrs.${this.args.valuePath}`); } get value() { - return this.args.model.get(this.args.valuePath) + return this.args.model.get(this.args.valuePath); } get classes() { diff --git a/tests/dummy/app/controllers/index.js b/tests/dummy/app/controllers/index.js index 59b6509e..e008a858 100644 --- a/tests/dummy/app/controllers/index.js +++ b/tests/dummy/app/controllers/index.js @@ -10,19 +10,17 @@ export default class extends Controller { @action validate() { - this.model - .validate() - .then(({ validations }) => { - this.didValidate = true; + this.model.validate().then(({ validations }) => { + this.didValidate = true; - if (validations.get('isValid')) { - this.showAlert = false; - this.isRegistered = true; - this.showCode = false; - } else { - this.showAlert = true; - } - }); + if (validations.get('isValid')) { + this.showAlert = false; + this.isRegistered = true; + this.showCode = false; + } else { + this.showAlert = true; + } + }); } @action diff --git a/tests/dummy/app/routes/index.js b/tests/dummy/app/routes/index.js index b2aee188..3b775cf4 100644 --- a/tests/dummy/app/routes/index.js +++ b/tests/dummy/app/routes/index.js @@ -1,5 +1,4 @@ import Route from '@ember/routing/route'; -import { action } from '@ember/object'; import { inject as service } from '@ember/service'; export default class extends Route { diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs index 4a83eb83..a9f92613 100644 --- a/tests/dummy/app/templates/application.hbs +++ b/tests/dummy/app/templates/application.hbs @@ -3,10 +3,10 @@ {{#bs-navbar fluid=true collapsed=true as |navbar|}}
{{navbar.toggle}} - {{#link-to 'index' class='navbar-brand'}} + CP Validations - {{/link-to}} +
{{#navbar.content}} diff --git a/tests/integration/helpers/v-get-test.js b/tests/integration/helpers/v-get-test.js index 33d86d4d..2b2bd358 100644 --- a/tests/integration/helpers/v-get-test.js +++ b/tests/integration/helpers/v-get-test.js @@ -30,27 +30,27 @@ module('Integration | Helper | v-get', function (hooks) { test('it renders', async function (assert) { assert.expect(1); - await render(hbs`{{v-get model 'isValid'}}`); + await render(hbs`{{v-get this.model 'isValid'}}`); assert.dom(this.element).hasText('false'); }); test('access attribute validations', async function (assert) { assert.expect(3); - await render(hbs`{{v-get model 'username' 'isValid'}}`); + await render(hbs`{{v-get this.model 'username' 'isValid'}}`); assert.dom(this.element).hasText('false'); - await render(hbs`{{v-get model 'username' 'message'}}`); + await render(hbs`{{v-get this.model 'username' 'message'}}`); assert.dom(this.element).hasText('This field is invalid'); - await render(hbs`{{v-get model 'email' 'isValid'}}`); + await render(hbs`{{v-get this.model 'email' 'isValid'}}`); assert.dom(this.element).hasText('true'); }); test('updating validation should rerender', async function (assert) { assert.expect(2); - await render(hbs`{{v-get model 'username' 'isValid'}}`); + await render(hbs`{{v-get this.model 'username' 'isValid'}}`); assert.dom(this.element).hasText('false'); this.set('model.validations.attrs.username.isValid', true); @@ -62,7 +62,7 @@ module('Integration | Helper | v-get', function (hooks) { assert.expect(2); await render(hbs` - {{#if (v-get model 'email' 'isValid')}} + {{#if (v-get this.model 'email' 'isValid')}} Email address is valid {{/if}} `); @@ -70,8 +70,8 @@ module('Integration | Helper | v-get', function (hooks) { assert.dom(this.element).hasText('Email address is valid'); await render(hbs` - {{#unless (v-get model 'username' 'isValid')}} - {{v-get model 'username' 'message'}} + {{#unless (v-get this.model 'username' 'isValid')}} + {{v-get this.model 'username' 'message'}} {{/unless}} `); @@ -82,7 +82,7 @@ module('Integration | Helper | v-get', function (hooks) { assert.expect(2); await render( - hbs`` + hbs`` ); assert.dom(this.element).hasText('Button'); @@ -93,7 +93,7 @@ module('Integration | Helper | v-get', function (hooks) { assert.expect(3); await render( - hbs`Text` + hbs`Text` ); assert.dom(this.element).hasText('Text'); @@ -108,11 +108,11 @@ module('Integration | Helper | v-get', function (hooks) { test('access validations with named args', async function (assert) { assert.expect(2); - await render(hbs`{{named-v-get model=model field='isValid'}}`); + await render(hbs``); assert.dom(this.element).hasText('false'); await render( - hbs`{{named-v-get model=model attr='username' field='isValid'}}` + hbs`` ); assert.dom(this.element).hasText('false'); }); diff --git a/tests/unit/validators/base-test.js b/tests/unit/validators/base-test.js index 4acf23cf..91b469a8 100644 --- a/tests/unit/validators/base-test.js +++ b/tests/unit/validators/base-test.js @@ -1,4 +1,4 @@ -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; import EmberObject from '@ember/object'; import { alias } from '@ember/object/computed'; import BaseValidator from 'ember-cp-validations/validators/base';