Skip to content

Commit bb9912c

Browse files
mixonicRobbieTheWagner
authored andcommitted
Bump Ember Table to 2.2.2 (#1131)
* Bump Ember Table to 2.2.2 * await ember-table rendering before asserting DOM Co-authored-by: Robert Wagner <rwwagner90@gmail.com> (cherry picked from commit 14584c7)
1 parent 807704f commit bb9912c

3 files changed

Lines changed: 38 additions & 86 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"ember-source": "~3.14.2",
8585
"ember-source-channel-url": "^2.0.1",
8686
"ember-svg-jar": "^2.2.2",
87-
"ember-table": "^2.1.3",
87+
"ember-table": "^2.2.2",
8888
"ember-template-lint": "^1.5.0",
8989
"ember-test-selectors": "^2.1.0",
9090
"ember-truth-helpers": "^2.1.0",

tests/acceptance/data-test.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ module('Data Tab', function(outer) {
9292
}]
9393
});
9494

95+
// ember-table doesn't render synchronously, await
96+
await settled();
97+
9598
assert.dom(findAll('.js-model-type-name')[0]).hasText('App.Comment');
9699
assert.dom(findAll('.js-model-type-name')[1]).hasText('App.Post');
97100

@@ -136,6 +139,9 @@ module('Data Tab', function(outer) {
136139
}]
137140
});
138141

142+
// ember-table doesn't render synchronously, await
143+
await settled();
144+
139145
assert.dom('.js-model-type').exists({ count: 3 }, 'All models are present');
140146

141147
assert.dom(findAll('.js-model-type-name')[0]).hasText('App.Author');
@@ -284,7 +290,7 @@ module('Data Tab', function(outer) {
284290
})]
285291
});
286292

287-
// Why is this needed?
293+
// ember-table doesn't render synchronously, await
288294
await settled();
289295

290296
recordRows = findAll('[data-test-table-row]');
@@ -318,6 +324,9 @@ module('Data Tab', function(outer) {
318324
})]
319325
});
320326

327+
// ember-table doesn't render synchronously, await
328+
await settled();
329+
321330
recordRows = findAll('[data-test-table-row]');
322331
assert.equal(recordRows.length, 3);
323332

@@ -354,7 +363,7 @@ module('Data Tab', function(outer) {
354363
count: 1
355364
});
356365

357-
// Why is this needed?
366+
// ember-table doesn't render synchronously, await
358367
await settled();
359368

360369
recordRows = findAll('[data-test-table-row]');

yarn.lock

Lines changed: 26 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,16 +1424,6 @@
14241424
resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843"
14251425
integrity sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==
14261426

1427-
"@ember-decorators/babel-transforms@^0.1.1":
1428-
version "0.1.1"
1429-
resolved "https://registry.yarnpkg.com/@ember-decorators/babel-transforms/-/babel-transforms-0.1.1.tgz#c2be1677192e55ccfeb806002d57e314a0e728bc"
1430-
integrity sha512-keP1XFzcMPidlrab4Gn+zJA+9yxpvwcLEqQX2InXRIXBgaHdBYoObI01R+6zLU6iTqTnR8WZqcTEn7EmiMiF5A==
1431-
dependencies:
1432-
babel-plugin-transform-class-properties "^6.24.1"
1433-
babel-plugin-transform-decorators-legacy "^1.3.4"
1434-
ember-cli-babel "^6.6.0"
1435-
ember-cli-version-checker "^2.1.0"
1436-
14371427
"@ember/edition-utils@^1.1.1":
14381428
version "1.1.1"
14391429
resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.1.1.tgz#d5732c3da593f202e6e1ac6dbee56a758242403f"
@@ -2828,16 +2818,6 @@ babel-plugin-syntax-async-functions@^6.8.0:
28282818
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
28292819
integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=
28302820

2831-
babel-plugin-syntax-class-properties@^6.8.0:
2832-
version "6.13.0"
2833-
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
2834-
integrity sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=
2835-
2836-
babel-plugin-syntax-decorators@^6.1.18:
2837-
version "6.13.0"
2838-
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
2839-
integrity sha1-MSVjtNvePMgGzuPkFszurd0RrAs=
2840-
28412821
babel-plugin-syntax-dynamic-import@^6.18.0:
28422822
version "6.18.0"
28432823
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
@@ -2862,25 +2842,6 @@ babel-plugin-transform-async-to-generator@^6.22.0, babel-plugin-transform-async-
28622842
babel-plugin-syntax-async-functions "^6.8.0"
28632843
babel-runtime "^6.22.0"
28642844

