Skip to content

Commit

Permalink
Bump ember-classy-page-object, ember-native-dom-helpers
Browse files Browse the repository at this point in the history
* Update some tests to wrap mutations in runloop so rendering flushes.
  • Loading branch information
mixonic committed Feb 6, 2021
1 parent d54e456 commit c878ff0
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 48 deletions.
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@html-next/vertical-collection": "^1.0.0-beta.14",
"broccoli-string-replace": "^0.1.2",
"css-element-queries": "^0.4.0",
"ember-classy-page-object": "^0.6.1",
"ember-classy-page-object": "Addepar/ember-classy-page-object#714cb4523f7cbab01e7539b0ddfe7d81714ba919",
"ember-cli-babel": "^7.12.0",
"ember-cli-htmlbars": "^3.0.1",
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
Expand Down Expand Up @@ -73,8 +73,7 @@
"ember-faker": "^1.5.0",
"ember-load-initializers": "^2.0.0",
"ember-math-helpers": "~2.11.3",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-native-dom-helpers": "0.6.2",
"ember-native-dom-helpers": "^0.7.0",
"ember-qunit": "^4.5.1",
"ember-radio-button": "^1.2.3",
"ember-resolver": "^5.1.1",
Expand All @@ -99,7 +98,6 @@
},
"homepage": "https://Addepar.github.io/ember-table",
"resolutions": {
"ember-cli-page-object": "1.15.1",
"prettier": "1.18.2"
}
}
12 changes: 9 additions & 3 deletions tests/integration/components/selection-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,9 @@ module('Integration | selection', () => {
assert.ok(renderedRowCount < 200, 'some rows are occluded');

// Select rows at the end that will not all have been rendered yet
this.set('selection', rows.slice(-5));
run(() => {
this.set('selection', rows.slice(-5));
});

await table.rows.objectAt(0).checkbox.click();
assert.ok(table.rows.objectAt(0).isSelected, 'first row is selected');
Expand All @@ -661,7 +663,9 @@ module('Integration | selection', () => {
assert.ok(renderedRowCount < 200, 'some rows are occluded');

// Select all the children but the first. Most have not yet been rendered.
this.set('selection', children.slice(1));
run(() => {
this.set('selection', children.slice(1));
});

// Select the last un-selected child
await table.rows.objectAt(1).checkbox.click();
Expand All @@ -681,7 +685,9 @@ module('Integration | selection', () => {
let rows = generateRows(1, 1);
await generateTable(this, { rows });

run(() => this.set('selection', [...rows, { fakeRow: true }]));
run(() => {
this.set('selection', [...rows, { fakeRow: true }]);
});
assert.ok(true, 'after setting bad selection, no error');
assert.ok(table.validateSelected(0), 'First row is selected');

Expand Down
58 changes: 17 additions & 41 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2659,7 +2659,7 @@ broccoli-lint-eslint@^5.0.0:
lodash.defaultsdeep "^4.6.0"
md5-hex "^2.0.0"

broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.1:
broccoli-merge-trees@^1.1.1:
version "1.2.4"
resolved "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5"
integrity sha1-oAFRm7UGfwZYnZGvopQkRaLQ/bU=
Expand Down Expand Up @@ -3968,21 +3968,20 @@ ember-assign-polyfill@^2.2.0, ember-assign-polyfill@^2.6.0:
ember-cli-babel "^7.20.5"
ember-cli-version-checker "^2.0.0"

ember-classy-page-object@^0.6.1:
ember-classy-page-object@Addepar/ember-classy-page-object#714cb4523f7cbab01e7539b0ddfe7d81714ba919:
version "0.6.1"
resolved "https://registry.npmjs.org/ember-classy-page-object/-/ember-classy-page-object-0.6.1.tgz#f170b2f69f646ab406ff982874a2ab926af9294a"
integrity sha512-huSjPp6PWN2yLSugnJq/ysde9apAGXCzcN+07WgqALQqy4FnPty6DeYjwRpy5LLKjtUS8YDENb+JcyCz9XlfcQ==
resolved "https://codeload.github.com/Addepar/ember-classy-page-object/tar.gz/714cb4523f7cbab01e7539b0ddfe7d81714ba919"
dependencies:
broccoli-funnel "^2.0.1"
ember-cli-babel "^6.6.0"
ember-cli-page-object "^1.15.4"
ember-cli-babel "^7.12.0"
ember-cli-page-object "^1.17.5"

ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.1:
version "1.1.1"
resolved "https://registry.npmjs.org/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==

ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.11.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.17.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.2:
ember-cli-babel@^6.11.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.17.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.2:
version "6.18.0"
resolved "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
integrity sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==
Expand Down Expand Up @@ -4196,18 +4195,18 @@ ember-cli-normalize-entity-name@^1.0.0:
dependencies:
silent-error "^1.0.0"

ember-cli-page-object@1.15.1, ember-cli-page-object@^1.15.4:
version "1.15.1"
resolved "https://registry.npmjs.org/ember-cli-page-object/-/ember-cli-page-object-1.15.1.tgz#da1f870638584b17e183d0014b4efb15465fadd5"
integrity sha512-/oUkiha+CLUNQGkQLHJ+mw9rm/V6Gi3VGgzKo7laEGZe6Mk8jl13otxEKWKI2NTJmL69fZxPPfFsqQqpzN+0UA==
ember-cli-page-object@^1.17.5:
version "1.17.5"
resolved "https://registry.npmjs.org/ember-cli-page-object/-/ember-cli-page-object-1.17.5.tgz#a6b555470cc36e40b622047c6bcf6319deb6ae07"
integrity sha512-1fW4TF4JmoNDtH3V5wuSbcvlFQtl15unGJdOUjbP3HMl/pPDqGeTo4o0Bnoj8LQwARua5A34T5FNWWbAN9YHfQ==
dependencies:
broccoli-file-creator "^2.1.1"
broccoli-merge-trees "^2.0.0"
ceibo "~2.0.0"
ember-cli-babel "^6.16.0"
ember-cli-node-assets "^0.2.2"
ember-native-dom-helpers "^0.5.3"
jquery "^3.2.1"
ember-native-dom-helpers "^0.7.0"
jquery "^3.4.1"
rsvp "^4.7.0"

ember-cli-path-utils@^1.0.0:
Expand Down Expand Up @@ -4497,28 +4496,10 @@ ember-math-helpers@~2.11.3:
ember-cli-babel "^7.7.3"
ember-cli-htmlbars "^3.0.1"

ember-maybe-import-regenerator@^0.1.6:
version "0.1.6"
resolved "https://registry.npmjs.org/ember-maybe-import-regenerator/-/ember-maybe-import-regenerator-0.1.6.tgz#35d41828afa6d6a59bc0da3ce47f34c573d776ca"
integrity sha1-NdQYKK+m1qWbwNo85H80xXPXdso=
dependencies:
broccoli-funnel "^1.0.1"
broccoli-merge-trees "^1.0.0"
ember-cli-babel "^6.0.0-beta.4"
regenerator-runtime "^0.9.5"

ember-native-dom-helpers@0.6.2:
version "0.6.2"
resolved "https://registry.npmjs.org/ember-native-dom-helpers/-/ember-native-dom-helpers-0.6.2.tgz#ad1f82d64ac9abdd612022f4f390bdb6653b3d39"
integrity sha512-J4SfukTITFFsCYbOxG/sjGBTcZVrxgbMyFKrrTcB2cKfrglyTZSwqs9jBUpF91FEwetzmYP02Nh9N4WzcJ8cRQ==
dependencies:
broccoli-funnel "^1.1.0"
ember-cli-babel "^6.6.0"

ember-native-dom-helpers@^0.5.3:
version "0.5.10"
resolved "https://registry.npmjs.org/ember-native-dom-helpers/-/ember-native-dom-helpers-0.5.10.tgz#9c7172e4ddfa5dd86830c46a936e2f8eca3e5896"
integrity sha512-bPJX49vlgnBGwFn/3WJPPJjjyd7/atvzW5j01u1dbyFf3bXvHg9Rs1qaZJdk8js0qZ1FINadIEC9vWtgN3w7tg==
ember-native-dom-helpers@^0.7.0:
version "0.7.0"
resolved "https://registry.npmjs.org/ember-native-dom-helpers/-/ember-native-dom-helpers-0.7.0.tgz#98a87c11a391cec5c12382a4857e59ea2fb4b00a"
integrity sha512-ySJRGRhwYIWUAZKilB8xEcIatP9wKfEBX6JFG8bG4Ck7GvA0eau265hTGZz/+ntZuwcY4HrzSNkwimlHx4cM/A==
dependencies:
broccoli-funnel "^1.1.0"
ember-cli-babel "^6.6.0"
Expand Down Expand Up @@ -7153,7 +7134,7 @@ jest-validate@^23.5.0:
leven "^2.1.0"
pretty-format "^23.6.0"

jquery@^3.2.1, jquery@^3.5.0:
jquery@^3.4.1, jquery@^3.5.0:
version "3.5.1"
resolved "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
Expand Down Expand Up @@ -9193,11 +9174,6 @@ regenerator-runtime@^0.13.4:
resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==

regenerator-runtime@^0.9.5:
version "0.9.6"
resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz#d33eb95d0d2001a4be39659707c51b0cb71ce029"
integrity sha1-0z65XQ0gAaS+OWWXB8UbDLcc4Ck=

regenerator-transform@^0.10.0:
version "0.10.1"
resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
Expand Down

0 comments on commit c878ff0

Please sign in to comment.