Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"contributors": "npx contributor-faces -e \"(*-bot|*\\[bot\\]|*-tomster|homu|bors)\""
},
"dependencies": {
"ember-changeset": "^3.2.0",
"ember-changeset": "^3.3.1",
"ember-cli-babel": "^7.8.0",
"ember-cli-htmlbars": "^4.0.5",
"ember-get-config": "^0.2.4",
Expand Down
18 changes: 10 additions & 8 deletions tests/dummy/app/components/foo-bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ const rulez = {
validatePresence(true),
validateLength({ min: 2 })
],
'state.ny': [
validatePresence(true),
validateLength({ min: 2 })
],
'state.wi': [
validatePresence(true),
validateLength({ min: 2 })
]
state: {
ny: [
validatePresence(true),
validateLength({ min: 2 })
],
wi: [
validatePresence(true),
validateLength({ min: 2 })
]
}
};

const schema = {
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/helpers/changeset-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ module('Unit | Helper | changeset', function() {
assert.ok(changesetInstance.get('isInvalid'), 'should be invalid with blank first name');

changesetInstance.set('lastName', '');
assert.deepEqual(changesetInstance.get('error').lastName.validation, ["[CUSTOM] Last name can't be blank"]);
assert.deepEqual(changesetInstance.get('error').lastName.validation, "[CUSTOM] Last name can't be blank");
assert.ok(changesetInstance.get('isInvalid'), 'should be invalid with blank last name');

changesetInstance.set('firstName', 'Jim');
Expand All @@ -67,7 +67,7 @@ module('Unit | Helper | changeset', function() {

changesetInstance.set('email', '[email protected]');
await settled();
let expectedError = { value: '[email protected]', validation: ['is already taken'] };
let expectedError = { value: '[email protected]', validation: 'is already taken' };
assert.deepEqual(JSON.parse(JSON.stringify(changesetInstance.get('error').email)), expectedError, 'email should error');

changesetInstance.set('username', 'jimbob');
Expand Down Expand Up @@ -112,7 +112,7 @@ module('Unit | Helper | changeset', function() {

let changesetInstance = await changeset([user, userValidations]);
changesetInstance.validate().then(() => {
assert.deepEqual(changesetInstance.get('error').firstName.validation, ["[CUSTOM] First name can't be blank"]);
assert.deepEqual(changesetInstance.get('error').firstName.validation, "[CUSTOM] First name can't be blank");
assert.ok(changesetInstance.get('isInvalid'), 'should be invalid with wrong length first name');

changesetInstance.set('firstName', 'Jim');
Expand Down
56 changes: 12 additions & 44 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1960,7 +1960,7 @@ babel-plugin-dynamic-import-node@^2.3.0:
dependencies:
object.assign "^4.1.0"

babel-plugin-ember-data-packages-polyfill@^0.1.1, babel-plugin-ember-data-packages-polyfill@^0.1.2:
babel-plugin-ember-data-packages-polyfill@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/babel-plugin-ember-data-packages-polyfill/-/babel-plugin-ember-data-packages-polyfill-0.1.2.tgz#21154c095ddc703722b1fb8bb06c126c0b6d77dc"
integrity sha512-kTHnOwoOXfPXi00Z8yAgyD64+jdSXk3pknnS7NlqnCKAU6YDkXZ4Y7irl66kaZjZn0FBBt0P4YOZFZk85jYOww==
Expand Down Expand Up @@ -4261,53 +4261,21 @@ ember-auto-import@^1.5.2, ember-auto-import@^1.5.3:
walk-sync "^0.3.3"
webpack "~4.28"

ember-changeset@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/ember-changeset/-/ember-changeset-3.2.0.tgz#9f889e9fd8d1f5e80b8fbeec09f0623ad3d7836a"
integrity sha512-aJVsLRVyV/uKuSnKyZteqxvkAUDiGmKet6q/iD2eb36H9t4iwqZbq4XzDve6gtddz0sfK9VL61HFMVCqbHjYlw==
ember-changeset@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/ember-changeset/-/ember-changeset-3.3.1.tgz#8e035d74d806110602016481788c1e2634a03303"
integrity sha512-AvTAhlec6Cz0eKfKPxAQm33nhp1zQ04p9OiyVL4IRbvBetQ/7Jq+7r4otXO+jecgCxPygzYIy8nAvCjJ3t30GA==
dependencies:
"@glimmer/tracking" "^1.0.0"
ember-auto-import "^1.5.2"
ember-cli-babel "7.17.2"
validated-changeset "~0.3.0"
ember-cli-babel "^7.19.0"
validated-changeset "~0.4.1"

ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.0.tgz#de3baedd093163b6c2461f95964888c1676325ac"
integrity sha512-Zr4my8Xn+CzO0gIuFNXji0eTRml5AxZUTDQz/wsNJ5AJAtyFWCY4QtKdoELNNbiCVGt1lq5yLiwTm4scGKu6xA==

[email protected]:
version "7.17.2"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.17.2.tgz#2c7717c6864425be3cd11913c722115fbf1448d2"
integrity sha512-64jRwtRVtEp4ghhew/sHeMsPyUOg3t1TB2dary5mCbKkRasb3L7FwF7xnuzPihaz+AW/v2LqYLALXGCml5XNLA==
dependencies:
"@babel/core" "^7.8.4"
"@babel/helper-compilation-targets" "^7.8.4"
"@babel/plugin-proposal-class-properties" "^7.8.3"
"@babel/plugin-proposal-decorators" "^7.8.3"
"@babel/plugin-transform-modules-amd" "^7.8.3"
"@babel/plugin-transform-runtime" "^7.8.3"
"@babel/plugin-transform-typescript" "^7.8.3"
"@babel/polyfill" "^7.8.3"
"@babel/preset-env" "^7.8.4"
"@babel/runtime" "^7.8.4"
amd-name-resolver "^1.2.1"
babel-plugin-debug-macros "^0.3.0"
babel-plugin-ember-data-packages-polyfill "^0.1.1"
babel-plugin-ember-modules-api-polyfill "^2.12.0"
babel-plugin-module-resolver "^3.1.1"
broccoli-babel-transpiler "^7.4.0"
broccoli-debug "^0.6.4"
broccoli-funnel "^2.0.1"
broccoli-source "^1.1.0"
clone "^2.1.2"
ember-cli-babel-plugin-helpers "^1.1.0"
ember-cli-version-checker "^4.1.0"
ensure-posix-path "^1.0.2"
fixturify-project "^1.10.0"
rimraf "^3.0.1"
semver "^5.5.0"

ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.16.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.9.2:
version "6.18.0"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
Expand Down Expand Up @@ -4359,7 +4327,7 @@ ember-cli-babel@^7.11.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.7.3:
rimraf "^3.0.1"
semver "^5.5.0"

ember-cli-babel@^7.8.0:
ember-cli-babel@^7.19.0, ember-cli-babel@^7.8.0:
version "7.19.0"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.19.0.tgz#e6eddea18a867231fcf90a80689e92b98be9a63b"
integrity sha512-HiWKuoyy35vGEr+iCw6gUnQ3pS5qslyTlKEDW8cVoMbvZNGYBgRxHed5nklVUh+BS74AwR9lsp25BTAagYAP9Q==
Expand Down Expand Up @@ -10297,10 +10265,10 @@ validate-npm-package-name@^3.0.0:
dependencies:
builtins "^1.0.3"

validated-changeset@~0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/validated-changeset/-/validated-changeset-0.3.0.tgz#bd8f744c65c8661fd1e1436edc809c2c68113094"
integrity sha512-JWtSN4gktah+tgUPk2G8CixVDjtkb24UHtDocesoeXPWVH7KOuxV/E7GzwcIt1gvTqDBjvVxjrT9nKJHS/Lt0Q==
validated-changeset@~0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/validated-changeset/-/validated-changeset-0.4.1.tgz#74208c439cb03b7ba69af6819c722768678fffeb"
integrity sha512-Q7pvZaWPdqn0Zo/Xpddp9zQ2abqXJLEyyiJbym+O2H2pH5KPOBTB/5UXBvkaQ7zvK6exWBjZnNzzoo1dBWeoAQ==

vary@~1.1.2:
version "1.1.2"
Expand Down