diff --git a/.jscsrc b/.jscsrc new file mode 100644 index 00000000..ae490f5f --- /dev/null +++ b/.jscsrc @@ -0,0 +1,5 @@ +{ + "preset": "ember-suave", + "disallowDirectPropertyAccess": false, + "requireCommentsToIncludeAccess": false +} diff --git a/.vscodeignore b/.vscodeignore new file mode 100644 index 00000000..5f5fbfe7 --- /dev/null +++ b/.vscodeignore @@ -0,0 +1,10 @@ +dist/** +tmp/** +build/** +cache/** +node_modules/** +bower_components/** +.sass-cache/** +connect.lock/** +coverage/*/** +libpeerconnection.log \ No newline at end of file diff --git a/addon/-private/ember-validator.js b/addon/-private/ember-validator.js new file mode 100644 index 00000000..8c5c54c1 --- /dev/null +++ b/addon/-private/ember-validator.js @@ -0,0 +1,14 @@ +import Base from 'ember-cp-validations/validators/base'; +import { validate as _validate } from 'ember-validators'; + +export default Base.extend({ + validate() { + let result = _validate(this.get('_type'), ...arguments); + + if (result && typeof result === 'object') { + return this.createErrorMessage(result.type, result.value, result.context); + } + + return result; + } +}); diff --git a/addon/validations/internal-result-object.js b/addon/-private/internal-result-object.js similarity index 72% rename from addon/validations/internal-result-object.js rename to addon/-private/internal-result-object.js index ea8ebac3..e10036b0 100644 --- a/addon/validations/internal-result-object.js +++ b/addon/-private/internal-result-object.js @@ -4,7 +4,7 @@ */ import Ember from 'ember'; -import ValidationError from './error'; +import ValidationError from '../validations/error'; import { isDsModel, isPromise } from '../utils/utils'; const { @@ -13,30 +13,31 @@ const { isNone, computed, canInvoke, - makeArray, + makeArray } = Ember; const { and, - not + not, + readOnly } = computed; export default Ember.Object.extend({ model: null, isValid: true, isValidating: false, - type: computed.readOnly('_validator._type'), message: null, attribute: '', attrValue: null, _promise: null, _validator: null, + _type: readOnly('_validator._type'), init() { this._super(...arguments); - if(this.get('isAsync')) { + if (this.get('isAsync')) { this._handlePromise(); } }, @@ -45,21 +46,21 @@ export default Ember.Object.extend({ isNotValidating: not('isValidating'), isTruelyValid: and('isNotValidating', 'isValid'), - isAsync: computed('_promise', function () { + isAsync: computed('_promise', function() { return isPromise(get(this, '_promise')); }), - isDirty: computed('attrValue', function () { - const model = get(this, 'model'); - const attribute = get(this, 'attribute'); - const attrValue = get(this, 'attrValue'); + isDirty: computed('attrValue', function() { + let model = get(this, 'model'); + let attribute = get(this, 'attribute'); + let attrValue = get(this, 'attrValue'); // Check default model values if (isDsModel(model) && canInvoke(model, 'eachAttribute')) { - const attrMeta = model.get('constructor.attributes').get(attribute); + let attrMeta = model.get('constructor.attributes').get(attribute); if (attrMeta) { - const defaultValue = attrMeta.options.defaultValue; + let { defaultValue } = attrMeta.options; if (!isNone(defaultValue)) { return defaultValue !== attrValue; @@ -69,14 +70,14 @@ export default Ember.Object.extend({ return !isNone(attrValue); }), - messages: computed('message', function () { + messages: computed('message', function() { return makeArray(get(this, 'message')); }), - error: computed('isInvalid', 'type', 'message', 'attribute', function () { + error: computed('isInvalid', 'type', 'message', 'attribute', function() { if (get(this, 'isInvalid')) { return ValidationError.create({ - type: get(this, 'type'), + type: get(this, '_type'), message: get(this, 'message'), attribute: get(this, 'attribute') }); @@ -85,7 +86,7 @@ export default Ember.Object.extend({ return null; }), - errors: computed('error', function () { + errors: computed('error', function() { return makeArray(get(this, 'error')); }), diff --git a/addon/validations/result.js b/addon/-private/result.js similarity index 88% rename from addon/validations/result.js rename to addon/-private/result.js index 0a0155bd..c155561e 100644 --- a/addon/validations/result.js +++ b/addon/-private/result.js @@ -4,7 +4,7 @@ */ import Ember from 'ember'; -import ValidationResultCollection from './result-collection'; +import ResultCollection from '../validations/result-collection'; import InternalResultObject from './internal-result-object'; const { @@ -14,7 +14,7 @@ const { isArray, computed, setProperties, - getProperties, + getProperties } = Ember; const { @@ -70,8 +70,8 @@ const Result = Ember.Object.extend({ * @type {Boolean} */ _isReadOnly: computed('_validations', function() { - const validations = get(this, '_validations'); - return (validations instanceof ValidationResultCollection) || get(validations, 'isValidations'); + let validations = get(this, '_validations'); + return (validations instanceof ResultCollection) || get(validations, 'isValidations'); }).readOnly(), /** @@ -157,7 +157,7 @@ const Result = Ember.Object.extend({ * @private * @type {Result} */ - _validations: computed('model', 'attribute', '_promise', '_validator', function () { + _validations: computed('model', 'attribute', '_promise', '_validator', function() { return InternalResultObject.extend({ attrValue: computed.readOnly(`model.${get(this, 'attribute')}`) }).create(getProperties(this, ['model', 'attribute', '_promise', '_validator'])); @@ -185,9 +185,9 @@ const Result = Ember.Object.extend({ * @param result */ update(result) { - const validations = get(this, '_validations'); - const validator = get(this, '_validator'); - const { model, attribute } = getProperties(this, ['model', 'attribute']); + let validations = get(this, '_validations'); + let validator = get(this, '_validator'); + let { model, attribute } = getProperties(this, ['model', 'attribute']); if (isNone(result)) { this.update(false); @@ -197,9 +197,9 @@ const Result = Ember.Object.extend({ if (get(result, 'isValidations')) { set(this, '_validations', result); } else if (isArray(result)) { - const validationResultsCollection = ValidationResultCollection.create({ + let validationResultsCollection = ResultCollection.create({ attribute, - content: result.map(r => Result.create({ + content: result.map((r) => Result.create({ attribute, model, _validator: validator, @@ -228,9 +228,9 @@ const Result = Ember.Object.extend({ */ _handlePromise() { get(this, '_promise').then( - result => this.update(result), - result => this.update(result) - ).catch(reason => { + (result) => this.update(result), + (result) => this.update(result) + ).catch((reason) => { // TODO: send into error state throw reason; }); diff --git a/addon/utils/assign.js b/addon/utils/assign.js index 4cafbd06..beddbd50 100644 --- a/addon/utils/assign.js +++ b/addon/utils/assign.js @@ -18,13 +18,13 @@ const { } = Ember; export default function assign(obj, path, value, useEmberObject = false, delimiter = '.') { - const keyPath = path.split(delimiter); - const lastKeyIndex = keyPath.length - 1; + let keyPath = path.split(delimiter); + let lastKeyIndex = keyPath.length - 1; let currObj = obj; // Iterate over each key in the path (minus the last one which is the property to be assigned) for (let i = 0; i < lastKeyIndex; ++i) { - const key = keyPath[i]; + let key = keyPath[i]; // Create a new object if it doesnt exist if (isNone(get(currObj, key))) { diff --git a/addon/utils/cycle-breaker.js b/addon/utils/cycle-breaker.js index 2a64ab95..ac00040b 100644 --- a/addon/utils/cycle-breaker.js +++ b/addon/utils/cycle-breaker.js @@ -13,9 +13,9 @@ import MetaData from './meta-data'; export default function cycleBreaker(fn, value) { - const key = MetaData.symbol('cycle'); + let key = MetaData.symbol('cycle'); - return function () { + return function() { if (MetaData.getData(this, key)) { return value; } diff --git a/addon/utils/flatten.js b/addon/utils/flatten.js index 2c7bad87..b9a1a240 100644 --- a/addon/utils/flatten.js +++ b/addon/utils/flatten.js @@ -7,7 +7,7 @@ export default function flatten(array = []) { let result = []; for (let i = 0, l = array.length; i < l; i++) { - const item = array[i]; + let item = array[i]; if (Array.isArray(item)) { result = result.concat(flatten(item)); diff --git a/addon/utils/meta-data.js b/addon/utils/meta-data.js index b6d9144b..a7dfda8f 100644 --- a/addon/utils/meta-data.js +++ b/addon/utils/meta-data.js @@ -13,8 +13,8 @@ function symbol(key) { } function getData(obj, s) { - const m = Ember.meta(obj); - const data = m[dataKey]; + let m = Ember.meta(obj); + let data = m[dataKey]; if (data) { return data[s]; @@ -22,8 +22,8 @@ function getData(obj, s) { } function setData(obj, s, value) { - const m = Ember.meta(obj); - const data = m[dataKey] = m[dataKey] || {}; + let m = Ember.meta(obj); + let data = m[dataKey] = m[dataKey] || {}; data[s] = value; } diff --git a/addon/utils/utils.js b/addon/utils/utils.js index 604d3ca1..3aa7f5e7 100644 --- a/addon/utils/utils.js +++ b/addon/utils/utils.js @@ -5,6 +5,7 @@ import Ember from 'ember'; import isHTMLSafe from 'ember-string-ishtmlsafe-polyfill'; +import _requireModule from 'ember-validators/utils/require-module'; const DS = requireModule('ember-data'); @@ -15,15 +16,8 @@ const { A: emberArray } = Ember; -export function requireModule(module) { - const rjs = self.requirejs; - - if ( - (rjs.has && rjs.has(module)) || - (!rjs.has && (rjs.entries[module] || rjs.entries[module + '/index'])) - ) { - return self.require(module).default; - } +export function requireModule() { + return _requireModule(...arguments); } export function unwrapString(s) { @@ -59,17 +53,17 @@ export function isEmberObject(o) { } export function isValidatable(value) { - const v = unwrapProxy(value); + let v = unwrapProxy(value); return isDsModel(v) ? !get(v, 'isDeleted') : true; } export function getValidatableValue(value) { - if(!value) { + if (!value) { return value; } - if(isDSManyArray(value)) { - return emberArray(value.filter(v => isValidatable(v))); + if (isDSManyArray(value)) { + return emberArray(value.filter((v) => isValidatable(v))); } return isValidatable(value) ? value : undefined; diff --git a/addon/validations/factory.js b/addon/validations/factory.js index c804e0dc..adea045d 100644 --- a/addon/validations/factory.js +++ b/addon/validations/factory.js @@ -7,8 +7,8 @@ import Ember from 'ember'; import getOwner from 'ember-getowner-polyfill'; import flatten from '../utils/flatten'; import assign from '../utils/assign'; -import ValidationResult from './result'; -import ValidationResultCollection from './result-collection'; +import ValidationResult from '../-private/result'; +import ResultCollection from './result-collection'; import BaseValidator from '../validators/base'; import cycleBreaker from '../utils/cycle-breaker'; import shouldCallSuper from '../utils/should-call-super'; @@ -101,7 +101,7 @@ function buildValidations(validations = {}, globalOptions = {}) { let Validations, validationMixinCount; - const ValidationsMixin = Ember.Mixin.create({ + let ValidationsMixin = Ember.Mixin.create({ init() { this._super(...arguments); @@ -109,10 +109,11 @@ function buildValidations(validations = {}, globalOptions = {}) { this.__validationsMixinCount__ = this.__validationsMixinCount__ || 0; validationMixinCount = ++this.__validationsMixinCount__; }, - __validationsClass__: computed(function () { + __validationsClass__: computed(function() { if (!Validations) { let inheritedClass; - if(shouldCallSuper(this, '__validationsClass__') || validationMixinCount > 1) { + + if (shouldCallSuper(this, '__validationsClass__') || validationMixinCount > 1) { inheritedClass = this._super(); } @@ -120,10 +121,8 @@ function buildValidations(validations = {}, globalOptions = {}) { } return Validations; }).readOnly(), - validations: computed(function () { - return this.get('__validationsClass__').create({ - model: this - }); + validations: computed(function() { + return this.get('__validationsClass__').create({ model: this }); }).readOnly(), validate() { return get(this, 'validations').validate(...arguments); @@ -161,28 +160,27 @@ function buildValidations(validations = {}, globalOptions = {}) { * @return */ function normalizeOptions(validations = {}, globalOptions = {}) { - const validatableAttrs = Object.keys(validations); + let validatableAttrs = Object.keys(validations); - validatableAttrs.forEach(attribute => { - const rules = validations[attribute]; + validatableAttrs.forEach((attribute) => { + let rules = validations[attribute]; if (rules && typeof rules === 'object' && isArray(rules.validators)) { - const options = Object.keys(rules).reduce((o, k) => { + let options = Object.keys(rules).reduce((o, k) => { if (k !== 'validators') { o[k] = rules[k]; } return o; }, {}); - const validators = rules.validators; - - validators.forEach(v => { + let { validators } = rules; + validators.forEach((v) => { v.defaultOptions = options; }); validations[attribute] = validators; } validations[attribute] = makeArray(validations[attribute]); - validations[attribute].forEach(v => { + validations[attribute].forEach((v) => { v.globalOptions = globalOptions; }); }); @@ -208,7 +206,7 @@ function createValidationsClass(inheritedValidationsClass, validations, model) { // Setup validation inheritance if (inheritedValidationsClass && inheritedValidationsClass.__isCPValidationsClass__) { - const inheritedValidations = inheritedValidationsClass.create(); + let inheritedValidations = inheritedValidationsClass.create(); validationRules = merge(validationRules, inheritedValidations.get('_validationRules')); validatableAttributes = emberArray(inheritedValidations.get('validatableAttributes').concat(validatableAttributes)).uniq(); @@ -221,18 +219,18 @@ function createValidationsClass(inheritedValidationsClass, validations, model) { }, validationRules); // Create the mixin that holds all the top level validation props (isValid, messages, etc) - const TopLevelProps = createTopLevelPropsMixin(validatableAttributes); + let TopLevelProps = createTopLevelPropsMixin(validatableAttributes); // Create the `attrs` class which will add the current model reference once instantiated - const AttrsClass = createAttrsClass(validatableAttributes, validationRules, model); + let AttrsClass = createAttrsClass(validatableAttributes, validationRules, model); // Create `validations` class - const ValidationsClass = Ember.Object.extend(TopLevelProps, { + let ValidationsClass = Ember.Object.extend(TopLevelProps, { model: null, attrs: null, isValidations: true, - validatableAttributes: computed(function () { + validatableAttributes: computed(function() { return validatableAttributes; }).readOnly(), @@ -241,7 +239,7 @@ function createValidationsClass(inheritedValidationsClass, validations, model) { _debouncedValidations: null, // Private - _validationRules: computed(function () { + _validationRules: computed(function() { return validationRules; }).readOnly(), @@ -262,19 +260,19 @@ function createValidationsClass(inheritedValidationsClass, validations, model) { destroy() { this._super(...arguments); - const validatableAttrs = get(this, 'validatableAttributes'); - const debouncedValidations = get(this, '_debouncedValidations'); + let validatableAttrs = get(this, 'validatableAttributes'); + let debouncedValidations = get(this, '_debouncedValidations'); // Initiate attrs destroy to cleanup any remaining model references this.get('attrs').destroy(); // Cancel all debounced timers - validatableAttrs.forEach(attr => { - const attrCache = get(debouncedValidations, attr); + validatableAttrs.forEach((attr) => { + let attrCache = get(debouncedValidations, attr); if (!isNone(attrCache)) { // Itterate over each attribute and cancel all of its debounced validations - Object.keys(attrCache).forEach(v => run.cancel(attrCache[v])); + Object.keys(attrCache).forEach((v) => run.cancel(attrCache[v])); } }); } @@ -303,36 +301,38 @@ function createValidationsClass(inheritedValidationsClass, validations, model) { * @return {Ember.Object} */ function createAttrsClass(validatableAttributes, validationRules, model) { - const nestedClasses = {}; - const rootPath = 'root'; + let nestedClasses = {}; + let rootPath = 'root'; - const AttrsClass = Ember.Object.extend({ + let AttrsClass = Ember.Object.extend({ __path__: rootPath, init() { this._super(...arguments); - const _model = this.get('_model'); - const path = this.get('__path__'); + let _model = this.get('_model'); + let path = this.get('__path__'); /* Instantiate the nested attrs classes for the current path */ - Object.keys(nestedClasses[path] || []).forEach(key => { - set(this, key, nestedClasses[path][key].create({ _model })); + Object.keys(nestedClasses[path] || []).forEach((key) => { + set(this, key, nestedClasses[path][key].create({ + _model + })); }); }, destroy() { this._super(...arguments); - const path = this.get('__path__'); + let path = this.get('__path__'); /* Remove the model reference from each nested class and destroy it */ - Object.keys(nestedClasses[path] || []).forEach(key => { - const o = get(this, key); + Object.keys(nestedClasses[path] || []).forEach((key) => { + let o = get(this, key); o.set('_model', null); o.destroy(); }); @@ -342,7 +342,7 @@ function createAttrsClass(validatableAttributes, validationRules, model) { /* Insert CPs + Create nested classes */ - validatableAttributes.forEach(attribute => { + validatableAttributes.forEach((attribute) => { let path = attribute.split('.'); let attr = path.pop(); let currPath = [rootPath]; @@ -350,9 +350,9 @@ function createAttrsClass(validatableAttributes, validationRules, model) { let cpHash = {}; // Iterate over the path and create the necessary nested classes along the way - for(let i = 0; i < path.length; i++) { - const key = path[i]; - const currPathStr = currPath.join('.'); + for (let i = 0; i < path.length; i++) { + let key = path[i]; + let currPathStr = currPath.join('.'); let _nestedClasses; nestedClasses[currPathStr] = nestedClasses[currPathStr] || {}; @@ -360,8 +360,10 @@ function createAttrsClass(validatableAttributes, validationRules, model) { currPath.push(key); - if(!_nestedClasses[key]) { - _nestedClasses[key] = AttrsClass.extend({ __path__: currPath.join('.') }); + if (!_nestedClasses[key]) { + _nestedClasses[key] = AttrsClass.extend({ + __path__: currPath.join('.') + }); } currClass = _nestedClasses[key]; @@ -384,23 +386,23 @@ function createAttrsClass(validatableAttributes, validationRules, model) { * @param {Object} model Since the CPs are created once per class on the first initialization, * this is the first model that was instantiated * @param {Array} validations - * @return {Ember.ComputedProperty} A computed property which is a ValidationResultCollection + * @return {Ember.ComputedProperty} A computed property which is a ResultCollection */ function createCPValidationFor(attribute, model, validations) { - const dependentKeys = getCPDependentKeysFor(attribute, model, validations); + let dependentKeys = getCPDependentKeysFor(attribute, model, validations); - return computed(...dependentKeys, cycleBreaker(function () { - const model = get(this, '_model'); - const validators = !isNone(model) ? getValidatorsFor(attribute, model) : []; + return computed(...dependentKeys, cycleBreaker(function() { + let model = get(this, '_model'); + let validators = !isNone(model) ? getValidatorsFor(attribute, model) : []; - const validationResults = generateValidationResultsFor(attribute, model, validators, (validator, options) => { - const debounce = getWithDefault(options, 'debounce', 0); + let validationResults = generateValidationResultsFor(attribute, model, validators, (validator, options) => { + let debounce = getWithDefault(options, 'debounce', 0); if (debounce > 0) { - const cache = getDebouncedValidationsCacheFor(attribute, model); + let cache = getDebouncedValidationsCacheFor(attribute, model); // Return a promise and pass the resolve method to the debounce handler - return new Promise(resolve => { + return new Promise((resolve) => { cache[guidFor(validator)] = run.debounce(validator, debouncedValidate, validator, model, attribute, resolve, debounce, false); }); } else { @@ -408,7 +410,10 @@ function createCPValidationFor(attribute, model, validations) { } }); - return ValidationResultCollection.create({ attribute, content: validationResults }); + return ResultCollection.create({ + attribute, + content: validationResults + }); })).readOnly(); } @@ -430,13 +435,13 @@ function generateValidationResultsFor(attribute, model, validators, validate) { let isInvalid = false; let value, result; - return validators.map(validator => { - const options = get(validator, 'options').copy(); - const isWarning = getWithDefault(options, 'isWarning', false); - const disabled = getWithDefault(options, 'disabled', false); - const lazy = getWithDefault(options, 'lazy', true); + return validators.map((validator) => { + let options = get(validator, 'options').copy(); + let isWarning = getWithDefault(options, 'isWarning', false); + let disabled = getWithDefault(options, 'disabled', false); + let lazy = getWithDefault(options, 'lazy', true); - if(disabled || (lazy && isInvalid) || !isModelValidatable) { + if (disabled || (lazy && isInvalid) || !isModelValidatable) { value = true; } else { value = validate(validator, options, model, attribute); @@ -448,7 +453,7 @@ function generateValidationResultsFor(attribute, model, validators, validate) { If the current result is invalid, the rest of the validations do not need to be triggered (if lazy) since the attribute is already in an invalid state. */ - if(!isInvalid && !isWarning && get(result, 'isInvalid')) { + if (!isInvalid && !isWarning && get(result, 'isInvalid')) { isInvalid = true; } @@ -466,7 +471,7 @@ function generateValidationResultsFor(attribute, model, validators, validate) { */ function createTopLevelPropsMixin(validatableAttrs) { // Expose the following properties as public APIs via readOnly aliases - const aliases = [ + let aliases = [ 'isWarning', 'isValid', 'isValidating', @@ -486,7 +491,7 @@ function createTopLevelPropsMixin(validatableAttrs) { '_promise' ]; - const topLevelProps = aliases.reduce((props, alias) => { + let topLevelProps = aliases.reduce((props, alias) => { props[alias] = computed.readOnly(`__attrsResultCollection__.${alias}`); return props; }, {}); @@ -495,9 +500,9 @@ function createTopLevelPropsMixin(validatableAttrs) { /* Dedupe logic by creating a top level ResultCollection for all attr's ResultCollections */ - __attrsResultCollection__: computed(...validatableAttrs.map(attr => `attrs.${attr}`), function () { - return ValidationResultCollection.create({ - content: validatableAttrs.map(attr => get(this, `attrs.${attr}`)) + __attrsResultCollection__: computed(...validatableAttrs.map((attr) => `attrs.${attr}`), function() { + return ResultCollection.create({ + content: validatableAttrs.map((attr) => get(this, `attrs.${attr}`)) }); }).readOnly() }); @@ -515,23 +520,23 @@ function createTopLevelPropsMixin(validatableAttrs) { * @return {Array} Unique list of dependencies */ function getCPDependentKeysFor(attribute, model, validations) { - const owner = getOwner(model); + let owner = getOwner(model); - let dependentKeys = validations.map(validation => { - const type = validation._type; - const options = validation.options; - const Validator = type === 'function' ? BaseValidator : lookupValidator(owner, type); - const baseDependents = BaseValidator.getDependentsFor(attribute, options) || []; - const dependents = Validator.getDependentsFor(attribute, options) || []; + let dependentKeys = validations.map((validation) => { + let { options } = validation; + let type = validation._type; + let Validator = type === 'function' ? BaseValidator : lookupValidator(owner, type); + let baseDependents = BaseValidator.getDependentsFor(attribute, options) || []; + let dependents = Validator.getDependentsFor(attribute, options) || []; - const specifiedDependents = [].concat( + let specifiedDependents = [].concat( getWithDefault(options, 'dependentKeys', []), getWithDefault(validation, 'defaultOptions.dependentKeys', []), getWithDefault(validation, 'globalOptions.dependentKeys', []) ); // Extract dependentKeys from option CPs - const cpDependents = [].concat( + let cpDependents = [].concat( extractOptionsDependentKeys(options), extractOptionsDependentKeys(get(validation, 'defaultOptions')), extractOptionsDependentKeys(get(validation, 'globalOptions')) @@ -548,12 +553,12 @@ function getCPDependentKeysFor(attribute, model, validations) { dependentKeys.push(`model.${attribute}`); - if(isDsModel(model)) { + if (isDsModel(model)) { dependentKeys.push(`model.isDeleted`); } - dependentKeys = dependentKeys.map(d => { - return d.split('.')[0] === 'model' ? '_' + d : d; + dependentKeys = dependentKeys.map((d) => { + return `${d.split('.')[0] === 'model' ? '_' : ''}${d}`; }); return emberArray(dependentKeys).uniq(); @@ -568,11 +573,11 @@ function getCPDependentKeysFor(attribute, model, validations) { * @return {Array} dependentKeys */ function extractOptionsDependentKeys(options) { - if(options && typeof options === 'object') { + if (options && typeof options === 'object') { return Object.keys(options).reduce((arr, key) => { let option = options[key]; - if(option && typeof option === 'object' && option.isDescriptor) { + if (option && typeof option === 'object' && option.isDescriptor) { return arr.concat(option._dependentKeys || []); } @@ -596,8 +601,8 @@ function extractOptionsDependentKeys(options) { * @param {Function} resolve */ function debouncedValidate(validator, model, attribute, resolve) { - const options = get(validator, 'options').copy(); - const value = validator.getValue(); + let options = get(validator, 'options').copy(); + let value = validator.getValue(); resolve(validator.validate(value, options, model, attribute)); } @@ -614,20 +619,18 @@ function debouncedValidate(validator, model, attribute, resolve) { */ function validationReturnValueHandler(attribute, value, model, validator) { let result; + let commonProps = { + model, + attribute, + _validator: validator + }; if (isPromise(value)) { - result = ValidationResult.create({ - attribute, - _promise: Promise.resolve(value), - model, - _validator: validator + result = ValidationResult.create(commonProps, { + _promise: Promise.resolve(value) }); } else { - result = ValidationResult.create({ - attribute, - model, - _validator: validator - }); + result = ValidationResult.create(commonProps); result.update(value); } @@ -644,7 +647,7 @@ function validationReturnValueHandler(attribute, value, model, validator) { * @return {Array} */ function getValidatorsFor(attribute, model) { - const validators = get(model, `validations._validators.${attribute}`); + let validators = get(model, `validations._validators.${attribute}`); if (!isNone(validators)) { return validators; @@ -663,7 +666,7 @@ function getValidatorsFor(attribute, model) { * @return {Map} */ function getDebouncedValidationsCacheFor(attribute, model) { - const debouncedValidations = get(model, 'validations._debouncedValidations'); + let debouncedValidations = get(model, 'validations._debouncedValidations'); if (isNone(get(debouncedValidations, attribute))) { assign(debouncedValidations, attribute, {}); @@ -682,11 +685,11 @@ function getDebouncedValidationsCacheFor(attribute, model) { * @return {Array} */ function createValidatorsFor(attribute, model) { - const validations = get(model, 'validations'); - const validationRules = makeArray(get(validations, `_validationRules.${attribute}`)); - const validatorCache = get(validations, '_validators'); - const owner = getOwner(model); - const validators = []; + let validations = get(model, 'validations'); + let validationRules = makeArray(get(validations, `_validationRules.${attribute}`)); + let validatorCache = get(validations, '_validators'); + let owner = getOwner(model); + let validators = []; let validator; // We must have an owner to be able to lookup our validators @@ -694,7 +697,7 @@ function createValidatorsFor(attribute, model) { throw new TypeError(`[ember-cp-validations] ${model.toString()} is missing a container or owner.`); } - validationRules.forEach(v => { + validationRules.forEach((v) => { v.attribute = attribute; v.model = model; @@ -724,7 +727,7 @@ function createValidatorsFor(attribute, model) { * @return {Class} Validator class or undefined if not found */ function lookupValidator(owner, type) { - const validatorClass = owner._lookupFactory(`validator:${type}`); + let validatorClass = owner._lookupFactory(`validator:${type}`); if (isNone(validatorClass)) { throw new Error(`[ember-cp-validations] Validator not found of type: ${type}.`); @@ -754,17 +757,17 @@ function lookupValidator(owner, type) { * @return {Promise or Object} Promise if async is true, object if async is false */ function validate(options = {}, async = true) { - const model = get(this, 'model'); - const whiteList = makeArray(options.on); - const blackList = makeArray(options.excludes); + let model = get(this, 'model'); + let whiteList = makeArray(options.on); + let blackList = makeArray(options.excludes); - const validationResults = get(this, 'validatableAttributes').reduce((v, name) => { + let validationResults = get(this, 'validatableAttributes').reduce((v, name) => { if (!isEmpty(blackList) && blackList.indexOf(name) !== -1) { return v; } if (isEmpty(whiteList) || whiteList.indexOf(name) !== -1) { - const validationResult = get(this, `attrs.${name}`); + let validationResult = get(this, `attrs.${name}`); // If an async validation is found, throw an error if (!async && get(validationResult, 'isAsync')) { @@ -776,11 +779,11 @@ function validate(options = {}, async = true) { return v; }, []); - const resultCollection = ValidationResultCollection.create({ + let resultCollection = ResultCollection.create({ content: validationResults }); - const resultObject = { + let resultObject = { model, validations: resultCollection }; @@ -814,19 +817,22 @@ function validate(options = {}, async = true) { * @async */ function validateAttribute(attribute, value) { - const model = get(this, 'model'); - const validators = !isNone(model) ? getValidatorsFor(attribute, model) : []; + let model = get(this, 'model'); + let validators = !isNone(model) ? getValidatorsFor(attribute, model) : []; - const validationResults = generateValidationResultsFor(attribute, model, validators, (validator, options) => { + let validationResults = generateValidationResultsFor(attribute, model, validators, (validator, options) => { return validator.validate(value, options, model, attribute); }); - const validations = ValidationResultCollection.create({ + let validations = ResultCollection.create({ attribute, content: flatten(validationResults) }); - const result = { model, validations }; + let result = { + model, + validations + }; return Promise.resolve(get(validations, 'isAsync') ? get(validations, '_promise').then(() => result) : result); } @@ -837,7 +843,7 @@ function validateAttribute(attribute, value) { * - `excludes` (**Array**): Exclude validation on the given attributes * * ```javascript - * const { m, validations } = model.validateSync(); + * let { m, validations } = model.validateSync(); * validations.get('isValid') // true or false * ``` * diff --git a/addon/validations/result-collection.js b/addon/validations/result-collection.js index 1e522ab5..13247007 100644 --- a/addon/validations/result-collection.js +++ b/addon/validations/result-collection.js @@ -20,7 +20,7 @@ const { const A = emberArray(); function callable(method) { - return function (collection) { + return function(collection) { return A[method].apply(collection, arguments); }; } @@ -32,13 +32,13 @@ const compact = callable('compact'); CP Macros */ function isAny(collection, key, value, defaultValue) { - return computed(`${collection}.@each.${key}`, cycleBreaker(function () { + return computed(`${collection}.@each.${key}`, cycleBreaker(function() { return get(this, collection).isAny(key, value); }, defaultValue)); } function isEvery(collection, key, value, defaultValue) { - return computed(`${collection}.@each.${key}`, cycleBreaker(function () { + return computed(`${collection}.@each.${key}`, cycleBreaker(function() { return get(this, collection).isEvery(key, value); }, defaultValue)); } @@ -183,8 +183,8 @@ export default Ember.ArrayProxy.extend({ * @readOnly * @type {Array} */ - messages: computed('_errorContent.@each.messages', cycleBreaker(function () { - const messages = flatten(get(this, '_errorContent').getEach('messages')); + messages: computed('_errorContent.@each.messages', cycleBreaker(function() { + let messages = flatten(get(this, '_errorContent').getEach('messages')); return uniq(compact(messages)); })).readOnly(), @@ -216,8 +216,8 @@ export default Ember.ArrayProxy.extend({ * @readOnly * @type {Array} */ - warningMessages: computed('_warningContent.@each.messages', cycleBreaker(function () { - const messages = flatten(get(this, '_warningContent').getEach('messages')); + warningMessages: computed('_warningContent.@each.messages', cycleBreaker(function() { + let messages = flatten(get(this, '_warningContent').getEach('messages')); return uniq(compact(messages)); })).readOnly(), @@ -250,7 +250,7 @@ export default Ember.ArrayProxy.extend({ * @readOnly * @type {Array} */ - warnings: computed('attribute', '_warningContent.@each.errors', cycleBreaker(function () { + warnings: computed('attribute', '_warningContent.@each.errors', cycleBreaker(function() { return computeErrorCollection(get(this, 'attribute'), get(this, '_warningContent')); })).readOnly(), @@ -283,7 +283,7 @@ export default Ember.ArrayProxy.extend({ * @readOnly * @type {Array} */ - errors: computed('attribute', '_errorContent.@each.errors', cycleBreaker(function () { + errors: computed('attribute', '_errorContent.@each.errors', cycleBreaker(function() { return computeErrorCollection(get(this, 'attribute'), get(this, '_errorContent')); })).readOnly(), @@ -334,7 +334,7 @@ export default Ember.ArrayProxy.extend({ * @readOnly * @type {Object} */ - options: computed('_contentValidators.@each.options', function () { + options: computed('_contentValidators.@each.options', function() { return groupValidatorOptions(get(this, '_contentValidators')); }).readOnly(), @@ -344,7 +344,7 @@ export default Ember.ArrayProxy.extend({ * @private * @type {Promise} */ - _promise: computed('content.@each._promise', cycleBreaker(function () { + _promise: computed('content.@each._promise', cycleBreaker(function() { return RSVP.allSettled(compact(flatten(this.getEach('_promise')))); })).readOnly(), @@ -367,16 +367,15 @@ export default Ember.ArrayProxy.extend({ * @type {Array} * @private */ - _warningContent: computed.filterBy('content', 'isWarning', true).readOnly(), + _warningContent: computed.filterBy('content', 'isWarning', true).readOnly() }); - function computeErrorCollection(attribute, content = []) { let errors = flatten(content.getEach('errors')); errors = uniq(compact(errors)); - errors.forEach(e => { - if(attribute && e.get('attribute') !== attribute) { + errors.forEach((e) => { + if (attribute && e.get('attribute') !== attribute) { e.set('parentAttribute', attribute); } }); @@ -394,8 +393,8 @@ function groupValidatorOptions(validators = []) { return options; } - const type = get(v, '_type'); - const vOpts = get(v, 'options').copy(); + let type = get(v, '_type'); + let vOpts = get(v, 'options').copy(); if (options[type]) { if (isArray(options[type])) { diff --git a/addon/validations/validator.js b/addon/validations/validator.js index 289a60e6..5d98f9c1 100644 --- a/addon/validations/validator.js +++ b/addon/validations/validator.js @@ -75,7 +75,7 @@ const { * * Default: __false__ * - * If set to __true__, disables the given validator. + * If set to __true__, disables the given validator. * * ```js * // Examples @@ -192,8 +192,8 @@ const { * @submodule Common Options */ -export default function (arg1, options) { - const props = { +export default function(arg1, options) { + let props = { options: isNone(options) ? {} : options }; diff --git a/addon/validators/alias.js b/addon/validators/alias.js index b4b75df2..770baa4e 100644 --- a/addon/validators/alias.js +++ b/addon/validators/alias.js @@ -9,7 +9,7 @@ import Base from 'ember-cp-validations/validators/base'; const { get, assert, - isEmpty, + isPresent, getProperties } = Ember; @@ -36,6 +36,7 @@ const { * @extends Base */ const Alias = Base.extend({ + _type: 'alias', /** * Normalized options passed in. @@ -65,11 +66,11 @@ const Alias = Base.extend({ }, validate(value, options, model, attribute) { - const { alias, firstMessageOnly } = getProperties(options, ['alias', 'firstMessageOnly']); + let { alias, firstMessageOnly } = getProperties(options, ['alias', 'firstMessageOnly']); - assert(`[ember-cp-validations] [validator:alias] [${attribute}] option 'alias' is required`, !isEmpty(alias)); + assert(`[validator:alias] [${attribute}] option 'alias' is required`, isPresent(alias)); - const aliasValidation = get(model, `validations.attrs.${alias}`); + let aliasValidation = get(model, `validations.attrs.${alias}`); return firstMessageOnly ? get(aliasValidation, 'message') : get(aliasValidation, 'content'); } @@ -77,9 +78,9 @@ const Alias = Base.extend({ Alias.reopenClass({ getDependentsFor(attribute, options) { - const alias = typeof options === 'string' ? options : get(options, 'alias'); + let alias = typeof options === 'string' ? options : get(options, 'alias'); - assert(`[ember-cp-validations] [validator:alias] [${attribute}] 'alias' must be a string`, typeof alias === 'string'); + assert(`[validator:alias] [${attribute}] 'alias' must be a string`, typeof alias === 'string'); return [ `${alias}.messages.[]`, `${alias}.isTruelyValid` ]; } diff --git a/addon/validators/base.js b/addon/validators/base.js index 89b5816a..decd942a 100644 --- a/addon/validators/base.js +++ b/addon/validators/base.js @@ -81,10 +81,10 @@ const Base = Ember.Object.extend({ init() { this._super(...arguments); - const globalOptions = get(this, 'globalOptions'); - const defaultOptions = get(this, 'defaultOptions'); - const options = get(this, 'options'); - const owner = getOwner(this); + let globalOptions = get(this, 'globalOptions'); + let defaultOptions = get(this, 'defaultOptions'); + let options = get(this, 'options'); + let owner = getOwner(this); let errorMessages; if (!isNone(owner)) { @@ -110,19 +110,19 @@ const Base = Ember.Object.extend({ * @return {Object} */ buildOptions(options = {}, defaultOptions = {}, globalOptions = {}) { - const builtOptions = assign(assign(assign({}, globalOptions), defaultOptions), options); + let builtOptions = assign(assign(assign({}, globalOptions), defaultOptions), options); // Overwrite the validator's value method if it exists in the options and remove it since // there is no need for it to be passed around this.value = builtOptions.value || this.value; delete builtOptions.value; - const OptionsClass = Ember.Object.extend(builtOptions, { + let OptionsClass = Ember.Object.extend(builtOptions, { model: computed(() => get(this, 'model')).readOnly(), attribute: computed(() => get(this, 'attribute')).readOnly(), copy(deep) { - if(deep) { + if (deep) { return OptionsClass.create(); } @@ -158,7 +158,7 @@ const Base = Ember.Object.extend({ * @return {Mixed} value */ getValue() { - const value = this.value(get(this, 'model'), get(this, 'attribute')); + let value = this.value(get(this, 'model'), get(this, 'attribute')); return getValidatableValue(value); }, @@ -214,7 +214,7 @@ const Base = Ember.Object.extend({ * @return {String} The generated message */ createErrorMessage(type, value, options = {}) { - const messages = this.get('errorMessages'); + let messages = this.get('errorMessages'); let message = unwrapString(get(options, 'message')); set(options, 'description', messages.getDescriptionFor(get(this, 'attribute'), options)); diff --git a/addon/validators/belongs-to.js b/addon/validators/belongs-to.js index 5258dd9b..f51c89d8 100755 --- a/addon/validators/belongs-to.js +++ b/addon/validators/belongs-to.js @@ -11,7 +11,6 @@ const { get } = Ember; - /** * Identifies a `belongs-to` relationship in an Ember Data Model or Ember.Object. * This is used to create a link to the validations object of the child model. @@ -80,10 +79,12 @@ const { * @extends Base */ const BelongsTo = Base.extend({ + _type: 'belongs-to', + validate(value) { if (value) { if (isPromise(value)) { - return value.then(model => model ? get(model, 'validations') : true); + return value.then((model) => model ? get(model, 'validations') : true); } return get(value, 'validations'); } diff --git a/addon/validators/collection.js b/addon/validators/collection.js index 710d9296..72face27 100755 --- a/addon/validators/collection.js +++ b/addon/validators/collection.js @@ -4,11 +4,10 @@ */ import Ember from 'ember'; -import Base from 'ember-cp-validations/validators/base'; +import EmberValidator from 'ember-cp-validations/-private/ember-validator'; const { - get, - isArray + get } = Ember; /** @@ -29,7 +28,8 @@ const { * @module Validators * @extends Base */ -const Collection = Base.extend({ +const Collection = EmberValidator.extend({ + _type: 'collection', /** * Normalized options passed in. @@ -56,26 +56,12 @@ const Collection = Base.extend({ }; } return this._super(opts, defaultOptions, globalOptions); - }, - - validate(value, options) { - const isCollection = get(options, 'collection'); - - if (isCollection === true && !isArray(value)) { - return this.createErrorMessage('collection', value, options); - } - - if (isCollection === false && isArray(value)) { - return this.createErrorMessage('singular', value, options); - } - - return true; } }); Collection.reopenClass({ getDependentsFor(attribute, options) { - return (options === true || get(options, 'collection') === true) ? [ `model.${attribute}.[]` ] : []; + return (options === true || get(options, 'collection') === true) ? [`model.${attribute}.[]`] : []; } }); diff --git a/addon/validators/confirmation.js b/addon/validators/confirmation.js index 1944f54b..2a85ab1b 100755 --- a/addon/validators/confirmation.js +++ b/addon/validators/confirmation.js @@ -4,13 +4,11 @@ */ import Ember from 'ember'; -import Base from 'ember-cp-validations/validators/base'; +import EmberValidator from 'ember-cp-validations/-private/ember-validator'; const { get, - assert, - isEqual, - isEmpty, + assert } = Ember; /** @@ -34,27 +32,17 @@ const { * @module Validators * @extends Base */ -const Confirmation = Base.extend({ - validate(value, options, model, attribute) { - const on = get(options, 'on'); - - assert(`[ember-cp-validations] [validator:confirmation] [${attribute}] option 'on' is required`, !isEmpty(on)); - - if (!isEqual(value, get(model, on))) { - return this.createErrorMessage('confirmation', value, options); - } - - return true; - } +const Confirmation = EmberValidator.extend({ + _type: 'confirmation' }); Confirmation.reopenClass({ getDependentsFor(attribute, options) { - const on = get(options, 'on'); + let on = get(options, 'on'); - assert(`[ember-cp-validations] [validator:confirmation] [${attribute}] 'on' must be a string`, typeof on === 'string'); + assert(`[validator:confirmation] [${attribute}] 'on' must be a string`, typeof on === 'string'); - return on ? [ `model.${on}` ] : []; + return on ? [`model.${on}`] : []; } }); diff --git a/addon/validators/date.js b/addon/validators/date.js index 0fcf8dd7..c4d7f2f2 100755 --- a/addon/validators/date.js +++ b/addon/validators/date.js @@ -3,24 +3,7 @@ * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms. */ -import Ember from 'ember'; -import Base from 'ember-cp-validations/validators/base'; -import { requireModule } from 'ember-cp-validations/utils/utils'; - -const moment = requireModule('moment'); - -if (!moment) { - throw new Error('MomentJS is required to use the Date validator. The easiest way to install moment.js is to install ember-moment.\n' + - 'Installation instructions and documentation can be found at https://github.com/stefanpenner/ember-moment'); -} - -const { - getWithDefault, - getProperties, - isNone, - isEmpty, - set -} = Ember; +import EmberValidator from 'ember-cp-validations/-private/ember-validator'; /** * Validate over a date range. Uses [MomentJS](http://momentjs.com/) for date mathematics and calculations. @@ -53,70 +36,6 @@ const { * @module Validators * @extends Base */ -export default Base.extend({ - - _parseDate(date, format, useStrict = false) { - if (date === 'now' || isEmpty(date)) { - return moment(); - } - - return isNone(format) ? moment(new Date(date)) : moment(date, format, useStrict); - }, - - validate(value, options) { - const errorFormat = getWithDefault(options, 'errorFormat', 'MMM Do, YYYY'); - const { format, precision, allowBlank } = getProperties(options, ['format', 'precision', 'allowBlank']); - let { before, onOrBefore, after, onOrAfter } = getProperties(options, ['before', 'onOrBefore', 'after', 'onOrAfter']); - let date; - - if (allowBlank && isEmpty(value)) { - return true; - } - - if (format) { - date = this._parseDate(value, format, true); - if (!date.isValid()) { - return this.createErrorMessage('wrongDateFormat', value, options); - } - } else { - date = this._parseDate(value); - if (!date.isValid()) { - return this.createErrorMessage('date', value, options); - } - } - - if (before) { - before = this._parseDate(before, format); - if (!date.isBefore(before, precision)) { - set(options, 'before', before.format(errorFormat)); - return this.createErrorMessage('before', value, options); - } - } - - if (onOrBefore) { - onOrBefore = this._parseDate(onOrBefore, format); - if (!date.isSameOrBefore(onOrBefore, precision)) { - set(options, 'onOrBefore', onOrBefore.format(errorFormat)); - return this.createErrorMessage('onOrBefore', value, options); - } - } - - if (after) { - after = this._parseDate(after, format); - if (!date.isAfter(after, precision)) { - set(options, 'after', after.format(errorFormat)); - return this.createErrorMessage('after', value, options); - } - } - - if (onOrAfter) { - onOrAfter = this._parseDate(onOrAfter, format); - if (!date.isSameOrAfter(onOrAfter, precision)) { - set(options, 'onOrAfter', onOrAfter.format(errorFormat)); - return this.createErrorMessage('onOrAfter', value, options); - } - } - - return true; - } +export default EmberValidator.extend({ + _type: 'date' }); diff --git a/addon/validators/dependent.js b/addon/validators/dependent.js index 3b6961ba..8a7be4d2 100755 --- a/addon/validators/dependent.js +++ b/addon/validators/dependent.js @@ -14,6 +14,7 @@ const { assert, isNone, isEmpty, + isPresent, isArray } = Ember; @@ -36,10 +37,12 @@ const { * @extends Base */ const Dependent = Base.extend({ + _type: 'dependent', + validate(value, options, model, attribute) { - const { on, allowBlank } = getProperties(options, ['on', 'allowBlank']); + let { on, allowBlank } = getProperties(options, ['on', 'allowBlank']); - assert(`[ember-cp-validations] [validator:dependent] [${attribute}] option 'on' is required`, !isEmpty(on)); + assert(`[validator:dependent] [${attribute}] option 'on' is required`, isPresent(on)); if (isNone(model)) { return true; @@ -49,9 +52,9 @@ const Dependent = Base.extend({ return true; } - const dependentValidations = getWithDefault(options, 'on', A()).map(dependent => get(model, `validations.attrs.${dependent}`)); + let dependentValidations = getWithDefault(options, 'on', A()).map((dependent) => get(model, `validations.attrs.${dependent}`)); - if (!isEmpty(dependentValidations.filter(v => !get(v, 'isTruelyValid')))) { + if (!isEmpty(dependentValidations.filter((v) => !get(v, 'isTruelyValid')))) { return this.createErrorMessage('invalid', value, options); } @@ -61,12 +64,12 @@ const Dependent = Base.extend({ Dependent.reopenClass({ getDependentsFor(attribute, options) { - const dependents = get(options, 'on'); + let dependents = get(options, 'on'); - assert(`[ember-cp-validations] [validator:dependent] [${attribute}] 'on' must be an array`, isArray(dependents)); + assert(`[validator:dependent] [${attribute}] 'on' must be an array`, isArray(dependents)); if (!isEmpty(dependents)) { - return dependents.map(dependent => `${dependent}.isTruelyValid`); + return dependents.map((dependent) => `${dependent}.isTruelyValid`); } return []; diff --git a/addon/validators/ds-error.js b/addon/validators/ds-error.js index fec915f9..e1956bf6 100755 --- a/addon/validators/ds-error.js +++ b/addon/validators/ds-error.js @@ -3,20 +3,8 @@ * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms. */ -import Ember from 'ember'; -import Base from 'ember-cp-validations/validators/base'; -import { requireModule } from 'ember-cp-validations/utils/utils'; - -const DS = requireModule('ember-data'); - -if (!DS) { - throw new Error('Ember-Data is required to use the DS Error validator.'); -} - -const { - get, - isNone -} = Ember; +import EmberValidator from 'ember-cp-validations/-private/ember-validator'; +import { getPathAndKey } from 'ember-validators/ds-error'; /** * Creates a link between this library and Ember-Data's [DS.Errors](http://emberjs.com/api/data/classes/DS.Errors.html) @@ -31,35 +19,16 @@ const { * @module Validators * @extends Base */ -const DSError = Base.extend({ - validate(value, options, model, attribute) { - let { path, key } = getPathAndKey(attribute); - - const errors = get(model, path); - - if (!isNone(errors) && errors instanceof DS.Errors && errors.has(key)) { - return get(errors.errorsFor(key), 'lastObject.message'); - } - - return true; - } +const DSError = EmberValidator.extend({ + _type: 'ds-error' }); DSError.reopenClass({ getDependentsFor(attribute) { let { path, key } = getPathAndKey(attribute); - return [ `model.${path}.${key}.[]` ]; + return [`model.${path}.${key}.[]`]; } }); -function getPathAndKey(attribute) { - let path = attribute.split('.'); - let key = path.pop(); - - path.push('errors'); - - return { path: path.join('.'), key }; -} - export default DSError; diff --git a/addon/validators/exclusion.js b/addon/validators/exclusion.js index 17842bca..80e09b4f 100755 --- a/addon/validators/exclusion.js +++ b/addon/validators/exclusion.js @@ -3,16 +3,7 @@ * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms. */ -import Ember from 'ember'; -import Base from 'ember-cp-validations/validators/base'; - -const { - get, - typeOf, - isEmpty, - assert, - getProperties -} = Ember; +import EmberValidator from 'ember-cp-validations/-private/ember-validator'; /** * Validates that the attributes’ values are not included in a given list. All comparisons are done using strict equality so type matters! For range, the value type is checked against both lower and upper bounds for type equality. @@ -36,31 +27,6 @@ const { * @module Validators * @extends Base */ -export default Base.extend({ - validate(value, options, model, attribute) { - const array = get(options, 'in'); - const { range, allowBlank } = getProperties(options, ['range', 'allowBlank']); - - assert(`[ember-cp-validations] [validator:exclusion] [${attribute}] no options were passed in`, !isEmpty(Object.keys(options))); - - if (allowBlank && isEmpty(value)) { - return true; - } - - if (array && array.indexOf(value) !== -1) { - return this.createErrorMessage('exclusion', value, options); - } - - if (range && range.length === 2) { - const min = range[0]; - const max = range[1]; - const equalType = typeOf(value) === typeOf(min) && typeOf(value) === typeOf(max); - - if (equalType && min <= value && value <= max) { - return this.createErrorMessage('exclusion', value, options); - } - } - - return true; - } +export default EmberValidator.extend({ + _type: 'exclusion' }); diff --git a/addon/validators/format.js b/addon/validators/format.js index d288859a..3459ffd0 100755 --- a/addon/validators/format.js +++ b/addon/validators/format.js @@ -1,18 +1,15 @@ - /** * Copyright 2016, Yahoo! Inc. * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms. */ import Ember from 'ember'; -import Base from 'ember-cp-validations/validators/base'; +import EmberValidator from 'ember-cp-validations/-private/ember-validator'; +import { regularExpressions } from 'ember-validators/format'; const { get, - isNone, - isEmpty, - assert, - getProperties + isNone } = Ember; /** @@ -57,13 +54,9 @@ const { * @module Validators * @extends Base */ -export default Base.extend({ - regularExpressions: { - email: /^[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i, - emailOptionalTld: /^[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.?)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i, - phone: /^([\+]?1\s*[-\/\.]?\s*)?(\((\d{3})\)|(\d{3}))\s*[-\/\.]?\s*(\d{3})\s*[-\/\.]?\s*(\d{4})\s*(([xX]|[eE][xX][tT]?[\.]?|extension)\s*([#*\d]+))*$/, - url: /(?:([A-Za-z]+):)?(\/{0,3})[a-zA-Z0-9][a-zA-Z-0-9]*(\.[\w-]+)+([\w.,@?^=%&:\/~+#-{}]*[\w@?^=%&\/~+#-{}])??/ - }, +export default EmberValidator.extend({ + _type: 'format', + regularExpressions, /** * Normalized options passed in by applying the desired regex or using the one declared @@ -75,8 +68,8 @@ export default Base.extend({ * @return {Object} */ buildOptions(options = {}, defaultOptions = {}, globalOptions = {}) { - const regularExpressions = get(this, 'regularExpressions'); - const { regex, type } = options; + let regularExpressions = get(this, 'regularExpressions'); + let { regex, type } = options; if (type && !isNone(regularExpressions[type]) && isNone(regex)) { if (type === 'email' && options.allowNonTld) { @@ -87,21 +80,5 @@ export default Base.extend({ } return this._super(options, defaultOptions, globalOptions); - }, - - validate(value, options, model, attribute) { - const { regex, type, allowBlank } = getProperties(options, ['regex', 'type', 'allowBlank']); - - assert(`[ember-cp-validations] [validator:format] [${attribute}] no options were passed in`, !isEmpty(Object.keys(options))); - - if (allowBlank && isEmpty(value)) { - return true; - } - - if (regex && !regex.test(value)) { - return this.createErrorMessage(type || 'invalid', value, options); - } - - return true; } }); diff --git a/addon/validators/has-many.js b/addon/validators/has-many.js index da707526..b2dabd27 100755 --- a/addon/validators/has-many.js +++ b/addon/validators/has-many.js @@ -52,12 +52,14 @@ import { isPromise } from 'ember-cp-validations/utils/utils'; * @extends Base */ const HasMany = Base.extend({ + _type: 'has-many', + validate(value) { if (value) { if (isPromise(value)) { - return value.then(models => models ? models.map(m => m.get('validations')) : true); + return value.then((models) => models ? models.map((m) => m.get('validations')) : true); } - return value.map(m => m.get('validations')); + return value.map((m) => m.get('validations')); } return true; diff --git a/addon/validators/inclusion.js b/addon/validators/inclusion.js index c3dc75af..5facbda3 100755 --- a/addon/validators/inclusion.js +++ b/addon/validators/inclusion.js @@ -3,16 +3,7 @@ * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms. */ -import Ember from 'ember'; -import Base from 'ember-cp-validations/validators/base'; - -const { - get, - typeOf, - assert, - isEmpty, - getProperties -} = Ember; +import EmberValidator from 'ember-cp-validations/-private/ember-validator'; /** * Validates that the attributes’ values are included in a given list. All comparisons are done using strict equality so type matters! @@ -52,31 +43,6 @@ const { * @module Validators * @extends Base */ -export default Base.extend({ - validate(value, options, model, attribute) { - const array = get(options, 'in'); - const { range, allowBlank } = getProperties(options, ['range', 'allowBlank']); - - assert(`[ember-cp-validations] [validator:inclusion] [${attribute}] no options were passed in`, !isEmpty(Object.keys(options))); - - if (allowBlank && isEmpty(value)) { - return true; - } - - if (array && array.indexOf(value) === -1) { - return this.createErrorMessage('inclusion', value, options); - } - - if (range && range.length === 2) { - const min = range[0]; - const max = range[1]; - const equalType = typeOf(value) === typeOf(min) && typeOf(value) === typeOf(max); - - if (!equalType || min > value || value > max) { - return this.createErrorMessage('inclusion', value, options); - } - } - - return true; - } +export default EmberValidator.extend({ + _type: 'inclusion' }); diff --git a/addon/validators/length.js b/addon/validators/length.js index 70bf9fb1..32bacd3a 100755 --- a/addon/validators/length.js +++ b/addon/validators/length.js @@ -4,14 +4,11 @@ */ import Ember from 'ember'; -import Base from 'ember-cp-validations/validators/base'; +import EmberValidator from 'ember-cp-validations/-private/ember-validator'; const { get, - assert, - isNone, - isEmpty, - getProperties + isNone } = Ember; /** @@ -39,7 +36,9 @@ const { * @module Validators * @extends Base */ -export default Base.extend({ +export default EmberValidator.extend({ + _type: 'length', + /** * Default allowNone to true * @@ -53,33 +52,5 @@ export default Base.extend({ options.allowNone = isNone(get(options, 'allowNone')) ? true : get(options, 'allowNone'); return this._super(options, defaultOptions, globalOptions); - }, - - validate(value, options, model, attribute) { - const { allowNone, allowBlank, is, min, max } = getProperties(options, [ 'allowNone', 'allowBlank', 'is', 'min', 'max' ]); - - assert(`[ember-cp-validations] [validator:length] [${attribute}] no options were passed in`, !isEmpty(Object.keys(options))); - - if (isNone(value)) { - return allowNone ? true : this.createErrorMessage('invalid', value, options); - } - - if (allowBlank && isEmpty(value)) { - return true; - } - - if (!isNone(is) && is !== get(value, 'length')) { - return this.createErrorMessage('wrongLength', value, options); - } - - if (!isNone(min) && min > get(value, 'length')) { - return this.createErrorMessage('tooShort', value, options); - } - - if (!isNone(max) && max < get(value, 'length')) { - return this.createErrorMessage('tooLong', value, options); - } - - return true; } }); diff --git a/addon/validators/messages.js b/addon/validators/messages.js index 011dca47..ddbcecc3 100644 --- a/addon/validators/messages.js +++ b/addon/validators/messages.js @@ -3,11 +3,7 @@ * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms. */ import Ember from 'ember'; - -const { - get, - isNone -} = Ember; +import Messages from 'ember-validators/messages'; /** * The default validation error messages are imported in your app's `validators` folder. @@ -30,96 +26,4 @@ const { * @class Messages * @module Validators */ -export default Ember.Object.extend({ - - /** - * Regex for matching error message placeholders - * @private - * @property _regex - * @type {RegExp} - */ - _regex: /\{(\w+)\}/g, - - /** - * Default attribute description if one isn't passed into a validator's options - * @property defaultDescription - * @type {String} - */ - defaultDescription: 'This field', - - /** - * Get a description for a specific attribute. This is a hook - * for i18n solutions to retrieve attribute descriptions from a translation - * @method getDescriptionFor - * @param {String} attribute - * @param {Object} options - * @return {String} - */ - getDescriptionFor(attribute, options = {}) { - return get(options, 'description') || get(this, 'defaultDescription'); - }, - - /** - * Get a message with a given type - * @method getMessageFor - * @param {String} type - * @param {Object} context - * @return {String} - */ - getMessageFor(type, context = {}) { - return this.formatMessage(get(this, type), context); - }, - - /** - * Regex replace all placeholders with their given context - * @method formatMessage - * @param {String} message - * @param {Object} context - * @return {String} - */ - formatMessage(message, context = {}) { - let m = message; - - if (isNone(m) || typeof m !== 'string') { - m = get(this, 'invalid'); - } - return m.replace(get(this, '_regex'), (s, attr) => get(context, attr)); - }, - - /** - * Default validation error message strings - */ - inclusion: '{description} is not included in the list', - exclusion: '{description} is reserved', - invalid: '{description} is invalid', - confirmation: '{description} doesn\'t match {on}', - accepted: '{description} must be accepted', - empty: '{description} can\'t be empty', - blank: '{description} can\'t be blank', - present: '{description} must be blank', - collection: '{description} must be a collection', - singular: '{description} can\'t be a collection', - tooLong: '{description} is too long (maximum is {max} characters)', - tooShort: '{description} is too short (minimum is {min} characters)', - before: '{description} must be before {before}', - onOrBefore: '{description} must be on or before {onOrBefore}', - after: '{description} must be after {after}', - onOrAfter: '{description} must be on or after {onOrAfter}', - wrongDateFormat: '{description} must be in the format of {format}', - wrongLength: '{description} is the wrong length (should be {is} characters)', - notANumber: '{description} must be a number', - notAnInteger: '{description} must be an integer', - greaterThan: '{description} must be greater than {gt}', - greaterThanOrEqualTo: '{description} must be greater than or equal to {gte}', - equalTo: '{description} must be equal to {is}', - lessThan: '{description} must be less than {lt}', - lessThanOrEqualTo: '{description} must be less than or equal to {lte}', - otherThan: '{description} must be other than {value}', - odd: '{description} must be odd', - even: '{description} must be even', - positive: '{description} must be positive', - date: '{description} must be a valid date', - email: '{description} must be a valid email address', - phone: '{description} must be a valid phone number', - url: '{description} must be a valid url' -}); +export default Ember.Object.extend(Messages); diff --git a/addon/validators/number.js b/addon/validators/number.js index cc1fc5d7..1b759885 100755 --- a/addon/validators/number.js +++ b/addon/validators/number.js @@ -3,14 +3,7 @@ * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms. */ -import Ember from 'ember'; -import Base from 'ember-cp-validations/validators/base'; - -const { - get, - isEmpty, - getProperties -} = Ember; +import EmberValidator from 'ember-cp-validations/-private/ember-validator'; /** * Validates that your attributes have only numeric values. @@ -43,72 +36,6 @@ const { * @module Validators * @extends Base */ -export default Base.extend({ - validate(value, options) { - const numValue = Number(value); - const optionKeys = Object.keys(options); - const { allowBlank, allowString, integer } = getProperties(options, ['allowBlank', 'allowString', 'integer']); - - if (allowBlank && isEmpty(value)) { - return true; - } - - if (typeof value === 'string' && (isEmpty(value) || !allowString)) { - return this.createErrorMessage('notANumber', value, options); - } - - if (!this.isNumber(numValue)) { - return this.createErrorMessage('notANumber', value, options); - } - - if (integer && !this.isInteger(numValue)) { - return this.createErrorMessage('notAnInteger', value, options); - } - - for (let i = 0; i < optionKeys.length; i++) { - const type = optionKeys[i]; - const m = this._validateType(type, options, numValue); - - if (typeof m === 'string') { - return m; - } - } - - return true; - }, - - _validateType(type, options, value) { - const expected = get(options, type); - const actual = value; - - if (type === 'is' && actual !== expected) { - return this.createErrorMessage('equalTo', value, options); - } else if (type === 'lt' && actual >= expected) { - return this.createErrorMessage('lessThan', value, options); - } else if (type === 'lte' && actual > expected) { - return this.createErrorMessage('lessThanOrEqualTo', value, options); - } else if (type === 'gt' && actual <= expected) { - return this.createErrorMessage('greaterThan', value, options); - } else if (type === 'gte' && actual < expected) { - return this.createErrorMessage('greaterThanOrEqualTo', value, options); - } else if (type === 'positive' && actual < 0) { - return this.createErrorMessage('positive', value, options); - } else if (type === 'odd' && actual % 2 === 0) { - return this.createErrorMessage('odd', value, options); - } else if (type === 'even' && actual % 2 !== 0) { - return this.createErrorMessage('even', value, options); - } - - return true; - }, - - /* Use polyfills instead of Number.isNaN or Number.isInteger to support IE & Safari */ - - isNumber(value) { - return typeof value === 'number' && !isNaN(value); - }, - - isInteger(value) { - return typeof value === 'number' && isFinite(value) && Math.floor(value) === value; - } +export default EmberValidator.extend({ + _type: 'number' }); diff --git a/addon/validators/presence.js b/addon/validators/presence.js index 3d77bb2a..9ccae669 100755 --- a/addon/validators/presence.js +++ b/addon/validators/presence.js @@ -3,16 +3,7 @@ * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms. */ -import Ember from 'ember'; -import Base from 'ember-cp-validations/validators/base'; -import { unwrapProxy } from 'ember-cp-validations/utils/utils'; - -const { - assert, - isEmpty, - isPresent, - getProperties -} = Ember; +import EmberValidator from 'ember-cp-validations/-private/ember-validator'; /** * If `true` validates that the given value is not empty, if `false`, validates that the given value is empty. @@ -40,7 +31,8 @@ const { * @module Validators * @extends Base */ -export default Base.extend({ +export default EmberValidator.extend({ + _type: 'presence', /** * Normalized options passed in. @@ -67,29 +59,5 @@ export default Base.extend({ }; } return this._super(opts, defaultOptions, globalOptions); - }, - - validate(value, options, model, attribute) { - const { presence, ignoreBlank } = getProperties(options, ['presence', 'ignoreBlank']); - - assert(`[ember-cp-validations] [validator:presence] [${attribute}] option 'presence' is required`, !isEmpty(presence)); - - if (presence === true && !this._isPresent(value, ignoreBlank)) { - return this.createErrorMessage('blank', value, options); - } - - if (presence === false && this._isPresent(value, ignoreBlank)) { - return this.createErrorMessage('present', value, options); - } - - return true; - }, - - /** - * Handle presence of ember proxy based instances - */ - _isPresent(value, ignoreBlank = false) { - const v = unwrapProxy(value); - return ignoreBlank ? isPresent(v) : !isEmpty(v); } }); diff --git a/jsconfig.json b/jsconfig.json new file mode 100644 index 00000000..f408cac8 --- /dev/null +++ b/jsconfig.json @@ -0,0 +1 @@ +{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]} \ No newline at end of file diff --git a/package.json b/package.json index ad734ab4..dc5781fa 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "ember-load-initializers": "^0.5.1", "ember-moment": "6.1.0", "ember-resolver": "^2.0.3", + "ember-suave": "4.0.1", "ember-truth-helpers": "1.2.0", "loader.js": "^4.0.11", "moment": "2.15.1", @@ -82,6 +83,7 @@ "ember-cli-babel": "^5.1.8", "ember-cli-version-checker": "^1.1.4", "ember-getowner-polyfill": "^1.0.1", + "ember-validators": "~0.1.0", "ember-string-ishtmlsafe-polyfill": "1.0.1", "exists-sync": "0.0.3", "walk-sync": "^0.3.1" diff --git a/tests/acceptance/dummy-index-test.js b/tests/acceptance/dummy-index-test.js index aa40a234..4cb015de 100644 --- a/tests/acceptance/dummy-index-test.js +++ b/tests/acceptance/dummy-index-test.js @@ -1,40 +1,37 @@ -import Ember from "ember"; -import { - module, test -} -from 'qunit'; +import Ember from 'ember'; +import { module, test } from 'qunit'; import startApp from '../helpers/start-app'; -var App; +let App; -var validInputValues = { - username: "offirgolan", - password: "Pass123", - email: "offirgolan@gmail.com", - emailConfirmation: "offirgolan@gmail.com", - firstName: "Offir", - lastName: "Golan", - dob: "1/1/1930" +const validInputValues = { + username: 'offirgolan', + password: 'Pass123', + email: 'offirgolan@gmail.com', + emailConfirmation: 'offirgolan@gmail.com', + firstName: 'Offir', + lastName: 'Golan', + dob: '1/1/1930' }; module('Acceptance | Dummy | index', { - beforeEach: function() { + beforeEach() { App = startApp(); }, - afterEach: function() { + afterEach() { Ember.run(App, App.destroy); } }); -test("Page Loads", function(assert) { +test('Page Loads', function(assert) { assert.expect(2); visit('/'); andThen(function() { - assert.equal(find('a.navbar-brand').text().trim(), "CP Validations"); - assert.equal(find('.form .register h2').text(), "Create an Account"); + assert.equal(find('a.navbar-brand').text().trim(), 'CP Validations'); + assert.equal(find('.form .register h2').text(), 'Create an Account'); }); }); -test("Helper tooltips", function(assert) { +test('Helper tooltips', function(assert) { assert.expect(2); visit('/'); andThen(function() { @@ -43,7 +40,7 @@ test("Helper tooltips", function(assert) { }); }); -test("Invalid form submit", function(assert) { +test('Invalid form submit', function(assert) { visit('/'); andThen(function() { click('#signup'); @@ -54,11 +51,11 @@ test("Invalid form submit", function(assert) { }); }); -test("Valid form submit", function(assert) { +test('Valid form submit', function(assert) { visit('/'); andThen(function() { Object.keys(validInputValues).forEach((input) => { - let $input = find(`.validated-input input[name="${input}"]`); + let $input = find(`.validated-input input[name='${input}']`); assert.ok($input, `${input} found`); fillIn($input, validInputValues[input]); assert.ok($input.parent('.validated-input.has-success'), `${input} success`); @@ -72,10 +69,10 @@ test("Valid form submit", function(assert) { }); }); -test("Invalid to valid email", function(assert) { +test('Invalid to valid email', function(assert) { assert.expect(4); visit('/'); - var $input; + let $input; andThen(function() { $input = find('.validated-input input[name="email"]'); assert.ok($input); @@ -86,7 +83,7 @@ test("Invalid to valid email", function(assert) { assert.equal($input.parent('.form-group').find('.input-error .error').text().trim(), 'This field must be a valid email address'); assert.ok($input.parent('.validated-input.has-error')); - fillIn($input, validInputValues['email']); + fillIn($input, validInputValues.email); assert.ok($input.parent('.validated-input.has-success')); }); }); diff --git a/tests/dummy/app/components/validated-input.js b/tests/dummy/app/components/validated-input.js index 32e4cd06..251b4a3a 100644 --- a/tests/dummy/app/components/validated-input.js +++ b/tests/dummy/app/components/validated-input.js @@ -35,7 +35,7 @@ export default Ember.Component.extend({ init() { this._super(...arguments); - const valuePath = this.get('valuePath'); + let valuePath = this.get('valuePath'); defineProperty(this, 'validation', computed.readOnly(`model.validations.attrs.${valuePath}`)); defineProperty(this, 'value', computed.alias(`model.${valuePath}`)); diff --git a/tests/dummy/app/controllers/index.js b/tests/dummy/app/controllers/index.js index 1b1e4163..5e4785ed 100644 --- a/tests/dummy/app/controllers/index.js +++ b/tests/dummy/app/controllers/index.js @@ -16,7 +16,7 @@ export default Ember.Controller.extend({ this.get('model').validate().then(({ validations }) => { this.set('didValidate', true); - if(validations.get('isValid')) { + if (validations.get('isValid')) { this.setProperties({ showAlert: false, isRegistered: true, diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html index f4e263bd..0b9625ad 100644 --- a/tests/dummy/app/index.html +++ b/tests/dummy/app/index.html @@ -1,27 +1,27 @@ - - + + Ember CP Validations - - + + {{content-for 'head'}} - - + + - + {{content-for 'head-footer'}} {{content-for 'body'}} - - - + + + {{content-for 'body-footer'}} diff --git a/tests/dummy/app/models/order-line.js b/tests/dummy/app/models/order-line.js index 02b689b1..8ede276e 100644 --- a/tests/dummy/app/models/order-line.js +++ b/tests/dummy/app/models/order-line.js @@ -6,21 +6,21 @@ from 'ember-cp-validations'; const Validations = buildValidations({ type: { - description: "Order Line Type", + description: 'Order Line Type', validators: [ validator('ds-error'), validator('presence', true) ] }, order: { - description: "Order", + description: 'Order', validators: [ validator('ds-error'), validator('presence', true) ] }, selections: { - description: "Order Selections", + description: 'Order Selections', validators: [ validator('ds-error'), validator('has-many'), @@ -33,4 +33,4 @@ export default DS.Model.extend(Validations, { order: DS.belongsTo('order', { async: true }), selections: DS.hasMany('order-selection', { async: true }), type: DS.attr('string') -}); \ No newline at end of file +}); diff --git a/tests/dummy/app/models/order-selection-question.js b/tests/dummy/app/models/order-selection-question.js index e8d5dc41..f3604bce 100644 --- a/tests/dummy/app/models/order-selection-question.js +++ b/tests/dummy/app/models/order-selection-question.js @@ -6,21 +6,21 @@ from 'ember-cp-validations'; const Validations = buildValidations({ order: { - description: "Order", + description: 'Order', validators: [ validator('ds-error'), validator('presence', true) ] }, selection: { - description: "Order Selection", + description: 'Order Selection', validators: [ validator('ds-error'), validator('presence', true) ] }, text: { - description: "Question Text", + description: 'Question Text', validators: [ validator('ds-error'), validator('presence', true) diff --git a/tests/dummy/app/models/order-selection.js b/tests/dummy/app/models/order-selection.js index 3f773a2a..06926f49 100644 --- a/tests/dummy/app/models/order-selection.js +++ b/tests/dummy/app/models/order-selection.js @@ -6,7 +6,7 @@ from 'ember-cp-validations'; const Validations = buildValidations({ quantity: { - description: "Quantity", + description: 'Quantity', validators: [ validator('ds-error'), validator('number', { @@ -15,7 +15,7 @@ const Validations = buildValidations({ ] }, order: { - description: "Order", + description: 'Order', validators: [ validator('ds-error'), validator('belongs-to'), @@ -23,14 +23,14 @@ const Validations = buildValidations({ ] }, line: { - description: "Order Line", + description: 'Order Line', validators: [ validator('ds-error'), validator('presence', true) ] }, questions: { - description: "Order Selection Questions", + description: 'Order Selection Questions', validators: [ validator('ds-error'), validator('has-many'), diff --git a/tests/dummy/app/models/order.js b/tests/dummy/app/models/order.js index ebbae133..6e8a0473 100644 --- a/tests/dummy/app/models/order.js +++ b/tests/dummy/app/models/order.js @@ -6,14 +6,14 @@ from 'ember-cp-validations'; const Validations = buildValidations({ source: { - description: "Order Source", + description: 'Order Source', validators: [ validator('ds-error'), validator('presence', true) ] }, lines: { - description: "Order Lines", + description: 'Order Lines', validators: [ validator('ds-error'), validator('has-many'), diff --git a/tests/dummy/app/models/signup.js b/tests/dummy/app/models/signup.js index 75ebafbf..8f05855d 100644 --- a/tests/dummy/app/models/signup.js +++ b/tests/dummy/app/models/signup.js @@ -1,19 +1,14 @@ import DS from 'ember-data'; -import { - validator, buildValidations -} -from 'ember-cp-validations'; - +import { validator, buildValidations } from 'ember-cp-validations'; let Validations = buildValidations({ name: validator('presence', true), acceptTerms: validator((value) => { return value || 'You must accept the terms.'; - }), + }) }); - export default DS.Model.extend(Validations, { name: DS.attr('string', { defaultValue: '' }), - acceptTerms: DS.attr('boolean', { defaultValue: false }), + acceptTerms: DS.attr('boolean', { defaultValue: false }) }); diff --git a/tests/dummy/app/models/user-detail.js b/tests/dummy/app/models/user-detail.js index 69708fc5..12441aac 100644 --- a/tests/dummy/app/models/user-detail.js +++ b/tests/dummy/app/models/user-detail.js @@ -3,7 +3,7 @@ * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms. */ - // BEGIN-SNIPPET user-detail-model +// BEGIN-SNIPPET user-detail-model import Ember from 'ember'; import DS from 'ember-data'; import moment from 'moment'; @@ -12,7 +12,7 @@ import { validator, buildValidations } from 'ember-cp-validations'; const { computed } = Ember; const { attr } = DS; -var Validations = buildValidations({ +const Validations = buildValidations({ firstName: validator('presence', true), lastName: validator('presence', true), dob: { @@ -25,7 +25,7 @@ var Validations = buildValidations({ return moment().subtract(120, 'years').format('M/D/YYYY'); }).volatile(), format: 'M/D/YYYY', - message: function(type, value /*, context */) { + message(type, value /*, context */) { if (type === 'before') { return 'Are you from the future?'; } diff --git a/tests/dummy/app/models/user.js b/tests/dummy/app/models/user.js index 1d12de8f..5d703108 100644 --- a/tests/dummy/app/models/user.js +++ b/tests/dummy/app/models/user.js @@ -3,13 +3,13 @@ * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms. */ - // BEGIN-SNIPPET user-model +// BEGIN-SNIPPET user-model import DS from 'ember-data'; import { validator, buildValidations } from 'ember-cp-validations'; const { attr } = DS; -var Validations = buildValidations({ +const Validations = buildValidations({ username: { description: 'Username', validators: [ diff --git a/tests/dummy/app/styles/app.less b/tests/dummy/app/styles/app.less index 8edc4f20..59025da8 100644 --- a/tests/dummy/app/styles/app.less +++ b/tests/dummy/app/styles/app.less @@ -1,8 +1,8 @@ @accent-color: #f23818; -@import "./navbar.less"; -@import "./form.less"; -@import "./code-snippet.less"; +@import './navbar.less'; +@import './form.less'; +@import './code-snippet.less'; body, html { diff --git a/tests/dummy/app/styles/form.less b/tests/dummy/app/styles/form.less index c53ca9d2..1333e426 100644 --- a/tests/dummy/app/styles/form.less +++ b/tests/dummy/app/styles/form.less @@ -23,7 +23,7 @@ -webkti-box-sizing: border-box; box-sizing: border-box; font-size: 14px; - font-wieght: 400; + font-weight: 400; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; transition: all 0.3s linear 0s; @@ -108,7 +108,7 @@ input.form-control:focus { border: 0; border-radius: 3px; color: #ffffff; - font-family: "Roboto"; + font-family: 'Roboto'; font-size: 14px; font-weight: 400; -webkit-font-smoothing: antialiased; diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs index b540178a..e5075e03 100644 --- a/tests/dummy/app/templates/application.hbs +++ b/tests/dummy/app/templates/application.hbs @@ -1,38 +1,38 @@ - -
+
{{outlet}}
diff --git a/tests/dummy/app/templates/components/validated-input.hbs b/tests/dummy/app/templates/components/validated-input.hbs index 8dbcfa96..006d39c2 100644 --- a/tests/dummy/app/templates/components/validated-input.hbs +++ b/tests/dummy/app/templates/components/validated-input.hbs @@ -1,19 +1,19 @@ {{!-- BEGIN-SNIPPET validated-input --}} -
- {{input type=type value=value placeholder=placeholder class="form-control" name=valuePath}} +
+ {{input type=type value=value placeholder=placeholder class='form-control' name=valuePath}} {{#if isValid}} - + {{/if}} -
+
{{#if showErrorMessage}} -
+
{{v-get model valuePath 'message'}}
{{/if}} {{#if showWarningMessage}} -
+
{{v-get model valuePath 'warningMessage'}}
{{/if}} diff --git a/tests/dummy/app/templates/index.hbs b/tests/dummy/app/templates/index.hbs index 26311c00..227adbdb 100644 --- a/tests/dummy/app/templates/index.hbs +++ b/tests/dummy/app/templates/index.hbs @@ -1,18 +1,18 @@ -
+
{{#unless isRegistered}} -
+

Create an Account

{{#if showAlert}} -
-
+
+
Please fix all the errors below before continuing.
{{/if}}
-
+
{{#unless showCode}} -
+
These form inputs are bound to the User model which is created in the route's model hook. Each one of these fields has validations to make sure we we receive the data we want.
{{/unless}} @@ -25,9 +25,9 @@

About Me

-
+
{{#unless showCode}} -
+
We have a secondary model, User Details, which holds extra information about our user. This model is part of the User model via a belongsTo relationship.
{{/unless}} @@ -38,45 +38,45 @@ {{validated-input model=model.details valuePath='phone' placeholder='Phone #' didValidate=didValidate}} {{validated-input model=model.details valuePath='url' placeholder='URL' didValidate=didValidate}}
-
+
{{#unless showCode}} -
+
On submit, a manual validation is run which will validate both the User and User Details models. If both are valid, then the user can continue to the next screen.
{{/unless}} - +
{{else}} -
- {{!-- --}} -
-

Success

+
+ {{!-- --}} +
+

Success

{{/unless}}
{{#unless isRegistered}} -
-
    - -
  • models/user-detail.js
    • -
  • validated-input.js
    • -
  • validated-input.hbs
    • +
    + -
    -
    {{code-snippet name="user-model.js"}}
    -
    {{code-snippet name="user-detail-model.js"}}
    -
    {{code-snippet name="validated-input.js"}}
    -
    {{code-snippet name="validated-input.hbs"}}
    +
    +
    {{code-snippet name='user-model.js'}}
    +
    {{code-snippet name='user-detail-model.js'}}
    +
    {{code-snippet name='validated-input.js'}}
    +
    {{code-snippet name='validated-input.hbs'}}
    {{/unless}} diff --git a/tests/helpers/ensure-get-registered.js b/tests/helpers/ensure-get-registered.js index 63571de9..6957b7e5 100644 --- a/tests/helpers/ensure-get-registered.js +++ b/tests/helpers/ensure-get-registered.js @@ -14,9 +14,9 @@ function requireIfAvailable(moduleName, exportName = 'default') { } } -var registerHelper = requireIfAvailable('ember-get-helper/utils/register-helper', 'registerHelper'); -var getHelper = requireIfAvailable('ember-get-helper/helpers/get'); -var getHelperGlimmer = requireIfAvailable('ember-get-helper/helpers/get-glimmer'); +let registerHelper = requireIfAvailable('ember-get-helper/utils/register-helper', 'registerHelper'); +let getHelper = requireIfAvailable('ember-get-helper/helpers/get'); +let getHelperGlimmer = requireIfAvailable('ember-get-helper/helpers/get-glimmer'); if (registerHelper) { if (Ember.Helper) { diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js index 76996fd0..c1184b8c 100644 --- a/tests/helpers/module-for-acceptance.js +++ b/tests/helpers/module-for-acceptance.js @@ -11,12 +11,12 @@ export default function(name, options = {}) { this.application = startApp(); if (options.beforeEach) { - return options.beforeEach.apply(this, arguments); + return options.beforeEach.call(this, ...arguments); } }, afterEach() { - let afterEach = options.afterEach && options.afterEach.apply(this, arguments); + let afterEach = options.afterEach && options.afterEach.call(this, ...arguments); return Promise.resolve(afterEach).then(() => destroyApp(this.application)); } }); diff --git a/tests/integration/helpers/v-get-test.js b/tests/integration/helpers/v-get-test.js index 2d11ea6c..8005364a 100644 --- a/tests/integration/helpers/v-get-test.js +++ b/tests/integration/helpers/v-get-test.js @@ -6,7 +6,7 @@ import '../../helpers/ensure-get-registered'; moduleForComponent('helper:v-get', 'Integration | Helper | v-get', { integration: true, beforeEach() { - var model = Ember.Object.create({ + let model = Ember.Object.create({ validations: { isValid: false, isInvalid: true, @@ -25,7 +25,6 @@ moduleForComponent('helper:v-get', 'Integration | Helper | v-get', { } }); - test('it renders', function(assert) { assert.expect(1); @@ -43,10 +42,8 @@ test('access attribute validations', function(assert) { this.render(hbs`{{v-get model 'email' 'isValid'}}`); assert.equal(this.$().text().trim(), 'true'); - }); - test('updating validation should rerender', function(assert) { assert.expect(2); diff --git a/tests/integration/validations/factory-dependent-keys-test.js b/tests/integration/validations/factory-dependent-keys-test.js index 4ed68a33..1dbdaf20 100644 --- a/tests/integration/validations/factory-dependent-keys-test.js +++ b/tests/integration/validations/factory-dependent-keys-test.js @@ -11,20 +11,20 @@ moduleFor('foo', 'Integration | Validations | Factory - Dependent Keys', { integration: true }); -test("collection validator creates correct dependent keys", function(assert) { +test('collection validator creates correct dependent keys', function(assert) { this.register('validator:collection', CollectionValidator); this.register('validator:length', LengthValidator); - var CollectionValidations = buildValidations({ + let CollectionValidations = buildValidations({ array: [ validator('collection', true), validator('length', { is: 2, - message: "Array must have {is} items" + message: 'Array must have {is} items' }) ] }); - var obj = setupObject(this, Ember.Object.extend(CollectionValidations), { + let obj = setupObject(this, Ember.Object.extend(CollectionValidations), { array: Ember.A(['foo', 'bar']) }); @@ -36,14 +36,14 @@ test("collection validator creates correct dependent keys", function(assert) { assert.equal(obj.get('validations.attrs.array.message'), 'Array must have 2 items'); }); -test("ds-error validator creates correct dependent keys", function(assert) { +test('ds-error validator creates correct dependent keys', function(assert) { this.register('validator:ds-error', DSErrorValidator); this.register('validator:length', LengthValidator); - var DSErrorValidations = buildValidations({ + let DSErrorValidations = buildValidations({ username: validator('ds-error') }); - var obj = setupObject(this, Ember.Object.extend(DSErrorValidations), { + let obj = setupObject(this, Ember.Object.extend(DSErrorValidations), { errors: DS.Errors.create(), username: '' }); @@ -56,15 +56,15 @@ test("ds-error validator creates correct dependent keys", function(assert) { assert.equal(obj.get('validations.attrs.username.message'), 'Username is not unique'); }); -test("nested ds-error validator creates correct dependent keys", function(assert) { +test('nested ds-error validator creates correct dependent keys', function(assert) { this.register('validator:ds-error', DSErrorValidator); this.register('validator:length', LengthValidator); - var DSErrorValidations = buildValidations({ + let DSErrorValidations = buildValidations({ 'model.username': validator('ds-error') }); - var obj = setupObject(this, Ember.Object.extend(DSErrorValidations), { + let obj = setupObject(this, Ember.Object.extend(DSErrorValidations), { model: Ember.Object.create({ errors: DS.Errors.create(), username: '' @@ -79,9 +79,8 @@ test("nested ds-error validator creates correct dependent keys", function(assert assert.equal(obj.get('validations.attrs.model.username.message'), 'Username is not unique'); }); - -test("custom dependent keys - simple", function(assert) { - var Validations = buildValidations({ +test('custom dependent keys - simple', function(assert) { + let Validations = buildValidations({ fullName: validator(function(value, options, model) { let firstName = model.get('firstName'); let lastName = model.get('lastName'); @@ -94,7 +93,7 @@ test("custom dependent keys - simple", function(assert) { }) }); - var obj = setupObject(this, Ember.Object.extend(Validations)); + let obj = setupObject(this, Ember.Object.extend(Validations)); assert.equal(obj.get('validations.isValid'), false); assert.equal(obj.get('validations.attrs.fullName.isValid'), false); @@ -107,8 +106,8 @@ test("custom dependent keys - simple", function(assert) { assert.equal(obj.get('validations.attrs.fullName.isValid'), true); }); -test("custom dependent keys - default options", function(assert) { - var Validations = buildValidations({ +test('custom dependent keys - default options', function(assert) { + let Validations = buildValidations({ fullName: { dependentKeys: ['model.firstName'], validators: [ @@ -126,7 +125,7 @@ test("custom dependent keys - default options", function(assert) { } }); - var obj = setupObject(this, Ember.Object.extend(Validations)); + let obj = setupObject(this, Ember.Object.extend(Validations)); assert.equal(obj.get('validations.isValid'), false); assert.equal(obj.get('validations.attrs.fullName.isValid'), false); @@ -139,8 +138,8 @@ test("custom dependent keys - default options", function(assert) { assert.equal(obj.get('validations.attrs.fullName.isValid'), true); }); -test("custom dependent keys - global options", function(assert) { - var Validations = buildValidations({ +test('custom dependent keys - global options', function(assert) { + let Validations = buildValidations({ fullName: { dependentKeys: ['model.firstName'], validators: [ @@ -161,7 +160,7 @@ test("custom dependent keys - global options", function(assert) { dependentKeys: ['model.middleName'] }); - var obj = setupObject(this, Ember.Object.extend(Validations)); + let obj = setupObject(this, Ember.Object.extend(Validations)); assert.equal(obj.get('validations.isValid'), false); assert.equal(obj.get('validations.attrs.fullName.isValid'), false); @@ -179,8 +178,8 @@ test("custom dependent keys - global options", function(assert) { assert.equal(obj.get('validations.attrs.fullName.isValid'), true); }); -test("custom dependent keys - nested object", function(assert) { - var Validations = buildValidations({ +test('custom dependent keys - nested object', function(assert) { + let Validations = buildValidations({ page: validator(function(value, options, model) { let currPage = model.get('currPage'); let lastPage = model.get('meta.pages.last'); @@ -193,7 +192,7 @@ test("custom dependent keys - nested object", function(assert) { }) }); - var obj = setupObject(this, Ember.Object.extend(Validations), { + let obj = setupObject(this, Ember.Object.extend(Validations), { meta: { pages: { last: 5 @@ -218,8 +217,8 @@ test("custom dependent keys - nested object", function(assert) { }); -test("custom dependent keys - array", function(assert) { - var Validations = buildValidations({ +test('custom dependent keys - array', function(assert) { + let Validations = buildValidations({ friends: validator(function(value, options, model) { let friends = model.get('friends'); if (!friends || friends.length === 0) { @@ -231,7 +230,7 @@ test("custom dependent keys - array", function(assert) { }) }); - var obj = setupObject(this, Ember.Object.extend(Validations), { + let obj = setupObject(this, Ember.Object.extend(Validations), { friends: Ember.A() }); @@ -252,14 +251,14 @@ test("custom dependent keys - array", function(assert) { }); -test("custom dependent keys - array of objects", function(assert) { - var Validations = buildValidations({ +test('custom dependent keys - array of objects', function(assert) { + let Validations = buildValidations({ friends: validator(function(value, options, model) { let friends = model.get('friends'); if (!friends || friends.length === 0) { return 'User must have a friend'; } else if (friends.length > 0) { - let names = friends.filter(f => f.name); + let names = friends.filter((f) => f.name); if (names.length !== friends.length) { return 'All friends must have a name'; } @@ -270,7 +269,7 @@ test("custom dependent keys - array of objects", function(assert) { }) }); - var obj = setupObject(this, Ember.Object.extend(Validations), { + let obj = setupObject(this, Ember.Object.extend(Validations), { friends: Ember.A() }); diff --git a/tests/integration/validations/factory-general-test.js b/tests/integration/validations/factory-general-test.js index 0c76e260..5d1fab1d 100644 --- a/tests/integration/validations/factory-general-test.js +++ b/tests/integration/validations/factory-general-test.js @@ -20,21 +20,21 @@ const Validators = { } }; -var Validations = buildValidations({ +let Validations = buildValidations({ firstName: validator(Validators.presence), lastName: validator(Validators.presence) }); moduleFor('foo', 'Integration | Validations | Factory - General', { - integration: true, + integration: true }); -test("it works", function(assert) { +test('it works', function(assert) { assert.ok(buildValidations()); }); -test("basic sync validation – invalid", function(assert) { - var object = setupObject(this, Ember.Object.extend(Validations)); +test('basic sync validation – invalid', function(assert) { + let object = setupObject(this, Ember.Object.extend(Validations)); assert.equal(object.get('validations.isValid'), false, 'isValid was expected to be FALSE'); assert.equal(object.get('validations.isValidating'), false, 'isValidating was expected to be FALSE'); @@ -51,8 +51,8 @@ test("basic sync validation – invalid", function(assert) { assert.equal(object.get('validations.errors.length'), 2, 'errors length was expected to be 2'); assert.ok(object.get('validations.errors').indexOf(object.get('validations.attrs.firstName.errors.0')) > -1, 'errors was expected to contain firstName error'); assert.ok(object.get('validations.errors').indexOf(object.get('validations.attrs.lastName.errors.0')) > -1, 'errors was expected to contain lastName error'); - assert.equal(object.get('validations.errors.0.attribute'), 'firstName', 'error object was expected to have attribute "firstName"'); - assert.equal(object.get('validations.errors.1.attribute'), 'lastName', 'error object was expected to have attribute "lastName"'); + assert.equal(object.get('validations.errors.0.attribute'), 'firstName', 'error object was expected to have attribute \'firstName\''); + assert.equal(object.get('validations.errors.1.attribute'), 'lastName', 'error object was expected to have attribute \'lastName\''); object.set('firstName', 'stef'); object.set('lastName', 'penner'); @@ -72,8 +72,8 @@ test("basic sync validation – invalid", function(assert) { assert.equal(object.get('validations.errors.length'), 0, 'errors length was expected to be 0'); }); -test("basic sync validation - valid", function(assert) { - var object = setupObject(this, Ember.Object.extend(Validations), { +test('basic sync validation - valid', function(assert) { + let object = setupObject(this, Ember.Object.extend(Validations), { firstName: 'Stef', lastName: 'Penner' }); @@ -91,8 +91,8 @@ test("basic sync validation - valid", function(assert) { assert.equal(object.get('validations.attrs.lastName.message'), null); }); -test("basic sync validation - 50% invalid", function(assert) { - var object = setupObject(this, Ember.Object.extend(Validations), { +test('basic sync validation - 50% invalid', function(assert) { + let object = setupObject(this, Ember.Object.extend(Validations), { firstName: 'Stef' }); @@ -109,8 +109,8 @@ test("basic sync validation - 50% invalid", function(assert) { assert.equal(object.get('validations.attrs.lastName.message'), 'lastName should be present'); }); -test("basic sync validation - API - #validation", function(assert) { - var object = setupObject(this, Ember.Object.extend(Validations), { +test('basic sync validation - API - #validation', function(assert) { + let object = setupObject(this, Ember.Object.extend(Validations), { firstName: 'Stef' }); @@ -145,12 +145,12 @@ test("basic sync validation - API - #validation", function(assert) { }); }); -test("basic sync validation - API - #validationSync", function(assert) { - var object = setupObject(this, Ember.Object.extend(Validations), { +test('basic sync validation - API - #validationSync', function(assert) { + let object = setupObject(this, Ember.Object.extend(Validations), { firstName: 'Stef' }); - const { + let { validations, model } = object.get('validations').validateSync(); @@ -182,11 +182,11 @@ test("basic sync validation - API - #validationSync", function(assert) { assert.equal(object.get('validations.attrs.lastName.message'), 'lastName should be present'); }); -test("basic sync validation returns null", function(assert) { - var Validations = buildValidations({ - firstName: validator(() => null), +test('basic sync validation returns null', function(assert) { + let Validations = buildValidations({ + firstName: validator(() => null) }); - var object = setupObject(this, Ember.Object.extend(Validations), { + let object = setupObject(this, Ember.Object.extend(Validations), { firstName: 'Offir' }); @@ -200,8 +200,8 @@ test("basic sync validation returns null", function(assert) { }); -test("shallow isAsync test", function(assert) { - var Validations = buildValidations({ +test('shallow isAsync test', function(assert) { + let Validations = buildValidations({ firstName: validator(function() { return new Ember.RSVP.Promise((resolve) => { resolve(true); @@ -209,7 +209,7 @@ test("shallow isAsync test", function(assert) { }) }); - var obj = setupObject(this, Ember.Object.extend(Validations)); + let obj = setupObject(this, Ember.Object.extend(Validations)); assert.equal(obj.get('validations.attrs.firstName.isAsync'), true); assert.equal(obj.get('validations.attrs.firstName.isValidating'), true); @@ -222,8 +222,8 @@ test("shallow isAsync test", function(assert) { }); }); -test("default options", function(assert) { - var Validations = buildValidations({ +test('default options', function(assert) { + let Validations = buildValidations({ firstName: { description: 'Test field', validators: [ @@ -232,22 +232,22 @@ test("default options", function(assert) { ] } }); - var object = setupObject(this, Ember.Object.extend(Validations), { + let object = setupObject(this, Ember.Object.extend(Validations), { firstName: '' }); - var rules = Ember.A(object.get('validations._validationRules.firstName')); + let rules = Ember.A(object.get('validations._validationRules.firstName')); assert.equal(rules.isAny('defaultOptions', undefined), false); assert.equal(rules[0].defaultOptions.description, 'Test field'); }); -test("global options", function(assert) { +test('global options', function(assert) { this.register('validator:length', LengthValidator); - var Validations = buildValidations({ + let Validations = buildValidations({ firstName: { description: 'Test field', validators: [ - validator('length', {min: 1, max: 5}), + validator('length', { min: 1, max: 5 }) ] } }, { @@ -256,18 +256,18 @@ test("global options", function(assert) { max: 10 }); - var object = setupObject(this, Ember.Object.extend(Validations), { + let object = setupObject(this, Ember.Object.extend(Validations), { firstName: '' }); // Global options present in rules - var rules = Ember.A(object.get('validations._validationRules.firstName')); + let rules = Ember.A(object.get('validations._validationRules.firstName')); assert.equal(rules.isAny('globalOptions', undefined), false); assert.equal(rules[0].globalOptions.max, 10); assert.ok(object.get('validations.attrs.firstName.isInvalid')); - var v = object.get('validations._validators.firstName.0'); + let v = object.get('validations._validators.firstName.0'); assert.deepEqual(v.get('options').getProperties(['message', 'description', 'allowNone', 'min', 'max']), { message: 'Global error message', description: 'Test field', @@ -277,47 +277,47 @@ test("global options", function(assert) { }); }); -test("custom messages object", function(assert) { +test('custom messages object', function(assert) { this.register('validator:messages', DefaultMessages); - var Validations = buildValidations({ + let Validations = buildValidations({ firstName: validator(function(value) { return this.createErrorMessage('test', value); }) }); - var object = setupObject(this, Ember.Object.extend(Validations)); + let object = setupObject(this, Ember.Object.extend(Validations)); assert.equal(object.get('validations.attrs.firstName.isValid'), false); assert.equal(object.get('validations.attrs.firstName.isValidating'), false); assert.equal(object.get('validations.attrs.firstName.message'), 'Test error message'); }); -test("null message object", function(assert) { +test('null message object', function(assert) { this.register('validator:messages', DefaultMessages); - var Validations = buildValidations({ + let Validations = buildValidations({ firstName: validator('presence', { presence: true, message: null }) }); - var object = setupObject(this, Ember.Object.extend(Validations)); + let object = setupObject(this, Ember.Object.extend(Validations)); assert.equal(object.get('validations.attrs.firstName.message'), 'This field can\'t be blank'); }); -test("debounced validations", function(assert) { - var done = assert.async(); - var initSetup = true; - var Validations = buildValidations({ +test('debounced validations', function(assert) { + let done = assert.async(); + let initSetup = true; + let Validations = buildValidations({ firstName: validator(Validators.presence), lastName: validator(Validators.presence, { debounce: computed(function() { return initSetup ? 0 : 500; // Do not debounce on initial object creation }).volatile() - }), + }) }); - var object = setupObject(this, Ember.Object.extend(Validations)); + let object = setupObject(this, Ember.Object.extend(Validations)); assert.equal(object.get('validations.isValid'), false, 'isValid was expected to be FALSE'); assert.equal(object.get('validations.isValidating'), false, 'isValidating was expected to be TRUE'); @@ -339,11 +339,11 @@ test("debounced validations", function(assert) { }, 500); }); -test("debounced validations should cleanup on object destroy", function(assert) { - var done = assert.async(); - var initSetup = true; +test('debounced validations should cleanup on object destroy', function(assert) { + let done = assert.async(); + let initSetup = true; - var debouncedValidator = validator((value, options, model, attr) => { + let debouncedValidator = validator((value, options, model, attr) => { model.set('foo', 'bar'); return Validators.presence(value, options, model, attr); }, { @@ -352,12 +352,12 @@ test("debounced validations should cleanup on object destroy", function(assert) }).volatile() }); - var Validations = buildValidations({ + let Validations = buildValidations({ firstName: validator(Validators.presence), lastName: debouncedValidator, - 'details.url': debouncedValidator, + 'details.url': debouncedValidator }); - var object = setupObject(this, Ember.Object.extend(Validations), { + let object = setupObject(this, Ember.Object.extend(Validations), { details: {} }); @@ -388,14 +388,14 @@ test("debounced validations should cleanup on object destroy", function(assert) }, 200); }); -test("disabled validations - simple", function(assert) { - var Validations = buildValidations({ +test('disabled validations - simple', function(assert) { + let Validations = buildValidations({ firstName: validator(Validators.presence), lastName: validator(Validators.presence, { disabled: true }) }); - var object = setupObject(this, Ember.Object.extend(Validations)); + let object = setupObject(this, Ember.Object.extend(Validations)); assert.equal(object.get('validations.isValid'), false, 'isValid was expected to be FALSE'); assert.equal(object.get('validations.isValidating'), false, 'isValidating was expected to be TRUE'); @@ -409,14 +409,14 @@ test("disabled validations - simple", function(assert) { assert.equal(object.get('validations.isValid'), true); }); -test("disabled validations - cp with dependent key", function(assert) { - var Validations = buildValidations({ +test('disabled validations - cp with dependent key', function(assert) { + let Validations = buildValidations({ firstName: validator(Validators.presence), lastName: validator(Validators.presence, { disabled: computed.not('model.validateLastName') }) }); - var object = setupObject(this, Ember.Object.extend(Validations, { + let object = setupObject(this, Ember.Object.extend(Validations, { firstName: 'Offir', validateLastName: true })); @@ -434,16 +434,16 @@ test("disabled validations - cp with dependent key", function(assert) { assert.equal(object.get('validations.isValid'), true); }); -test("destroy object clears debounce cache", function(assert) { - var Validations = buildValidations({ +test('destroy object clears debounce cache', function(assert) { + let Validations = buildValidations({ firstName: validator(Validators.presence), lastName: validator((value, options, model, attr) => { model.set('foo', 'bar'); return Validators.presence(value, options, model, attr); - }, { debounce: 500 }), + }, { debounce: 500 }) }); - var object = setupObject(this, Ember.Object.extend(Validations)); + let object = setupObject(this, Ember.Object.extend(Validations)); object.validate(); // force get all validations @@ -457,16 +457,16 @@ test("destroy object clears debounce cache", function(assert) { }); }); -test("attribute validation result options hash", function(assert) { +test('attribute validation result options hash', function(assert) { this.register('validator:length', LengthValidator); this.register('validator:presence', PresenceValidator); - var Validations = buildValidations({ + let Validations = buildValidations({ firstName: { description: 'First Name', validators: [ validator(Validators.presence, {}), - validator(Validators.presence, { presence: true} ), + validator(Validators.presence, { presence: true }), validator('presence', true), validator('length', { min: 1, @@ -475,8 +475,8 @@ test("attribute validation result options hash", function(assert) { ] } }); - var object = setupObject(this, Ember.Object.extend(Validations, { max: 5 })); - var options = object.get('validations.attrs.firstName.options'); + let object = setupObject(this, Ember.Object.extend(Validations, { max: 5 })); + let options = object.get('validations.attrs.firstName.options'); assert.ok(options); assert.deepEqual(Object.keys(options).sort(), ['presence', 'length', 'function'].sort()); @@ -491,10 +491,10 @@ test("attribute validation result options hash", function(assert) { assert.equal(options['function'][0].description, 'First Name'); }); -test("attribute validation result options hash with cps", function(assert) { +test('attribute validation result options hash with cps', function(assert) { this.register('validator:length', LengthValidator); - var Validations = buildValidations({ + let Validations = buildValidations({ firstName: { validators: [ validator('length', { @@ -504,8 +504,8 @@ test("attribute validation result options hash with cps", function(assert) { ] } }); - var object = setupObject(this, Ember.Object.extend(Validations, { max: 5 })); - var options = object.get('validations.attrs.firstName.options'); + let object = setupObject(this, Ember.Object.extend(Validations, { max: 5 })); + let options = object.get('validations.attrs.firstName.options'); assert.equal(options.length.max, 5); run(() => object.set('max', 3)); @@ -514,18 +514,18 @@ test("attribute validation result options hash with cps", function(assert) { assert.equal(options.length.max, 3); }); -test("validations persist with inheritance", function(assert) { - var Parent = Ember.Object.extend(buildValidations({ +test('validations persist with inheritance', function(assert) { + let Parent = Ember.Object.extend(buildValidations({ firstName: validator(Validators.presence), lastName: validator(Validators.presence) })); - var Child = Parent.extend(buildValidations({ + let Child = Parent.extend(buildValidations({ middleName: validator(Validators.presence), dob: validator(Validators.presence) })); - var child = setupObject(this, Child); + let child = setupObject(this, Child); child.validateSync(); @@ -549,23 +549,23 @@ test("validations persist with inheritance", function(assert) { assert.equal(child.get('validations.errors.length'), 0); }); -test("validations persist with deep inheritance", function(assert) { - var Parent = Ember.Object.extend(buildValidations({ +test('validations persist with deep inheritance', function(assert) { + let Parent = Ember.Object.extend(buildValidations({ firstName: validator(Validators.presence), lastName: validator(Validators.presence) })); - var Child = Parent.extend(buildValidations({ + let Child = Parent.extend(buildValidations({ middleName: validator(Validators.presence), dob: validator(Validators.presence) })); - var Baby = Child.extend(buildValidations({ + let Baby = Child.extend(buildValidations({ diaper: validator(Validators.presence), favParent: validator(Validators.presence) })); - var baby = setupObject(this, Baby); + let baby = setupObject(this, Baby); baby.validateSync(); @@ -596,12 +596,12 @@ test("validations persist with deep inheritance", function(assert) { assert.equal(baby.get('validations.errors.length'), 0); }); -test("nested keys - simple", function(assert) { - var Validations = buildValidations({ +test('nested keys - simple', function(assert) { + let Validations = buildValidations({ 'user.firstName': validator(Validators.presence), 'user.lastName': validator(Validators.presence) }); - var object = setupObject(this, Ember.Object.extend(Validations), { + let object = setupObject(this, Ember.Object.extend(Validations), { user: {} }); @@ -620,13 +620,13 @@ test("nested keys - simple", function(assert) { assert.equal(object.get('validations.isValid'), true); }); -test("nested keys - complex", function(assert) { - var Validations = buildValidations({ +test('nested keys - complex', function(assert) { + let Validations = buildValidations({ 'firstName': validator(Validators.presence), 'user.foo.bar.baz': validator(Validators.presence), 'user.foo.boop': validator(Validators.presence) }); - var object = setupObject(this, Ember.Object.extend(Validations)); + let object = setupObject(this, Ember.Object.extend(Validations)); assert.equal(object.get('validations.attrs.firstName.isValid'), false); assert.equal(object.get('validations.attrs.user.foo.bar.baz.isValid'), false); @@ -661,21 +661,21 @@ test("nested keys - complex", function(assert) { assert.notOk(object.get('validations.attrs.user.foo._model')); }); -test("nested keys - inheritance", function(assert) { - var Parent = Ember.Object.extend(buildValidations({ +test('nested keys - inheritance', function(assert) { + let Parent = Ember.Object.extend(buildValidations({ 'firstName': validator(Validators.presence), 'user.firstName': validator(Validators.presence), 'user.middleName': validator(Validators.presence) })); - var Child = Parent.extend(buildValidations({ + let Child = Parent.extend(buildValidations({ 'user.lastName': validator(Validators.presence), 'user.middleName': validator(function() { return 'Middle name invalid'; }) })); - var child = setupObject(this, Child); + let child = setupObject(this, Child); child.validateSync(); @@ -702,16 +702,15 @@ test("nested keys - inheritance", function(assert) { assert.equal(child.get('validations.errors.length'), 1); }); - -test("call super in validations class with no super property", function(assert) { +test('call super in validations class with no super property', function(assert) { // see https://github.com/offirgolan/ember-cp-validations/issues/149 assert.expect(1); - var Validations = buildValidations({ + let Validations = buildValidations({ 'firstName': validator(Validators.presence) }); - var mixin = Ember.Mixin.create({ + let mixin = Ember.Mixin.create({ actions: { foo() { // The issue is that __validationsClass__ is calling super but since @@ -722,11 +721,11 @@ test("call super in validations class with no super property", function(assert) } }); - var component = setupObject(this, Ember.Component.extend(Validations, mixin, { + let component = setupObject(this, Ember.Component.extend(Validations, mixin, { actions: { foo() { assert.ok(true); - const validations = this.get('validations'); // jshint ignore:line + let validations = this.get('validations'); // jshint ignore:line } } })); @@ -734,21 +733,20 @@ test("call super in validations class with no super property", function(assert) component.send('foo'); }); - -test("multiple mixins", function(assert) { - var Validations1 = buildValidations({ +test('multiple mixins', function(assert) { + let Validations1 = buildValidations({ 'firstName': validator(Validators.presence) }); - var Validations2 = buildValidations({ + let Validations2 = buildValidations({ 'middleName': validator(Validators.presence) }); - var Validations3 = buildValidations({ + let Validations3 = buildValidations({ 'lastName': validator(Validators.presence) }); - var object = setupObject(this, Ember.Object.extend(Validations1, Validations2, Validations3)); + let object = setupObject(this, Ember.Object.extend(Validations1, Validations2, Validations3)); assert.deepEqual(object.get('validations.validatableAttributes').sort(), ['firstName', 'middleName', 'lastName'].sort()); assert.equal(object.get('validations.attrs.firstName.isValid'), false); @@ -771,14 +769,14 @@ test("multiple mixins", function(assert) { assert.equal(object.get('validations.isValid'), true); }); -test("validateAttribute - sync validations", function(assert) { - var Validations = buildValidations({ +test('validateAttribute - sync validations', function(assert) { + let Validations = buildValidations({ firstName: [ validator(Validators.presence), validator(() => true) ] }); - var object = setupObject(this, Ember.Object.extend(Validations), { + let object = setupObject(this, Ember.Object.extend(Validations), { firstName: 'Offir' }); @@ -792,14 +790,14 @@ test("validateAttribute - sync validations", function(assert) { }); }); -test("validateAttribute - async validations", function(assert) { - var Validations = buildValidations({ +test('validateAttribute - async validations', function(assert) { + let Validations = buildValidations({ firstName: [ validator(() => Ember.RSVP.Promise.resolve('firstName is invalid')), validator(() => Ember.RSVP.Promise.resolve('firstName is really invalid')) ] }); - var object = setupObject(this, Ember.Object.extend(Validations), { + let object = setupObject(this, Ember.Object.extend(Validations), { firstName: 'Offir' }); @@ -812,11 +810,11 @@ test("validateAttribute - async validations", function(assert) { }); }); -test("warning validators api", function(assert) { +test('warning validators api', function(assert) { this.register('validator:length', LengthValidator); this.register('validator:presence', PresenceValidator); - var Validations = buildValidations({ + let Validations = buildValidations({ password: { description: 'Password', validators: [ @@ -838,7 +836,7 @@ test("warning validators api", function(assert) { } }); - var object = setupObject(this, Ember.Object.extend(Validations), { + let object = setupObject(this, Ember.Object.extend(Validations), { password: '' }); @@ -856,15 +854,15 @@ test("warning validators api", function(assert) { assert.equal(object.get('validations.attrs.password.warningMessage'), 'Password is weak'); }); -test("options CP changes trigger attribute revalidation", function(assert) { +test('options CP changes trigger attribute revalidation', function(assert) { this.register('validator:length', LengthValidator); - var Validations = buildValidations({ + let Validations = buildValidations({ firstName: { description: computed.readOnly('model.description'), validators: [ validator('length', { - min: computed.alias('model.minLength'), + min: computed.alias('model.minLength') }) ] } @@ -872,7 +870,7 @@ test("options CP changes trigger attribute revalidation", function(assert) { disabled: computed.not('model.enabled') }); - var object = setupObject(this, Ember.Object.extend(Validations, { + let object = setupObject(this, Ember.Object.extend(Validations, { enabled: true, description: 'First Name', minLength: 6, @@ -900,19 +898,19 @@ test("options CP changes trigger attribute revalidation", function(assert) { assert.equal(object.get('validations.isValid'), true, 'isValid was expected to be FALSE'); }); -test("lazy validators are actually lazy", function(assert) { +test('lazy validators are actually lazy', function(assert) { this.register('validator:length', LengthValidator); this.register('validator:presence', PresenceValidator); - var customValidatorCount = 0; + let customValidatorCount = 0; - var Validations = buildValidations({ + let Validations = buildValidations({ password: { description: 'Password', validators: [ validator('presence', true), validator('length', { - min: 5, + min: 5 }), validator(() => { customValidatorCount++; @@ -922,7 +920,7 @@ test("lazy validators are actually lazy", function(assert) { } }); - var object = setupObject(this, Ember.Object.extend(Validations)); + let object = setupObject(this, Ember.Object.extend(Validations)); assert.equal(object.get('validations.attrs.password.isValid'), false); assert.equal(object.get('validations.attrs.password.messages.length'), 1, 'Only 1 error message should be present'); @@ -942,13 +940,13 @@ test("lazy validators are actually lazy", function(assert) { assert.equal(customValidatorCount, 1, 'Last validator only executed once'); }); -test("none lazy validators are actually not lazy", function(assert) { +test('none lazy validators are actually not lazy', function(assert) { this.register('validator:length', LengthValidator); this.register('validator:presence', PresenceValidator); - var customValidatorCount = 0; + let customValidatorCount = 0; - var Validations = buildValidations({ + let Validations = buildValidations({ password: { description: 'Password', validators: [ @@ -967,7 +965,7 @@ test("none lazy validators are actually not lazy", function(assert) { } }); - var object = setupObject(this, Ember.Object.extend(Validations)); + let object = setupObject(this, Ember.Object.extend(Validations)); assert.equal(object.get('validations.attrs.password.isValid'), false); assert.equal(object.get('validations.attrs.password.messages.length'), 2, 'Only 2 error message should be present'); @@ -987,22 +985,22 @@ test("none lazy validators are actually not lazy", function(assert) { assert.equal(customValidatorCount, 3, 'Last validator executed 3 times'); }); -test("validator should return correct error type", function(assert) { +test('validator should return correct error type', function(assert) { this.register('validator:presence', PresenceValidator); this.register('validator:length', LengthValidator); - var Validations = buildValidations({ + let Validations = buildValidations({ firstName: [ validator('presence', true), - validator('length', {min: 5, max: 35}) + validator('length', { min: 5, max: 35 }) ], lastName: [ validator('presence', true), - validator('length', {min: 5, max: 35}) + validator('length', { min: 5, max: 35 }) ] }); - var obj = setupObject(this, Ember.Object.extend(Validations), { + let obj = setupObject(this, Ember.Object.extend(Validations), { firstName: 'Foo', lastName: null }); diff --git a/tests/integration/validations/model-relationships-test.js b/tests/integration/validations/model-relationships-test.js index 228083ab..bf1e283f 100644 --- a/tests/integration/validations/model-relationships-test.js +++ b/tests/integration/validations/model-relationships-test.js @@ -22,7 +22,7 @@ const Validators = { } }; -var Validations = buildValidations({ +const Validations = buildValidations({ firstName: validator(Validators.presence), lastName: validator(Validators.presence) }); @@ -35,7 +35,6 @@ const HasManyValidations = buildValidations({ friends: validator('has-many') }); - moduleFor('foo', 'Integration | Validations | Model Relationships', { integration: true, beforeEach() { @@ -43,18 +42,18 @@ moduleFor('foo', 'Integration | Validations | Model Relationships', { } }); -test("belong to validation - no cycle", function(assert) { +test('belong to validation - no cycle', function(assert) { this.register('validator:belongs-to', BelongsToValidator); - var user2 = setupObject(this, Ember.Object.extend(Validations), { + let user2 = setupObject(this, Ember.Object.extend(Validations), { firstName: 'John' }); - var user = setupObject(this, Ember.Object.extend(BelongsToValidations), { + let user = setupObject(this, Ember.Object.extend(BelongsToValidations), { friend: user2 }); - const { + let { validations, model } = user.get('validations').validateSync(); @@ -70,13 +69,13 @@ test("belong to validation - no cycle", function(assert) { }); -test("belong to validation - with cycle", function(assert) { +test('belong to validation - with cycle', function(assert) { this.register('validator:belongs-to', BelongsToValidator); - var user = setupObject(this, Ember.Object.extend(BelongsToValidations)); + let user = setupObject(this, Ember.Object.extend(BelongsToValidations)); user.set('friend', user); - const { + let { validations, model } = user.get('validations').validateSync(); @@ -92,18 +91,18 @@ test("belong to validation - with cycle", function(assert) { }); -test("has-many relationship is sync", function(assert) { +test('has-many relationship is sync', function(assert) { this.register('validator:has-many', HasManyValidator); - var friend = setupObject(this, Ember.Object.extend(Validations), { + let friend = setupObject(this, Ember.Object.extend(Validations), { firstName: 'John' }); - var user = setupObject(this, Ember.Object.extend(HasManyValidations), { + let user = setupObject(this, Ember.Object.extend(HasManyValidations), { friends: [friend] }); - const { + let { validations, model } = user.get('validations').validateSync(); @@ -117,18 +116,18 @@ test("has-many relationship is sync", function(assert) { assert.equal(friends.get('message'), 'lastName should be present'); }); -test("has-many relationship is sync with proxy", function(assert) { +test('has-many relationship is sync with proxy', function(assert) { this.register('validator:has-many', HasManyValidator); - var friend = setupObject(this, Ember.Object.extend(Validations), { + let friend = setupObject(this, Ember.Object.extend(Validations), { firstName: 'John' }); - var user = setupObject(this, Ember.Object.extend(HasManyValidations), { + let user = setupObject(this, Ember.Object.extend(HasManyValidations), { friends: Ember.ArrayProxy.create({ content: Ember.A([friend]) }) }); - const { + let { validations, model } = user.get('validations').validateSync(); @@ -142,20 +141,20 @@ test("has-many relationship is sync with proxy", function(assert) { assert.equal(friends.get('message'), 'lastName should be present'); }); -test("has-many relationship is async", function(assert) { +test('has-many relationship is async', function(assert) { this.register('validator:has-many', HasManyValidator); - var friend = setupObject(this, Ember.Object.extend(Validations), { + let friend = setupObject(this, Ember.Object.extend(Validations), { firstName: 'Offir' }); - var user = setupObject(this, Ember.Object.extend(HasManyValidations), { + let user = setupObject(this, Ember.Object.extend(HasManyValidations), { friends: new Ember.RSVP.Promise((resolve) => { resolve([friend]); }) }); - var validations = user.get('validations').validate(); + let validations = user.get('validations').validate(); assert.equal(user.get('validations.isAsync'), true); assert.equal(user.get('validations.isValidating'), true); @@ -174,25 +173,24 @@ test("has-many relationship is async", function(assert) { return validations; }); -test("has-many relationship is async and isWarning", function(assert) { +test('has-many relationship is async and isWarning', function(assert) { this.register('validator:has-many', HasManyValidator); - var HasManyValidations = buildValidations({ + let HasManyValidations = buildValidations({ friends: validator('has-many', { isWarning: true }) }); - - var friend = setupObject(this, Ember.Object.extend(Validations), { + let friend = setupObject(this, Ember.Object.extend(Validations), { firstName: 'Offir' }); - var user = setupObject(this, Ember.Object.extend(HasManyValidations), { + let user = setupObject(this, Ember.Object.extend(HasManyValidations), { friends: new Ember.RSVP.Promise((resolve) => { resolve([friend]); }) }); - var validations = user.get('validations').validate(); + let validations = user.get('validations').validate(); assert.equal(user.get('validations.isAsync'), true); assert.equal(user.get('validations.isValidating'), true); @@ -210,20 +208,20 @@ test("has-many relationship is async and isWarning", function(assert) { return validations; }); -test("belongs-to relationship is async", function(assert) { +test('belongs-to relationship is async', function(assert) { this.register('validator:belongs-to', BelongsToValidator); - var friend = setupObject(this, Ember.Object.extend(Validations), { + let friend = setupObject(this, Ember.Object.extend(Validations), { firstName: 'Offir' }); - var user = setupObject(this, Ember.Object.extend(BelongsToValidations), { + let user = setupObject(this, Ember.Object.extend(BelongsToValidations), { friend: new Ember.RSVP.Promise((resolve) => { resolve(friend); }) }); - var validations = user.get('validations').validate(); + let validations = user.get('validations').validate(); assert.equal(user.get('validations.isAsync'), true); assert.equal(user.get('validations.isValidating'), true); @@ -236,30 +234,30 @@ test("belongs-to relationship is async", function(assert) { let friend = validations.get('content').findBy('attribute', 'friend'); assert.equal(friend.get('isValid'), false); - assert.equal(friend.get('message'), "lastName should be present"); + assert.equal(friend.get('message'), 'lastName should be present'); }); return validations; }); -test("belongs-to relationship is async and isWarning", function(assert) { +test('belongs-to relationship is async and isWarning', function(assert) { this.register('validator:belongs-to', BelongsToValidator); - var BelongsToValidations = buildValidations({ + let BelongsToValidations = buildValidations({ friend: validator('belongs-to', { isWarning: true }) }); - var friend = setupObject(this, Ember.Object.extend(Validations), { + let friend = setupObject(this, Ember.Object.extend(Validations), { firstName: 'Offir' }); - var user = setupObject(this, Ember.Object.extend(BelongsToValidations), { + let user = setupObject(this, Ember.Object.extend(BelongsToValidations), { friend: new Ember.RSVP.Promise((resolve) => { resolve(friend); }) }); - var validations = user.get('validations').validate(); + let validations = user.get('validations').validate(); assert.equal(user.get('validations.isAsync'), true); assert.equal(user.get('validations.isValidating'), true); @@ -277,16 +275,16 @@ test("belongs-to relationship is async and isWarning", function(assert) { return validations; }); -test("belongs-to relationship is async and does not exist", function(assert) { +test('belongs-to relationship is async and does not exist', function(assert) { this.register('validator:belongs-to', BelongsToValidator); - var user = setupObject(this, Ember.Object.extend(BelongsToValidations), { + let user = setupObject(this, Ember.Object.extend(BelongsToValidations), { friend: new Ember.RSVP.Promise((resolve) => { resolve(); }) }); - var validations = user.get('validations').validate(); + let validations = user.get('validations').validate(); assert.equal(user.get('validations.isAsync'), true); assert.equal(user.get('validations.isValidating'), true); @@ -301,16 +299,16 @@ test("belongs-to relationship is async and does not exist", function(assert) { return validations; }); -test("has-many relationship is async and does not exist", function(assert) { +test('has-many relationship is async and does not exist', function(assert) { this.register('validator:has-many', HasManyValidator); - var user = setupObject(this, Ember.Object.extend(HasManyValidations), { + let user = setupObject(this, Ember.Object.extend(HasManyValidations), { friends: new Ember.RSVP.Promise((resolve) => { resolve(); }) }); - var validations = user.get('validations').validate(); + let validations = user.get('validations').validate(); assert.equal(user.get('validations.isAsync'), true); assert.equal(user.get('validations.isValidating'), true); @@ -325,16 +323,16 @@ test("has-many relationship is async and does not exist", function(assert) { return validations; }); -test("belongs-to relationship returns undefined", function(assert) { +test('belongs-to relationship returns undefined', function(assert) { this.register('validator:belongs-to', BelongsToValidator); - var user = setupObject(this, Ember.Object.extend(BelongsToValidations), { + let user = setupObject(this, Ember.Object.extend(BelongsToValidations), { friend: new Ember.RSVP.Promise((resolve) => { resolve({}); // validations object will be undefined }) }); - var validations = user.get('validations').validate(); + let validations = user.get('validations').validate(); assert.equal(user.get('validations.isAsync'), true); assert.equal(user.get('validations.isValidating'), true); @@ -353,10 +351,10 @@ test("belongs-to relationship returns undefined", function(assert) { return validations; }); -test("alias validation - simple", function(assert) { +test('alias validation - simple', function(assert) { this.register('validator:alias', AliasValidator); - var user = setupObject(this, Ember.Object.extend(buildValidations({ + let user = setupObject(this, Ember.Object.extend(buildValidations({ firstName: validator(Validators.presence), lastName: validator(Validators.presence), fullName: validator('alias', 'firstName') @@ -379,13 +377,13 @@ test("alias validation - simple", function(assert) { assert.equal(user.get('validations.attrs.fullName.isValid'), true); }); -test("alias validation - firstMessageOnly", function(assert) { +test('alias validation - firstMessageOnly', function(assert) { this.register('validator:alias', AliasValidator); - var user = setupObject(this, Ember.Object.extend(buildValidations({ + let user = setupObject(this, Ember.Object.extend(buildValidations({ firstName: [ validator(() => 'First error message'), - validator(() => 'Second error message'), + validator(() => 'Second error message') ], fullName: validator('alias', { alias: 'firstName', @@ -404,10 +402,10 @@ test("alias validation - firstMessageOnly", function(assert) { assert.equal(user.get('validations.attrs.fullName.message'), 'First error message'); }); -test("alias validation - multiple", function(assert) { +test('alias validation - multiple', function(assert) { this.register('validator:alias', AliasValidator); - var user = setupObject(this, Ember.Object.extend(buildValidations({ + let user = setupObject(this, Ember.Object.extend(buildValidations({ firstName: validator(Validators.presence), lastName: validator(Validators.presence), fullName: [ @@ -438,18 +436,18 @@ test("alias validation - multiple", function(assert) { assert.equal(user.get('validations.attrs.fullName.isValid'), true); }); -test("presence on empty DS.PromiseObject", function(assert) { +test('presence on empty DS.PromiseObject', function(assert) { this.register('validator:presence', PresenceValidator); - var Validations = buildValidations({ + let Validations = buildValidations({ friend: validator('presence', true) }); - var user = setupObject(this, Ember.Object.extend(Validations), { + let user = setupObject(this, Ember.Object.extend(Validations), { friend: DS.PromiseObject.create() }); - const { + let { validations, model } = user.get('validations').validateSync(); @@ -460,22 +458,21 @@ test("presence on empty DS.PromiseObject", function(assert) { let friend = validations.get('content').findBy('attribute', 'friend'); assert.equal(friend.get('isValid'), false); - assert.equal(friend.get('message'), "This field can't be blank"); - + assert.equal(friend.get('message'), 'This field can\'t be blank'); }); -test("presence on empty DS.PromiseArray", function(assert) { +test('presence on empty DS.PromiseArray', function(assert) { this.register('validator:presence', PresenceValidator); - var Validations = buildValidations({ + let Validations = buildValidations({ friends: validator('presence', true) }); - var user = setupObject(this, Ember.Object.extend(Validations), { + let user = setupObject(this, Ember.Object.extend(Validations), { friends: DS.PromiseArray.create() }); - const { + let { validations, model } = user.get('validations').validateSync(); @@ -486,6 +483,5 @@ test("presence on empty DS.PromiseArray", function(assert) { let friends = validations.get('content').findBy('attribute', 'friends'); assert.equal(friends.get('isValid'), false); - assert.equal(friends.get('message'), "This field can't be blank"); - + assert.equal(friends.get('message'), 'This field can\'t be blank'); }); diff --git a/tests/unit/utils/assign-test.js b/tests/unit/utils/assign-test.js index cdfde3fb..0cb8df66 100644 --- a/tests/unit/utils/assign-test.js +++ b/tests/unit/utils/assign-test.js @@ -7,7 +7,7 @@ module('Unit | Utils | assign'); test('single level', function(assert) { let obj = {}; assign(obj, 'foo.bar', 1); - assert.deepEqual(obj, { foo: { bar: 1}}); + assert.deepEqual(obj, { foo: { bar: 1 } }); }); test('single level - ember object', function(assert) { @@ -17,7 +17,6 @@ test('single level - ember object', function(assert) { assert.equal(obj.get('foo.bar'), 1); }); - test('single level - ember object w/ CP', function(assert) { let obj = Ember.Object.create(); assign(obj, 'foo.bar', Ember.computed(() => 1), true); @@ -28,7 +27,7 @@ test('single level - ember object w/ CP', function(assert) { test('multi level', function(assert) { let obj = {}; assign(obj, 'foo.bar.baz.boo', 1); - assert.deepEqual(obj, { foo: { bar: { baz: { boo: 1}}}}); + assert.deepEqual(obj, { foo: { bar: { baz: { boo: 1 } } } }); }); test('multi level - ember object', function(assert) { diff --git a/tests/unit/utils/should-call-super-test.js b/tests/unit/utils/should-call-super-test.js index 73db368d..b6628340 100644 --- a/tests/unit/utils/should-call-super-test.js +++ b/tests/unit/utils/should-call-super-test.js @@ -9,29 +9,29 @@ const { module('Unit | Utils | shouldCallSuper'); test('shouldCallSuper - true', function(assert) { - const Parent = Ember.Object.extend({ + let Parent = Ember.Object.extend({ foo: computed(function() {}) }); - const Child = Parent.extend({ + let Child = Parent.extend({ foo: computed(function() { assert.ok(shouldCallSuper(this, 'foo')); }) }); - const child = Child.create(); + let child = Child.create(); child.get('foo'); }); test('shouldCallSuper - false', function(assert) { - const Parent = Ember.Object.extend(); + let Parent = Ember.Object.extend(); - const Child = Parent.extend({ + let Child = Parent.extend({ foo: computed(function() { assert.ok(!shouldCallSuper(this, 'foo')); }) }); - const child = Child.create(); + let child = Child.create(); child.get('foo'); }); diff --git a/tests/unit/validations/ds-model-test.js b/tests/unit/validations/ds-model-test.js index 32f276f5..270b0c8e 100644 --- a/tests/unit/validations/ds-model-test.js +++ b/tests/unit/validations/ds-model-test.js @@ -10,24 +10,28 @@ moduleForModel('signup', 'Unit | Validations | DS.Model', { }); test('create model with defaults', function(assert) { - var object = this.subject(); + let object = this.subject(); assert.equal(object.get('validations.attrs.acceptTerms.isDirty'), false, 'isDirty was expected to be FALSE'); assert.equal(object.get('validations.attrs.acceptTerms.isValid'), false, 'isValid was expected to be FALSE'); - Ember.run(() => { object.set('acceptTerms', true); }); + Ember.run(() => { + object.set('acceptTerms', true); + }); assert.equal(object.get('validations.attrs.acceptTerms.isDirty'), true, 'isDirty was expected to be TRUE'); assert.equal(object.get('validations.attrs.acceptTerms.isValid'), true, 'isValid was expected to be TRUE'); }); test('create model overriding defaults', function(assert) { - var object = this.subject({acceptTerms: true}); + let object = this.subject({ acceptTerms: true }); assert.equal(object.get('validations.attrs.acceptTerms.isDirty'), true, 'isDirty was expected to be TRUE'); assert.equal(object.get('validations.attrs.acceptTerms.isValid'), true, 'isValid was expected to be TRUE'); - Ember.run(() => { object.set('acceptTerms', false); }); + Ember.run(() => { + object.set('acceptTerms', false); + }); assert.equal(object.get('validations.attrs.acceptTerms.isDirty'), false, 'isDirty was expected to be FALSE'); assert.equal(object.get('validations.attrs.acceptTerms.isValid'), false, 'isValid was expected to be FALSE'); diff --git a/tests/unit/validations/nested-model-relationship-test.js b/tests/unit/validations/nested-model-relationship-test.js index 4f72b6cd..97f42ced 100644 --- a/tests/unit/validations/nested-model-relationship-test.js +++ b/tests/unit/validations/nested-model-relationship-test.js @@ -16,18 +16,18 @@ moduleForModel('order', 'Unit | Validations | Nested Model Relationships', { ] }); -test("order with invalid question shows invalid", function(assert) { +test('order with invalid question shows invalid', function(assert) { assert.expect(11); - let order = this.subject({source: 'external'}); + let order = this.subject({ source: 'external' }); let orderLine, orderSelection, orderSelectionQuestion; let store = this.store(); Ember.run(() => { - orderLine = store.createRecord('order-line', { order: order, type: "item" }); - orderSelection = store.createRecord('order-selection', { order: order, line: orderLine, quantity: 1 }); - orderSelectionQuestion = store.createRecord('order-selection-question', { order: order, selection: orderSelection }); - store.createRecord('order-selection-question', { order: order, selection: orderSelection, text: 'foo' }); + orderLine = store.createRecord('order-line', { order, type: 'item' }); + orderSelection = store.createRecord('order-selection', { order, line: orderLine, quantity: 1 }); + orderSelectionQuestion = store.createRecord('order-selection-question', { order, selection: orderSelection }); + store.createRecord('order-selection-question', { order, selection: orderSelection, text: 'foo' }); }); assert.equal(order.get('lines.length'), 1, 'Order has 1 Order Line'); @@ -44,28 +44,28 @@ test("order with invalid question shows invalid", function(assert) { assert.equal(validations.get('isValidating'), false, 'All promises should be resolved'); assert.equal(validations.get('isValid'), false, 'Order Line should not be valid because of Order Selection Question'); return orderSelection.validate(); - }).then(({ validations}) => { + }).then(({ validations }) => { assert.equal(validations.get('isValidating'), false, 'All promises should be resolved'); assert.equal(validations.get('isValid'), false, 'Order Selection should not be valid because of Order Selection Question'); return orderSelectionQuestion.validate(); - }).then(({ validations}) => { + }).then(({ validations }) => { assert.equal(validations.get('isValidating'), false, 'All promises should be resolved'); assert.equal(validations.get('isValid'), false, 'Order Selection Question should not be valid'); done(); }); }); -test("order with valid question shows valid", function(assert) { +test('order with valid question shows valid', function(assert) { assert.expect(11); - let order = this.subject({source: 'external'}); + let order = this.subject({ source: 'external' }); let orderLine, orderSelection, orderSelectionQuestion; let store = this.store(); Ember.run(() => { - orderLine = store.createRecord('order-line', { order: order, type: "item" }); - orderSelection = store.createRecord('order-selection', { order: order, line: orderLine, quantity: 1 }); - orderSelectionQuestion = store.createRecord('order-selection-question', { order: order, selection: orderSelection, text: 'answer' }); + orderLine = store.createRecord('order-line', { order, type: 'item' }); + orderSelection = store.createRecord('order-selection', { order, line: orderLine, quantity: 1 }); + orderSelectionQuestion = store.createRecord('order-selection-question', { order, selection: orderSelection, text: 'answer' }); }); assert.equal(order.get('lines.length'), 1, 'Order has 1 Order Line'); @@ -82,28 +82,28 @@ test("order with valid question shows valid", function(assert) { assert.equal(validations.get('isValidating'), false, 'All promises should be resolved'); assert.equal(validations.get('isValid'), true, 'Order Line should be valid because of Order Selection Question'); return orderSelection.validate(); - }).then(({ validations}) => { + }).then(({ validations }) => { assert.equal(validations.get('isValidating'), false, 'All promises should be resolved'); assert.equal(validations.get('isValid'), true, 'Order Selection should be valid because of Order Selection Question'); return orderSelectionQuestion.validate(); - }).then(({ validations}) => { + }).then(({ validations }) => { assert.equal(validations.get('isValidating'), false, 'All promises should be resolved'); assert.equal(validations.get('isValid'), true, 'Order Selection Question should be valid'); done(); }); }); -test("order with invalid question shows invalid if validated in reverse order", function(assert) { +test('order with invalid question shows invalid if validated in reverse order', function(assert) { assert.expect(11); - let order = this.subject({source: 'external'}); + let order = this.subject({ source: 'external' }); let orderLine, orderSelection, orderSelectionQuestion; let store = this.store(); Ember.run(() => { - orderLine = store.createRecord('order-line', { order: order, type: "item" }); - orderSelection = store.createRecord('order-selection', { order: order, line: orderLine, quantity: 1 }); - orderSelectionQuestion = store.createRecord('order-selection-question', { order: order, selection: orderSelection }); + orderLine = store.createRecord('order-line', { order, type: 'item' }); + orderSelection = store.createRecord('order-selection', { order, line: orderLine, quantity: 1 }); + orderSelectionQuestion = store.createRecord('order-selection-question', { order, selection: orderSelection }); }); assert.equal(order.get('lines.length'), 1, 'Order has 1 Order Line'); @@ -120,28 +120,28 @@ test("order with invalid question shows invalid if validated in reverse order", assert.equal(validations.get('isValidating'), false, 'All promises should be resolved'); assert.equal(validations.get('isValid'), false, 'Order Selection should not be valid because of Order Selection Question'); return orderLine.validate(); - }).then(({ validations}) => { + }).then(({ validations }) => { assert.equal(validations.get('isValidating'), false, 'All promises should be resolved'); assert.equal(validations.get('isValid'), false, 'Order Line should not be valid because of Order Selection Question'); return order.validate(); - }).then(({ validations}) => { + }).then(({ validations }) => { assert.equal(validations.get('isValidating'), false, 'All promises should be resolved'); assert.equal(validations.get('isValid'), false, 'Order should not be valid because of Order Selection Question'); done(); }); }); -test("order with valid question shows valid if validated in reverse order", function(assert) { +test('order with valid question shows valid if validated in reverse order', function(assert) { assert.expect(11); - let order = this.subject({source: 'external'}); + let order = this.subject({ source: 'external' }); let orderLine, orderSelection, orderSelectionQuestion; let store = this.store(); Ember.run(() => { - orderLine = store.createRecord('order-line', { order: order, type: "item" }); - orderSelection = store.createRecord('order-selection', { order: order, line: orderLine, quantity: 1 }); - orderSelectionQuestion = store.createRecord('order-selection-question', { order: order, selection: orderSelection, text: 'answer' }); + orderLine = store.createRecord('order-line', { order, type: 'item' }); + orderSelection = store.createRecord('order-selection', { order, line: orderLine, quantity: 1 }); + orderSelectionQuestion = store.createRecord('order-selection-question', { order, selection: orderSelection, text: 'answer' }); }); assert.equal(order.get('lines.length'), 1, 'Order has 1 Order Line'); @@ -158,18 +158,18 @@ test("order with valid question shows valid if validated in reverse order", func assert.equal(validations.get('isValidating'), false, 'All promises should be resolved'); assert.equal(validations.get('isValid'), true, 'Order Selection should be valid because of Order Selection Question'); return orderLine.validate(); - }).then(({ validations}) => { + }).then(({ validations }) => { assert.equal(validations.get('isValidating'), false, 'All promises should be resolved'); assert.equal(validations.get('isValid'), true, 'Order Line should be valid because of Order Selection Question'); return order.validate(); - }).then(({ validations}) => { + }).then(({ validations }) => { assert.equal(validations.get('isValidating'), false, 'All promises should be resolved'); assert.equal(validations.get('isValid'), true, 'Order should be valid because of Order Selection Question'); done(); }); }); -test("order with invalid question shows valid if invalid question is deleted in reverse order", function(assert) { +test('order with invalid question shows valid if invalid question is deleted in reverse order', function(assert) { assert.expect(9); let order = this.subject({ id: 1, source: 'external' }); @@ -182,10 +182,10 @@ test("order with invalid question shows valid if invalid question is deleted in model.get('_internalModel').adapterDidCommit(); }; - orderLine = store.createRecord('order-line', { id: 1, order: order, type: "item" }); - orderSelection = store.createRecord('order-selection', { id: 1, order: order, line: orderLine, quantity: 1 }); - orderSelectionQuestion = store.createRecord('order-selection-question', { id: 1, order: order, selection: orderSelection, text: 'answer' }); - orderSelectionQuestion2 = store.createRecord('order-selection-question', { id: 2, order: order, selection: orderSelection }); + orderLine = store.createRecord('order-line', { id: 1, order, type: 'item' }); + orderSelection = store.createRecord('order-selection', { id: 1, order, line: orderLine, quantity: 1 }); + orderSelectionQuestion = store.createRecord('order-selection-question', { id: 1, order, selection: orderSelection, text: 'answer' }); + orderSelectionQuestion2 = store.createRecord('order-selection-question', { id: 2, order, selection: orderSelection }); fakeSave(order); fakeSave(orderLine); diff --git a/tests/unit/validators/base-test.js b/tests/unit/validators/base-test.js index 75c03fdd..4a21737d 100644 --- a/tests/unit/validators/base-test.js +++ b/tests/unit/validators/base-test.js @@ -10,11 +10,11 @@ import { } from 'ember-qunit'; -var defaultOptions, options, validator, message; +let defaultOptions, options, validator, message; moduleFor('validator:length', 'Unit | Validator | base', { needs: ['validator:messages'], - setup: function() { + setup() { validator = BaseValidator.create(); } }); @@ -31,7 +31,7 @@ test('buildOptions - merge all options', function(assert) { }; options = validator.buildOptions(options, defaultOptions); - assert.deepEqual(options.getProperties(['foo', 'bar']), { foo: 'a', bar: 'b'}); + assert.deepEqual(options.getProperties(['foo', 'bar']), { foo: 'a', bar: 'b' }); }); test('buildOptions - does not overwrite options', function(assert) { @@ -47,7 +47,7 @@ test('buildOptions - does not overwrite options', function(assert) { }; options = validator.buildOptions(options, defaultOptions); - assert.deepEqual(options.getProperties(['foo', 'bar']), { foo: 'a', bar: 'b'}); + assert.deepEqual(options.getProperties(['foo', 'bar']), { foo: 'a', bar: 'b' }); }); test('buildOptions - copy', function(assert) { @@ -77,7 +77,7 @@ test('createErrorMessage - message function', function(assert) { options = { message() { - return "{description} has some sort of error"; + return '{description} has some sort of error'; } }; @@ -85,12 +85,11 @@ test('createErrorMessage - message function', function(assert) { assert.equal(message, 'This field has some sort of error'); }); - test('value - default gets model value', function(assert) { assert.expect(2); validator.setProperties({ - model: Ember.Object.create({ foo: 'bar'}), + model: Ember.Object.create({ foo: 'bar' }), attribute: 'foo', options: {} }); @@ -105,7 +104,7 @@ test('value - overwrite value method via options', function(assert) { assert.expect(3); validator.setProperties({ - model: Ember.Object.create({ foo: 'bar', bar: 'baz'}), + model: Ember.Object.create({ foo: 'bar', bar: 'baz' }), attribute: 'foo', options: { value() { diff --git a/tests/unit/validators/collection-test.js b/tests/unit/validators/collection-test.js index 6ae035bd..e16be6ae 100644 --- a/tests/unit/validators/collection-test.js +++ b/tests/unit/validators/collection-test.js @@ -8,11 +8,11 @@ import { } from 'ember-qunit'; -var options, builtOptions, validator, message; +let options, builtOptions, validator, message; moduleFor('validator:collection', 'Unit | Validator | collection', { needs: ['validator:messages'], - setup: function() { + setup() { validator = this.subject(); } }); @@ -47,7 +47,7 @@ test('value not collection', function(assert) { builtOptions = validator.buildOptions(options); message = validator.validate('foo', builtOptions.copy()); - assert.equal(message, "This field must be a collection"); + assert.equal(message, 'This field must be a collection'); }); test('singular - value is singular', function(assert) { @@ -67,5 +67,5 @@ test('singular - value not singular', function(assert) { builtOptions = validator.buildOptions(options); message = validator.validate(['foo', 'bar'], builtOptions.copy()); - assert.equal(message, "This field can't be a collection"); + assert.equal(message, 'This field can\'t be a collection'); }); diff --git a/tests/unit/validators/confirmation-test.js b/tests/unit/validators/confirmation-test.js index 11dc1667..68ece93a 100644 --- a/tests/unit/validators/confirmation-test.js +++ b/tests/unit/validators/confirmation-test.js @@ -9,11 +9,11 @@ import { } from 'ember-qunit'; -var model, options, builtOptions, validator, message; +let model, options, builtOptions, validator, message; moduleFor('validator:confirmation', 'Unit | Validator | confirmation', { needs: ['validator:messages'], - setup: function() { + setup() { validator = this.subject(); } }); @@ -29,7 +29,7 @@ test('attribute', function(assert) { }); message = validator.validate('bar@yahoo.com', builtOptions.copy(), model); - assert.equal(message, "This field doesn't match email"); + assert.equal(message, 'This field doesn\'t match email'); model.set('emailConfirmation', 'foo@yahoo.com'); diff --git a/tests/unit/validators/date-test.js b/tests/unit/validators/date-test.js index 7e3bfbcf..7d2cd7cd 100644 --- a/tests/unit/validators/date-test.js +++ b/tests/unit/validators/date-test.js @@ -4,17 +4,13 @@ */ import moment from 'moment'; +import { moduleFor, test } from 'ember-qunit'; -import { - moduleFor, test -} -from 'ember-qunit'; - -var options, builtOptions, validator, message; +let options, builtOptions, validator, message; moduleFor('validator:date', 'Unit | Validator | date', { needs: ['validator:messages'], - setup: function() { + setup() { validator = this.subject(); } }); @@ -106,7 +102,7 @@ test('before', function(assert) { test('before now', function(assert) { assert.expect(2); - var now = moment().format('MMM Do, YYYY'); + let now = moment().format('MMM Do, YYYY'); options = { before: 'now' }; @@ -141,7 +137,7 @@ test('before or on', function(assert) { test('before now or on', function(assert) { assert.expect(3); - var now = moment().format('MMM Do, YYYY'); + let now = moment().format('MMM Do, YYYY'); options = { onOrBefore: 'now' }; @@ -159,15 +155,15 @@ test('before now or on', function(assert) { }); test('before or on precision', function(assert) { - var precisions = ['second', 'minute', 'hour', 'day', 'week', 'month', 'year']; + let precisions = ['second', 'minute', 'hour', 'day', 'week', 'month', 'year']; - assert.expect((precisions.length * 3) -1); - var now = moment(new Date('2013-02-08T09:30:26')); - var dateString = now.toString(); - var nowMessage = now.format('MMM Do, YYYY'); + assert.expect((precisions.length * 3) - 1); + let now = moment(new Date('2013-02-08T09:30:26')); + let dateString = now.toString(); + let nowMessage = now.format('MMM Do, YYYY'); - for (var i = 0; i < precisions.length; i++) { - var precision = precisions[i]; + for (let i = 0; i < precisions.length; i++) { + let precision = precisions[i]; builtOptions = validator.buildOptions({ onOrBefore: dateString }); @@ -204,7 +200,7 @@ test('after', function(assert) { test('after now', function(assert) { assert.expect(2); - var now = moment().format('MMM Do, YYYY'); + let now = moment().format('MMM Do, YYYY'); options = { after: 'now' }; @@ -239,7 +235,7 @@ test('after or on', function(assert) { test('after now or on', function(assert) { assert.expect(3); - var now = moment().format('MMM Do, YYYY'); + let now = moment().format('MMM Do, YYYY'); options = { onOrAfter: 'now', precision: 'second' @@ -258,15 +254,15 @@ test('after now or on', function(assert) { }); test('after or on precision', function(assert) { - var precisions = ['second', 'minute', 'hour', 'day', 'week', 'month', 'year']; + let precisions = ['second', 'minute', 'hour', 'day', 'week', 'month', 'year']; - assert.expect((precisions.length * 3) -1); - var now = moment(new Date('2013-02-08T09:30:26')); - var dateString = now.toString(); - var nowMessage = now.format('MMM Do, YYYY'); + assert.expect((precisions.length * 3) - 1); + let now = moment(new Date('2013-02-08T09:30:26')); + let dateString = now.toString(); + let nowMessage = now.format('MMM Do, YYYY'); - for (var i = 0; i < precisions.length; i++) { - var precision = precisions[i]; + for (let i = 0; i < precisions.length; i++) { + let precision = precisions[i]; builtOptions = validator.buildOptions({ onOrAfter: dateString }); diff --git a/tests/unit/validators/dependent-test.js b/tests/unit/validators/dependent-test.js index dc7768a3..85d2f04f 100644 --- a/tests/unit/validators/dependent-test.js +++ b/tests/unit/validators/dependent-test.js @@ -12,20 +12,20 @@ const { get } = Ember; -var Validator, message, model, options, builtOptions; +let Validator, message, model, options, builtOptions; -var Validations = buildValidations({ +let Validations = buildValidations({ firstName: validator('presence', true), lastName: validator('presence', true) }); -var defaultOptions = { +let defaultOptions = { on: ['firstName', 'lastName'] }; moduleFor('validator:dependent', 'Unit | Validator | dependent', { needs: ['validator:messages', 'validator:presence'], - setup: function() { + setup() { Validator = this.subject(); } }); @@ -55,7 +55,7 @@ test('all empty attributes', function(assert) { message = Validator.validate(undefined, builtOptions.copy(), model); - assert.equal(message, "This field is invalid"); + assert.equal(message, 'This field is invalid'); assert.equal(get(model, 'validations.messages.length'), 1); assert.equal(get(model, 'validations.isValid'), false); }); @@ -75,7 +75,7 @@ test('one dependent error', function(assert) { message = Validator.validate(undefined, builtOptions.copy(), model); - assert.equal(message, "This field is invalid"); + assert.equal(message, 'This field is invalid'); assert.equal(get(model, 'validations.messages.length'), 1); assert.equal(get(model, 'validations.isValid'), false); }); diff --git a/tests/unit/validators/ds-error-test.js b/tests/unit/validators/ds-error-test.js index a51cc41f..ab5e0f4a 100644 --- a/tests/unit/validators/ds-error-test.js +++ b/tests/unit/validators/ds-error-test.js @@ -10,11 +10,11 @@ import { } from 'ember-qunit'; -var model, validator, message; +let model, validator, message; moduleFor('validator:ds-error', 'Unit | Validator | ds-error', { needs: ['validator:messages'], - setup: function() { + setup() { validator = this.subject(); } }); diff --git a/tests/unit/validators/exclusion-test.js b/tests/unit/validators/exclusion-test.js index deb1caa8..acccda6d 100644 --- a/tests/unit/validators/exclusion-test.js +++ b/tests/unit/validators/exclusion-test.js @@ -8,11 +8,11 @@ import { } from 'ember-qunit'; -var options, builtOptions, validator, message; +let options, builtOptions, validator, message; moduleFor('validator:exclusion', 'Unit | Validator | exclusion', { needs: ['validator:messages'], - setup: function() { + setup() { validator = this.subject(); } }); @@ -34,7 +34,7 @@ test('allow blank', function(assert) { options = { allowBlank: true, - "in": ["foo", "bar", "baz"] + 'in': ['foo', 'bar', 'baz'] }; builtOptions = validator.buildOptions(options); @@ -50,7 +50,7 @@ test('not in array', function(assert) { assert.expect(4); options = { - "in": ["foo", "bar", "baz"] + 'in': ['foo', 'bar', 'baz'] }; builtOptions = validator.buildOptions(options); @@ -78,13 +78,13 @@ test('not in range', function(assert) { builtOptions = validator.buildOptions(options); message = validator.validate(1, builtOptions.copy()); - assert.equal(message, "This field is reserved"); + assert.equal(message, 'This field is reserved'); message = validator.validate(5, builtOptions.copy()); - assert.equal(message, "This field is reserved"); + assert.equal(message, 'This field is reserved'); message = validator.validate(10, builtOptions.copy()); - assert.equal(message, "This field is reserved"); + assert.equal(message, 'This field is reserved'); message = validator.validate(0, builtOptions.copy()); assert.equal(message, true); @@ -103,10 +103,10 @@ test('range type check - number', function(assert) { builtOptions = validator.buildOptions(options); message = validator.validate(1, builtOptions.copy()); - assert.equal(message, "This field is reserved"); + assert.equal(message, 'This field is reserved'); message = validator.validate(5, builtOptions.copy()); - assert.equal(message, "This field is reserved"); + assert.equal(message, 'This field is reserved'); message = validator.validate('1', builtOptions.copy()); assert.equal(message, true); @@ -125,10 +125,10 @@ test('range type check - string', function(assert) { builtOptions = validator.buildOptions(options); message = validator.validate('a', builtOptions.copy()); - assert.equal(message, "This field is reserved"); + assert.equal(message, 'This field is reserved'); message = validator.validate('z', builtOptions.copy()); - assert.equal(message, "This field is reserved"); + assert.equal(message, 'This field is reserved'); message = validator.validate(97, builtOptions.copy()); assert.equal(message, true); diff --git a/tests/unit/validators/format-test.js b/tests/unit/validators/format-test.js index 9ca16243..03d31368 100644 --- a/tests/unit/validators/format-test.js +++ b/tests/unit/validators/format-test.js @@ -8,11 +8,11 @@ import { } from 'ember-qunit'; -var options, builtOptions, validator, message; +let options, builtOptions, validator, message; moduleFor('validator:format', 'Unit | Validator | format', { needs: ['validator:messages'], - setup: function() { + setup() { validator = this.subject(); } }); @@ -56,7 +56,7 @@ test('allow blank', function(assert) { }); test('email no option', function(assert) { - const validAddresses = [ + let validAddresses = [ 'email@domain.com', 'firstname.lastname@domain.com', 'email@subdomain.domain.com', @@ -69,7 +69,7 @@ test('email no option', function(assert) { 'firstname-lastname@domain.com', 'EMAIL@DOMAIN.COM' ]; - const invalidAddresses = [ + let invalidAddresses = [ 'plainaddress', '#@%^%#$@#$@#.com', '@domain.com', @@ -107,7 +107,7 @@ test('email no option', function(assert) { }); test('email option allowNonTld', function(assert) { - const validAddresses = [ + let validAddresses = [ 'email@domain.com', 'firstname.lastname@domain.com', 'email@subdomain.domain.com', @@ -121,7 +121,7 @@ test('email option allowNonTld', function(assert) { 'EMAIL@DOMAIN.COM', 'email@domain' ]; - const invalidAddresses = [ + let invalidAddresses = [ 'plainaddress', '#@%^%#$@#$@#.com', '@domain.com', diff --git a/tests/unit/validators/inclusion-test.js b/tests/unit/validators/inclusion-test.js index 4bb9e4fd..e6bb43f8 100644 --- a/tests/unit/validators/inclusion-test.js +++ b/tests/unit/validators/inclusion-test.js @@ -8,11 +8,11 @@ import { } from 'ember-qunit'; -var options, builtOptions, validator, message; +let options, builtOptions, validator, message; moduleFor('validator:inclusion', 'Unit | Validator | inclusion', { needs: ['validator:messages'], - setup: function() { + setup() { validator = this.subject(); } }); @@ -34,7 +34,7 @@ test('allow blank', function(assert) { options = { allowBlank: true, - "in": ["foo", "bar", "baz"] + 'in': ['foo', 'bar', 'baz'] }; builtOptions = validator.buildOptions(options); @@ -49,7 +49,7 @@ test('in array', function(assert) { assert.expect(4); options = { - "in": ["foo", "bar", "baz"] + 'in': ['foo', 'bar', 'baz'] }; builtOptions = validator.buildOptions(options); diff --git a/tests/unit/validators/length-test.js b/tests/unit/validators/length-test.js index 127570e0..bd02933c 100644 --- a/tests/unit/validators/length-test.js +++ b/tests/unit/validators/length-test.js @@ -8,11 +8,11 @@ import { } from 'ember-qunit'; -var options, builtOptions, validator, message; +let options, builtOptions, validator, message; moduleFor('validator:length', 'Unit | Validator | length', { needs: ['validator:messages'], - setup: function() { + setup() { validator = this.subject(); } }); diff --git a/tests/unit/validators/messages-test.js b/tests/unit/validators/messages-test.js index 375506d0..696f803d 100644 --- a/tests/unit/validators/messages-test.js +++ b/tests/unit/validators/messages-test.js @@ -5,10 +5,10 @@ import { moduleFor, test } from 'ember-qunit'; -var messages; +let messages; moduleFor('validator:messages', 'Unit | Validator | messages', { - setup: function() { + setup() { messages = this.subject(); } }); @@ -26,7 +26,7 @@ test('formatMessage', function(assert) { }; assert.equal(messages.formatMessage(undefined, context), 'This field is invalid'); assert.equal(messages.formatMessage('{foo} is undefined'), 'undefined is undefined'); - assert.equal(messages.formatMessage('{foo} {foo} {bar} {baz}', {foo: 'a', bar: 1, baz: 'abc'}), 'a a 1 abc'); + assert.equal(messages.formatMessage('{foo} {foo} {bar} {baz}', { foo: 'a', bar: 1, baz: 'abc' }), 'a a 1 abc'); }); test('getMessageFor', function(assert) { diff --git a/tests/unit/validators/number-test.js b/tests/unit/validators/number-test.js index 536bccd0..27565099 100644 --- a/tests/unit/validators/number-test.js +++ b/tests/unit/validators/number-test.js @@ -8,11 +8,11 @@ import { } from 'ember-qunit'; -var options, builtOptions, validator, message; +let options, builtOptions, validator, message; moduleFor('validator:number', 'Unit | Validator | number', { needs: ['validator:messages'], - setup: function() { + setup() { validator = this.subject(); } }); @@ -57,8 +57,6 @@ test('allow string', function(assert) { message = validator.validate('22.22', builtOptions.copy()); assert.equal(message, 'This field must be a number'); - - }); test('integer', function(assert) { diff --git a/tests/unit/validators/presence-test.js b/tests/unit/validators/presence-test.js index 671cc713..8dcee1da 100644 --- a/tests/unit/validators/presence-test.js +++ b/tests/unit/validators/presence-test.js @@ -8,11 +8,11 @@ import { } from 'ember-qunit'; -var options, builtOptions, validator, message; +let options, builtOptions, validator, message; moduleFor('validator:presence', 'Unit | Validator | presence', { needs: ['validator:messages'], - setup: function() { + setup() { validator = this.subject(); } }); @@ -59,7 +59,7 @@ test('presence with ignoreBlank - value blank', function(assert) { builtOptions = validator.buildOptions(options); message = validator.validate(' ', builtOptions.copy()); - assert.equal(message, "This field can't be blank"); + assert.equal(message, 'This field can\'t be blank'); }); test('presence - value not present', function(assert) { @@ -69,7 +69,7 @@ test('presence - value not present', function(assert) { builtOptions = validator.buildOptions(options); message = validator.validate(undefined, builtOptions.copy()); - assert.equal(message, "This field can't be blank"); + assert.equal(message, 'This field can\'t be blank'); }); test('absence - value present', function(assert) { @@ -79,7 +79,7 @@ test('absence - value present', function(assert) { builtOptions = validator.buildOptions(options); message = validator.validate('value', builtOptions.copy()); - assert.equal(message, "This field must be blank"); + assert.equal(message, 'This field must be blank'); }); test('absence - value not present', function(assert) { diff --git a/typings/ember/ember.d.ts b/typings/ember/ember.d.ts new file mode 100755 index 00000000..e160b66f --- /dev/null +++ b/typings/ember/ember.d.ts @@ -0,0 +1,3212 @@ +interface DOMElement {} +interface Promise {} +declare class Registry {} +declare class Transition {} +declare namespace Handlebars { class SafeString {} } +declare class JQuery {} + + +declare module 'ember' { + export namespace Ember { + /** + * Framework objects in an Ember application (components, services, routes, etc.) are created via a factory and dependency injection system. Each of these objects is the responsibility of an "owner", which handled its instantiation and manages its lifetime. + */ + function getOwner(object: {}): {}; + /** + * `setOwner` forces a new owner on a given object instance. This is primarily useful in some testing cases. + */ + function setOwner(object: {}): {}; + /** + * Display a deprecation warning with the provided message and a stack trace (Chrome and Firefox only). Ember build tools will remove any calls to `Ember.deprecate()` when doing a production build. + */ + function deprecate(message: string, test: boolean, options: {}); + /** + * Define an assertion that will throw an exception if the condition is not met. Ember build tools will remove any calls to `Ember.assert()` when doing an Ember.js framework production build and will make the assertion a no-op for an application production build. Example: + */ + function assert(desc: string, test: boolean); + /** + * Display a debug notice. Ember build tools will remove any calls to `Ember.debug()` when doing a production build. + */ + function debug(message: string); + /** + * Run a function meant for debugging. Ember build tools will remove any calls to `Ember.runInDebug()` when doing a production build. + */ + function runInDebug(func: Function); + /** + * Display a warning with the provided message. Ember build tools will remove any calls to `Ember.warn()` when doing a production build. + */ + function warn(message: string, test: boolean, options: {}); + /** + * Copy properties from a source object to a target object. + */ + function assign(original: {}, args: {}): {}; + /** + * Debug parameter you can turn on. This will log all bindings that fire to the console. This should be disabled in production code. Note that you can also enable this from the console or temporarily. + */ + var LOG_BINDINGS: boolean; + /** + * Global helper method to create a new binding. Just pass the root object along with a `to` and `from` path to create and connect the binding. + */ + function bind(obj: {}, to: string, from: string): Binding; + /** + * Returns the cached value for a property, if one exists. This can be useful for peeking at the value of a computed property that is generated lazily, without accidentally causing it to be created. + */ + function cacheFor(obj: {}, key: string): {}; + /** + * The semantic version. + */ + var VERSION: string; + /** + * The hash of environment variables used to control various configuration settings. To specify your own or override default settings, add the desired properties to a global hash named `EmberENV` (or `ENV` for backwards compatibility with earlier versions of Ember). The `EmberENV` hash must be created before loading Ember. + */ + var ENV: {}; + /** + * Determines whether Ember should add to `Array`, `Function`, and `String` native object prototypes, a few extra methods in order to provide a more friendly API. + */ + var EXTEND_PROTOTYPES: boolean; + /** + * The `LOG_STACKTRACE_ON_DEPRECATION` property, when true, tells Ember to log a full stack trace during deprecation warnings. + */ + var LOG_STACKTRACE_ON_DEPRECATION: boolean; + /** + * The `LOG_VERSION` property, when true, tells Ember to log versions of all dependent libraries in use. + */ + var LOG_VERSION: boolean; + /** + * An empty function useful for some operations. Always returns `this`. + */ + function K(): {}; + /** + * Add an event listener + */ + function addListener(obj: any, eventName: string, target: {}|Function, method: Function|string, once: boolean); + /** + * Remove an event listener + */ + function removeListener(obj: any, eventName: string, target: {}|Function, method: Function|string); + /** + * Send an event. The execution of suspended listeners is skipped, and once listeners are removed. A listener without a target is executed on the passed object. If an array of actions is not passed, the actions stored on the passed object are invoked. + */ + function sendEvent(obj: any, eventName: string, params: Ember.Array, actions: Ember.Array): void; + /** + * Define a property as a function that should be executed when a specified event or events are triggered. + */ + function on(eventNames: string, func: Function): void; + /** + * To get multiple properties at once, call `Ember.getProperties` with an object followed by a list of strings or an array: + */ + function getProperties(obj: {}, ...list: string[]): {}; + /** + * A value is blank if it is empty or a whitespace string. + */ + function isBlank(obj: {}): boolean; + /** + * Verifies that a value is `null` or an empty string, empty array, or empty function. + */ + function isEmpty(obj: {}): boolean; + /** + * Returns true if the passed value is null or undefined. This avoids errors from JSLint complaining about use of ==, which can be technically confusing. + */ + function isNone(obj: {}): boolean; + /** + * A value is present if it not `isBlank`. + */ + function isPresent(obj: {}): boolean; + /** + * Merge the contents of two objects together into the first object. + */ + function merge(original: {}, updates: {}): {}; + /** + * Makes a method available via an additional name. + */ + function aliasMethod(methodName: string); + /** + * Specify a method that observes property changes. + */ + function observer(propertyNames: string, func: Function): void; + function addObserver(obj: any, _path: string, target: {}|Function, method: Function|string); + function removeObserver(obj: any, path: string, target: {}|Function, method: Function|string); + /** + * Gets the value of a property on an object. If the property is computed, the function will be invoked. If the property is not defined but the object implements the `unknownProperty` method then that will be invoked. + */ + function get(obj: {}, keyName: string): {}; + /** + * Retrieves the value of a property from an Object, or a default value in the case that the property returns `undefined`. + */ + function getWithDefault(obj: {}, keyName: string, defaultValue: {}): {}; + /** + * Sets the value of a property on an object, respecting computed properties and notifying observers and other listeners of the change. If the property is not defined but the object implements the `setUnknownProperty` method then that will be invoked as well. + */ + function set(obj: {}, keyName: string, value: {}): {}; + /** + * Error-tolerant form of `Ember.set`. Will not blow up if any part of the chain is `undefined`, `null`, or destroyed. + */ + function trySet(root: {}, path: string, value: {}); + /** + * Set a list of properties on an object. These properties are set inside a single `beginPropertyChanges` and `endPropertyChanges` batch, so observers will be buffered. + */ + function setProperties(obj: any, properties: {}): void; + /** + * Returns a unique id for the object. If the object does not yet have a guid, one will be assigned to it. You can call this on any object, `Ember.Object`-based or not, but be aware that it will add a `_guid` property. + */ + function guidFor(obj: {}): string; + /** + * Checks to see if the `methodName` exists on the `obj`, and if it does, invokes it with the arguments passed. + */ + function tryInvoke(obj: {}, methodName: string, args: Ember.Array): any; + /** + * Creates an `Ember.NativeArray` from an Array like object. Does not modify the original object. Ember.A is not needed if `Ember.EXTEND_PROTOTYPES` is `true` (the default value). However, it is recommended that you use Ember.A when creating addons for ember or when you can not guarantee that `Ember.EXTEND_PROTOTYPES` will be `true`. + */ + function A(): NativeArray; + /** + * Compares two javascript values and returns: + */ + function compare(v: {}, w: {}): number; + /** + * Creates a shallow copy of the passed object. A deep copy of the object is returned if the optional `deep` argument is `true`. + */ + function copy(obj: {}, deep: boolean): {}; + /** + * Compares two objects, returning true if they are equal. + */ + function isEqual(a: {}, b: {}): boolean; + /** + * Returns true if the passed object is an array or Array-like. + */ + function isArray(obj: {}): boolean; + /** + * Returns a consistent type for the passed object. + */ + function typeOf(item: {}): string; + /** + * Alias for jQuery + */ + function $(); + export namespace ApplicationInstance { + /** + * A list of boot-time configuration options for customizing the behavior of an `Ember.ApplicationInstance`. + */ + export class BootOptions { + /** + * Run in a full browser environment. + */ + isBrowser: boolean; + /** + * Disable rendering completely. + */ + shouldRender: boolean; + /** + * If present, render into the given `Document` object instead of the global `window.document` object. + */ + document: Document; + /** + * If present, overrides the application's `rootElement` property on the instance. This is useful for testing environment, where you might want to append the root view to a fixture area. + */ + rootElement: string|Element; + /** + * If present, overrides the router's `location` property with this value. This is useful for environments where trying to modify the URL would be inappropriate. + */ + location: string; + } + } + export namespace Templates { + export class helpers { + /** + * Concatenates input params together. + */ + concat(); + /** + * The `{{each-in}}` helper loops over properties on an object. It is unbound, in that new (or removed) properties added to the target object will not be rendered. + */ + 'each-in'(); + /** + * The `{{#each}}` helper loops over elements in a collection. It is an extension of the base Handlebars `{{#each}}` helper. + */ + each(); + /** + * Use the `{{hash}}` helper to create a hash to pass as an option to your components. This is specially useful for contextual components where you can just yield a hash: + */ + hash(options: {}): {}; + /** + * Use the `if` block helper to conditionally render a block depending on a property. If the property is "falsey", for example: `false`, `undefined`, `null`, `""`, `0`, `NaN` or an empty array, the block will not be rendered. + */ + if(); + /** + * The `unless` helper is the inverse of the `if` helper. Its block will be rendered if the expression contains a falsey value. All forms of the `if` helper can also be used with `unless`. + */ + unless(); + /** + * Calls [Ember.String.loc](/api/classes/Ember.String.html#method_loc) with the provided string. This is a convenient way to localize text within a template. For example: + */ + loc(str: string); + /** + * `log` allows you to output the value of variables in the current rendering context. `log` also accepts primitive types such as strings or numbers. + */ + log(values: any); + /** + * Use the `{{with}}` helper when you want to alias a property to a new name. This is helpful for semantic clarity as it allows you to retain default scope or to reference a property from another `{{with}}` block. + */ + with(options: {}): string; + /** + * DEPRECATED: Use `{{each}}` helper instead. + * `{{collection}}` is a template helper for adding instances of `Ember.CollectionView` to a template. See [Ember.CollectionView](/api/classes/Ember.CollectionView.html) for additional information on how a `CollectionView` functions. + */ + collection(); + /** + * The `{{component}}` helper lets you add instances of `Ember.Component` to a template. See [Ember.Component](/api/classes/Ember.Component.html) for additional information on how a `Component` functions. `{{component}}`'s primary use is for cases where you want to dynamically change which type of component is rendered as the state of your application changes. The provided block will be applied as the template for the component. Given an empty `` the following template: + */ + component(); + /** + * Execute the `debugger` statement in the current template's context. + */ + debugger(); + /** + * Dynamically look up a property on an object. The second argument to `{{get}}` should have a string value, although it can be bound. + */ + get(); + /** + * The `{{input}}` helper lets you create an HTML `` component. It causes an `Ember.TextField` component to be rendered. For more info, see the [Ember.TextField](/api/classes/Ember.TextField.html) docs and the [templates guide](http://emberjs.com/guides/templates/input-helpers/). + */ + input(options: {}); + /** + * The `mut` helper lets you __clearly specify__ that a child `Component` can update the (mutable) value passed to it, which will __change the value of the parent component__. + */ + mut(attr: {}); + /** + * The `{{outlet}}` helper lets you specify where a child routes will render in your template. An important use of the `{{outlet}}` helper is in your application's `application.hbs` file: + */ + outlet(name: string); + /** + * The `partial` helper renders another template without changing the template context: + */ + partial(partialName: string); + /** + * `{{textarea}}` inserts a new instance of `