2865-
babel-plugin-transform-class-properties@^6.24.1:
2866-
version "6.24.1"
2867-
resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
2868-
integrity sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=
2869-
dependencies:
2870-
babel-helper-function-name "^6.24.1"
2871-
babel-plugin-syntax-class-properties "^6.8.0"
2872-
babel-runtime "^6.22.0"
2873-
babel-template "^6.24.1"
2874-
2875-
babel-plugin-transform-decorators-legacy@^1.3.4:
2876-
version "1.3.5"
2877-
resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.5.tgz#0e492dffa0edd70529072887f8aa86d4dd8b40a1"
2878-
integrity sha512-jYHwjzRXRelYQ1uGm353zNzf3QmtdCfvJbuYTZ4gKveK7M9H1fs3a5AKdY1JUDl0z97E30ukORW1dzhWvsabtA==
2879-
dependencies:
2880-
babel-plugin-syntax-decorators "^6.1.18"
2881-
babel-runtime "^6.2.0"
2882-
babel-template "^6.3.0"
2883-
28842845
babel-plugin-transform-es2015-arrow-functions@^6.22.0:
28852846
version "6.22.0"
28862847
resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
@@ -3153,15 +3114,15 @@ babel-register@^6.26.0:
31533114
mkdirp "^0.5.1"
31543115
source-map-support "^0.4.15"
31553116

3156-
babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
3117+
babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
31573118
version "6.26.0"
31583119
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
31593120
integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
31603121
dependencies:
31613122
core-js "^2.4.0"
31623123
regenerator-runtime "^0.11.0"
31633124

3164-
babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0:
3125+
babel-template@^6.24.1, babel-template@^6.26.0:
31653126
version "6.26.0"
31663127
resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
31673128
integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
@@ -4218,7 +4179,7 @@ browserify-zlib@^0.2.0:
42184179
dependencies:
42194180
pako "~1.0.5"
42204181

4221-
browserslist@^3.1.0, browserslist@^3.2.6:
4182+
browserslist@^3.2.6:
42224183
version "3.2.8"
42234184
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
42244185
integrity sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==
@@ -6014,14 +5975,14 @@ ember-auto-import@^1.5.2:
60145975
walk-sync "^0.3.3"
60155976
webpack "~4.28"
60165977

6017-
ember-classy-page-object@^0.5.0:
6018-
version "0.5.0"
6019-
resolved "https://registry.yarnpkg.com/ember-classy-page-object/-/ember-classy-page-object-0.5.0.tgz#42ffd395bb6045c1f3bd94d923e11f283d26d661"
6020-
integrity sha512-jIgUWHh9wMpYK+eZGtXpubTqACIicgB0XngGHkjmK9qVzc3XaUdV88J2Ia4/JhmIQmxUE/80iKm+G1MHEpSsqA==
5978+
ember-classy-page-object@^0.6.1:
5979+
version "0.6.1"
5980+
resolved "https://registry.yarnpkg.com/ember-classy-page-object/-/ember-classy-page-object-0.6.1.tgz#f170b2f69f646ab406ff982874a2ab926af9294a"
5981+
integrity sha512-huSjPp6PWN2yLSugnJq/ysde9apAGXCzcN+07WgqALQqy4FnPty6DeYjwRpy5LLKjtUS8YDENb+JcyCz9XlfcQ==
60215982
dependencies:
60225983
broccoli-funnel "^2.0.1"
60235984
ember-cli-babel "^6.6.0"
6024-
ember-cli-page-object "^1.15.0-beta.3"
5985+
ember-cli-page-object "^1.15.4"
60255986

60265987
ember-cli-app-version@^3.2.0:
60275988
version "3.2.0"
@@ -6036,7 +5997,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0:
60365997
resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.0.tgz#de3baedd093163b6c2461f95964888c1676325ac"
60375998
integrity sha512-Zr4my8Xn+CzO0gIuFNXji0eTRml5AxZUTDQz/wsNJ5AJAtyFWCY4QtKdoELNNbiCVGt1lq5yLiwTm4scGKu6xA==
60385999

