make it glimmer 2 compatible

miguelcobain · Oct 3, 2016 · 5f35cf5 · 5f35cf5
1 parent c3f2d79
commit 5f35cf5
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 273 deletions.
diff --git a/bower.json b/bower.json
@@ -1,12 +1,15 @@
 {
   "name": "ember-paper",
   "dependencies": {
-    "ember": "2.6.1",
+    "ember": "beta",
     "ember-cli-shims": "0.1.1",
     "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0",
     "hammer.js": "^2.0.8",
     "matchMedia": "0.2.0",
     "prism": "*"
+  },
+  "resolutions": {
+    "ember": "beta"
   }
 }
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-code-snippet": "1.3.0",
-    "ember-cp-validations": "2.6.1",
+    "ember-cp-validations": "3.0.1",
     "ember-data": "^2.6.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-disable-proxy-controllers": "^1.0.1",
@@ -50,7 +50,7 @@
     "ember-resolver": "^2.0.3",
     "ember-suave": "2.0.1",
     "ember-transition-helper": "0.0.6",
-    "liquid-fire": "0.23.1",
+    "liquid-fire": "0.26.1",
     "loader.js": "^4.0.1"
   },
   "dependencies": {
@@ -61,7 +61,7 @@
     "broccoli-merge-trees": "^1.1.0",
     "ember-cli-babel": "^5.1.6",
     "ember-css-transitions": "peec/ember-css-transitions#v0.1.4",
-    "ember-wormhole": "^0.4.0"
+    "ember-wormhole": "0.4.1"
   },
   "keywords": [
     "ember-addon",

diff --git a/tests/dummy/app/components/paper-api.js b/tests/dummy/app/components/paper-api.js
@@ -50,7 +50,7 @@ export default Component.extend({
     let shouldSort = this.get('sort');
 
     if (shouldSort) {
-      category = category.sort(function(a, b) {
+      category = category.slice().sort(function(a, b) {
         return a[0] < b[0]
                   ? -1
                   : a[0] > b[0] ? 1 : 0;

diff --git a/tests/dummy/app/controllers/demo/input.js b/tests/dummy/app/controllers/demo/input.js
@@ -34,6 +34,8 @@ export default Controller.extend({
   }],
   // END-SNIPPET
 
+  user: {},
+
   eventName: '',
   actions: {
     focusReceived() {

diff --git a/tests/integration/components/paper-dialog-test.js b/tests/integration/components/paper-dialog-test.js
@@ -26,9 +26,10 @@ test('should render empty dialog when blockless', function(assert) {
     {{paper-dialog}}
   `);
 
-  let dialogContent = this.$().find('md-dialog').html().trim();
+  let dialogContent = this.$().find('md-dialog').html()
+    .replace('<!--', '').replace('-->', '').trim();
 
-  assert.equal(dialogContent, '<!---->', 'has an empty dialog container');
+  assert.equal(dialogContent, '', 'has an empty dialog container');
 });
 
 test('should yield content as a block component', function(assert) {

diff --git a/tests/unit/components/base-focusable-test.js b/tests/unit/components/base-focusable-test.js
diff --git a/tests/unit/components/paper-autocomplete-highlight-test.js b/tests/unit/components/paper-autocomplete-highlight-test.js
diff --git a/tests/unit/components/paper-autocomplete-item-test.js b/tests/unit/components/paper-autocomplete-item-test.js
diff --git a/tests/unit/components/paper-autocomplete-list-test.js b/tests/unit/components/paper-autocomplete-list-test.js
diff --git a/tests/unit/components/paper-autocomplete-test.js b/tests/unit/components/paper-autocomplete-test.js
diff --git a/tests/unit/components/paper-content-test.js b/tests/unit/components/paper-content-test.js
diff --git a/tests/unit/components/paper-slider-test.js b/tests/unit/components/paper-slider-test.js