6039-
ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.12.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.1, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2:
6000+
ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.12.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2:
60406001
version "6.18.0"
60416002
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
60426003
integrity sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==
@@ -6082,7 +6043,7 @@ ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.10.0, ember-c
60826043
ensure-posix-path "^1.0.2"
60836044
semver "^5.5.0"
60846045

6085-
ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2:
6046+
ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2:
60866047
version "7.13.2"
60876048
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.13.2.tgz#6b6f4d508cc3bb300c5711d3d02c59ba80f0f686"
60886049
integrity sha512-VH2tMXaRFkbQEyVJnxUtAyta5bAKjtcLwJ4lStW/iRk/NIlNFNJh1uOd7uL9H9Vm0f4/xR7Mc0Q7ND9ezKOo+A==
@@ -6274,17 +6235,17 @@ ember-cli-normalize-entity-name@^1.0.0:
62746235
dependencies:
62756236
silent-error "^1.0.0"
62766237

6277-
ember-cli-page-object@^1.15.0-beta.3:
6278-
version "1.15.3"
6279-
resolved "https://registry.yarnpkg.com/ember-cli-page-object/-/ember-cli-page-object-1.15.3.tgz#4b1814e270367a455353aeb81019fb8d8c641886"
6280-
integrity sha512-wGZqQnsyFHcJilf0xcWa53my/bprtZWHXg7m6wZPbWbnJCXNf1aAouj9uwH77r3PnE+/uYt0MIKMfX3Cnd607g==
6238+
ember-cli-page-object@^1.15.4:
6239+
version "1.16.1"
6240+
resolved "https://registry.yarnpkg.com/ember-cli-page-object/-/ember-cli-page-object-1.16.1.tgz#692af2ce98adb09d6b200e6d23c21c1e1edcd8a1"
6241+
integrity sha512-R2JOgR7JwIlVHS2I2VjgPI1Vn91Ct+YbkpIeb5dxOwemU494l65I4GzzZ/FsPh46ygcGgiWR4nFlcGSg7hFXXw==
62816242
dependencies:
62826243
broccoli-file-creator "^2.1.1"
62836244
broccoli-merge-trees "^2.0.0"
62846245
ceibo "~2.0.0"
62856246
ember-cli-babel "^6.16.0"
62866247
ember-cli-node-assets "^0.2.2"
6287-
ember-native-dom-helpers "^0.5.3"
6248+
ember-native-dom-helpers "^0.6.3"
62886249
jquery "^3.2.1"
62896250
rsvp "^4.7.0"
62906251

@@ -6649,14 +6610,6 @@ ember-getowner-polyfill@^2.0.1, ember-getowner-polyfill@^2.2.0:
66496610
ember-cli-version-checker "^2.1.0"
66506611
ember-factory-for-polyfill "^1.3.1"
66516612

6652-
ember-legacy-class-shim@^1.0.0:
6653-
version "1.0.5"
6654-
resolved "https://registry.yarnpkg.com/ember-legacy-class-shim/-/ember-legacy-class-shim-1.0.5.tgz#c40b66e12d56655a98f1bffe7f02dd7df0202daf"
6655-
integrity sha512-XoPCA//+c8khzG76C7Men9kQK3RbULnP3JWc7v8i9OJiVtWUvzH+qhYP2b9j588KvGMnvRbL40S5LNgvmNh11A==
6656-
dependencies:
6657-
browserslist "^3.1.0"
6658-
ember-cli-version-checker "^2.0.0"
6659-
66606613
ember-load-initializers@^2.1.0:
66616614
version "2.1.0"
66626615
resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-2.1.0.tgz#b402815ab9c823ff48a1369b52633721987e72d4"
@@ -6693,10 +6646,10 @@ ember-modifier-manager-polyfill@^1.1.0:
66936646
ember-cli-version-checker "^2.1.2"
66946647
ember-compatibility-helpers "^1.2.0"
66956648

6696-
ember-native-dom-helpers@^0.5.3:
6697-
version "0.5.10"
6698-
resolved "https://registry.yarnpkg.com/ember-native-dom-helpers/-/ember-native-dom-helpers-0.5.10.tgz#9c7172e4ddfa5dd86830c46a936e2f8eca3e5896"
6699-
integrity sha512-bPJX49vlgnBGwFn/3WJPPJjjyd7/atvzW5j01u1dbyFf3bXvHg9Rs1qaZJdk8js0qZ1FINadIEC9vWtgN3w7tg==
6649+
ember-native-dom-helpers@^0.6.3:
6650+
version "0.6.3"
6651+
resolved "https://registry.yarnpkg.com/ember-native-dom-helpers/-/ember-native-dom-helpers-0.6.3.tgz#31c88b6eb8e1bb99ee594d19de8f0270d1d5eb35"
6652+
integrity sha512-eQTHSV4OBS5YmGLvjgCcit79akG98YVRrcNq/rOVntPX1oq0LQqlPiXtDvDcqSdDur8GyUz6jY1Jy8Y6DLFiSw==
67006653
dependencies:
67016654
broccoli-funnel "^1.1.0"
67026655
ember-cli-babel "^6.6.0"
@@ -6811,28 +6764,26 @@ ember-svg-jar@^2.2.2:
68116764
mkdirp "^0.5.1"
68126765
path-posix "^1.0.0"
68136766

6814-
ember-table@^2.1.3:
6815-
version "2.1.3"
6816-
resolved "https://registry.yarnpkg.com/ember-table/-/ember-table-2.1.3.tgz#e89a7580f47d7e3791a68dc54634753e650ea5f9"
6817-
integrity sha512-wlvFoEpF2aVhWNpv/nAmPFyloMLw49MGs5rUgI9w5WGcesDusNMbnvggSvvqYZ/nz5JxMPiQwcO9dq3LDy+F/w==
6767+
ember-table@^2.2.2:
6768+
version "2.2.2"
6769+
resolved "https://registry.yarnpkg.com/ember-table/-/ember-table-2.2.2.tgz#1f1c0daf77521bd99f712f88f0185bc84c8db919"
6770+
integrity sha512-pSwbJIDnpiLm7yzObW8dIM2fOk5sfs0WTKxhoQxInqisaxtWLVs0iINX/Ks2n1HlCvsn84FgqOGU1R8GZAufEQ==
68186771
dependencies:
6819-
"@ember-decorators/babel-transforms" "^0.1.1"
68206772
"@html-next/vertical-collection" "^1.0.0-beta.14"
68216773
broccoli-string-replace "^0.1.2"
68226774
css-element-queries "^0.4.0"
68236775
ember-assign-polyfill "^2.2.0"
6824-
ember-classy-page-object "^0.5.0"
6825-
ember-cli-babel "^6.7.1"
6776+
ember-classy-page-object "^0.6.1"
6777+
ember-cli-babel "^7.12.0"
68266778
ember-cli-htmlbars "^3.0.1"
68276779
ember-cli-htmlbars-inline-precompile "^2.1.0"
68286780
ember-cli-node-assets "^0.2.2"
68296781
ember-cli-sass "^7.0.0"
68306782
ember-cli-version-checker "^3.0.1"
68316783
ember-compatibility-helpers "^1.2.0"
68326784
ember-getowner-polyfill "^2.2.0"
6833-
ember-legacy-class-shim "^1.0.0"
68346785
ember-raf-scheduler "^0.1.0"
6835-
ember-test-selectors "^0.3.9"
6786+
ember-test-selectors "^2.1.0"
68366787
ember-useragent "^0.6.0"
68376788
hammerjs "^2.0.8"
68386789

@@ -6848,14 +6799,6 @@ ember-template-lint@^1.1.0, ember-template-lint@^1.5.0:
68486799
resolve "^1.1.3"
68496800
strip-bom "^3.0.0"
68506801

6851-
ember-test-selectors@^0.3.9:
6852-
version "0.3.9"
6853-
resolved "https://registry.yarnpkg.com/ember-test-selectors/-/ember-test-selectors-0.3.9.tgz#dbe0a815cf04cad83c555f232cd69f50e95b342a"
6854-
integrity sha1-2+CoFc8Eytg8VV8jLNafUOlbNCo=
6855-
dependencies:
6856-
ember-cli-babel "^6.8.2"
6857-
ember-cli-version-checker "^2.0.0"
6858-
68596802
ember-test-selectors@^2.1.0:
68606803
version "2.1.0"
68616804
resolved "https://registry.yarnpkg.com/ember-test-selectors/-/ember-test-selectors-2.1.0.tgz#faebdf06702aaa0bc510d55eb721ce54d2e85793"

0 commit comments

Comments
 (0)