Merge pull request #98 from sandersky/master

Upgrade to work with Ember 2.11

.travis.yml

@@ -17,6 +17,7 @@ addons:
     - g++-4.8
 env:
   matrix:
+  - EMBER_TRY_SCENARIO=ember-2-3
   - EMBER_TRY_SCENARIO=ember-2-8
   - EMBER_TRY_SCENARIO=default
   - EMBER_TRY_SCENARIO=ember-release

addon/components/frost-list.js

@@ -3,7 +3,7 @@
  */
 
 import Ember from 'ember'
-const {$, isEmpty, set} = Ember
+const {$, A, isEmpty, set} = Ember
 import computed, {readOnly} from 'ember-computed-decorators'
 import {Component} from 'ember-frost-core'
 import {selection} from 'ember-frost-list'
@@ -145,7 +145,7 @@ export default Component.extend({
     },
 
     _expand (item) {
-      const clonedExpandedItems = this.get('expandedItems').slice()
+      const clonedExpandedItems = A(this.get('expandedItems').slice())
       if (clonedExpandedItems.indexOf(item) >= 0) {
         clonedExpandedItems.removeObject(item)
       } else {

app/components/frost-list-expansion.js

@@ -1 +1 @@
-export { default } from 'ember-frost-list/components/frost-list-expansion'
+export {default} from 'ember-frost-list/components/frost-list-expansion'

app/components/frost-list-item.js

@@ -1 +1 @@
-export { default } from 'ember-frost-list/components/frost-list-item'
+export {default} from 'ember-frost-list/components/frost-list-item'

app/components/frost-list-pagination.js

@@ -1 +1 @@
-export { default } from 'ember-frost-list/components/frost-list-pagination'
+export {default} from 'ember-frost-list/components/frost-list-pagination'

app/components/frost-list.js

@@ -1 +1 @@
-export { default } from 'ember-frost-list/components/frost-list'
+export {default} from 'ember-frost-list/components/frost-list'

app/helpers/floor.js

@@ -1 +1 @@
-export { default, floor } from 'ember-frost-list/helpers/floor'
+export {default, floor} from 'ember-frost-list/helpers/floor'

app/helpers/is-lead-selection.js

@@ -1 +1 @@
-export { default, isLeadSelection } from 'ember-frost-list/helpers/is-lead-selection'
+export {default, isLeadSelection} from 'ember-frost-list/helpers/is-lead-selection'

app/utils/selection.js

@@ -1 +1 @@
-export { default } from 'ember-frost-list/utils/selection'
+export {default} from 'ember-frost-list/utils/selection'

bower.json

@@ -1,17 +1,12 @@
 {
   "name": "ember-frost-list",
   "dependencies": {
-    "ember": "~2.8.0",
+    "ember": "^2.11.0",
     "ember-cli-shims": "0.1.0",
-    "ember-mocha": "~0.8.11",
     "Faker": "^3.1.0",
     "animation-frame": "~0.2.4",
-    "perfect-scrollbar": "~0.6.0",
     "jquery-mockjax": "2.2.1",
     "node-uuid": "1.4.7",
     "ember-mocha-adapter": "~0.3.1"
-  },
-  "resolutions": {
-    "ember": "~2.8.0"
   }
 }

config/ember-try.js

@@ -6,6 +6,17 @@ module.exports = {
         dependencies: { }
       }
     },
+    {
+      name: 'ember-2-3',
+      bower: {
+        dependencies: {
+          'ember': '~2.3.0'
+        },
+        resolutions: {
+          'ember': '~2.3.0'
+        }
+      }
+    },
     {
       name: 'ember-2-8',
       bower: {

index.js

@@ -29,6 +29,9 @@ module.exports = {
     if (this.options.babel.optional.indexOf('es7.decorators') === -1) {
       this.options.babel.optional.push('es7.decorators')
     }
+
+    /* eslint-disable no-unused-expressions */
     this._super.init && this._super.init.apply(this, arguments)
+    /* eslint-enable no-unused-expressions */
   }
 }

package.json

@@ -33,50 +33,44 @@
     "broccoli-asset-rev": "^2.2.0",
     "chai-jquery": "^2.0.0",
     "ember-async-image": "0.1.1",
-    "ember-browserify": "1.1.13",
-    "ember-cli": "~2.8.0",
+    "ember-cli": "^2.11.0",
     "ember-cli-app-version": "^2.0.0",
     "ember-cli-chai": "0.3.2",
     "ember-cli-code-coverage": "0.3.5",
     "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-htmlbars-inline-precompile": "0.3.6",
     "ember-cli-inject-live-reload": "^1.3.1",
-    "ember-cli-mocha": "0.13.1",
+    "ember-cli-mocha": "0.13.2",
     "ember-cli-notifications": "^4.0.1",
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-code-snippet": "1.8.0",
-    "ember-computed-decorators": "0.2.2",
-    "ember-concurrency": "0.7.17",
-    "ember-data": "~2.8.0",
+    "ember-computed-decorators": "0.3.0",
+    "ember-concurrency": "0.7.19",
+    "ember-data": "^2.11.1",
     "ember-data-factory-guy": "git://github.com/juwara0/ember-data-factory-guy#removeOnlyDev",
+    "ember-disable-prototype-extensions": "^1.1.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-elsewhere": "0.4.1",
     "ember-export-application-global": "^1.0.4",
     "ember-frost-core": "^1.5.1",
     "ember-frost-sort": "^7.0.0",
     "ember-frost-test": "1.0.1",
-    "ember-get-config": "0.1.11",
-    "ember-hash-helper-polyfill": "0.1.1",
+    "ember-get-config": "0.2.1",
+    "ember-hash-helper-polyfill": "0.1.2",
     "ember-hook": "1.4.1",
-    "ember-load-initializers": "0.5.1",
-    "ember-lodash-shim": "1.0.1",
-    "ember-math-helpers": "1.4.0",
-    "ember-one-way-controls": "1.1.1",
-    "ember-prop-types": "3.9.0",
-    "ember-redux": "1.8.0",
+    "ember-load-initializers": "0.6.3",
+    "ember-math-helpers": "^2.0.5",
+    "ember-prop-types": "^3.10.3",
     "ember-resolver": "^2.0.3",
     "ember-simple-uuid": "0.1.4",
     "ember-sinon": "0.6.0",
-    "ember-spread": "1.0.0",
-    "ember-test-utils": "1.5.1",
+    "ember-spread": "^1.1.2",
+    "ember-test-utils": "^1.8.0",
     "ember-truth-helpers": "1.3.0",
     "eslint": "^3.4.0",
-    "eslint-config-frost-standard": "^4.0.0",
+    "eslint-config-frost-standard": "^5.3.2",
     "loader.js": "^4.0.0",
-    "lodash-es": "4.16.6",
-    "redux": "3.6.0",
-    "redux-thunk": "2.1.0",
     "sass-lint": "^1.10.2",
     "sinon-chai": "^2.8.0",
     "smoke-and-mirrors": "~0.6.2"
@@ -97,4 +91,4 @@
   "ember-frost-icon-pack": {
     "name": "frost-list"
   }
-}
+}

testem.js

@@ -0,0 +1,15 @@
+var Reporter = require('ember-test-utils/reporter')
+
+module.exports = {
+  disable_watching: true,
+  framework: 'mocha',
+  launch_in_ci: [
+    'Chrome',
+    'Firefox'
+  ],
+  launch_in_dev: [
+    'Chrome'
+  ],
+  reporter: new Reporter(),
+  test_page: 'tests/index.html?hidepassed'
+}

tests/acceptance/frost-list-test.js

@@ -1,9 +1,10 @@
-import { describe, it, beforeEach, afterEach } from 'mocha'
 import {expect} from 'chai'
-import { buildList, mockQuery, mockSetup, mockTeardown } from 'ember-data-factory-guy'
-import startApp from '../helpers/start-app'
+import {buildList, mockQuery, mockSetup, mockTeardown} from 'ember-data-factory-guy'
+import {$hook, hook} from 'ember-hook'
+import {afterEach, beforeEach, describe, it} from 'mocha'
+
 import destroyApp from '../helpers/destroy-app'
-import { hook, $hook } from 'ember-hook'
+import startApp from '../helpers/start-app'
 
 describe.skip('Acceptance: FrostList', function () {
   let application
@@ -22,7 +23,7 @@ describe.skip('Acceptance: FrostList', function () {
 
   it('can expand and collapse rows', function () {
     let queryBinding = buildList('list-item', 20)
-    mockQuery('list-item', {pageSize: 20, start: 0}).returns({ json: queryBinding })
+    mockQuery('list-item', {pageSize: 20, start: 0}).returns({json: queryBinding})
 
     visit('/qp-binding')
 

tests/dummy/app/app.js

@@ -1,13 +1,15 @@
 import Ember from 'ember'
-import Resolver from './resolver'
-import loadInitializers from 'ember-load-initializers'
+const {Application} = Ember
+
 import config from './config/environment'
+import loadInitializers from 'ember-load-initializers'
+import Resolver from './resolver'
 
 let App
 
 Ember.MODEL_FACTORY_INJECTIONS = true
 
-App = Ember.Application.extend({
+App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

tests/dummy/app/pods/infinite/controller.js

@@ -3,7 +3,7 @@
  */
 
 import Ember from 'ember'
-const {Controller, isEmpty, inject} = Ember
+const {A, Controller, inject, isEmpty} = Ember
 import computed, {readOnly} from 'ember-computed-decorators'
 import {sort} from 'ember-frost-sort'
 
@@ -15,14 +15,14 @@ export default Controller.extend({
 
   // == Properties ============================================================
 
-  expandedItems: [],
+  expandedItems: A([]),
   itemsPerPage: 100,
   lastPage: 0,
-  selectedItems: [],
-  sortOrder: ['id'],
+  selectedItems: A([]),
+  sortOrder: A(['id']),
   sortingProperties: [
-    { label: 'Id', value: 'id' },
-    { label: 'Label', value: 'label' }
+    {label: 'Id', value: 'id'},
+    {label: 'Label', value: 'label'}
   ],
 
   // == Computed Properties ===================================================
@@ -74,4 +74,3 @@ export default Controller.extend({
     }
   }
 })
-

tests/dummy/app/pods/infinite/route.js

@@ -1,6 +1,7 @@
 import Ember from 'ember'
+const {Route} = Ember
 
-export default Ember.Route.extend({
+export default Route.extend({
   setupController (controller, model) {
     this._super(controller, model)
     controller.fetchPage(0)

tests/dummy/app/pods/paged/controller.js

@@ -3,25 +3,25 @@
  */
 
 import Ember from 'ember'
-const {isEmpty} = Ember
+const {A, Controller, isEmpty} = Ember
 import computed, {readOnly} from 'ember-computed-decorators'
 import {sort} from 'ember-frost-sort'
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 
   // == Dependencies ==========================================================
 
   // == Properties ============================================================
 
-  expandedItems: [],
+  expandedItems: A([]),
   itemsPerPage: 10,
   page: 0,
   scrollTop: 0,
-  selectedItems: [],
-  sortOrder: ['id'],
+  selectedItems: A([]),
+  sortOrder: A(['id']),
   sortingProperties: [
-    { label: 'Id', value: 'id' },
-    { label: 'Label', value: 'label' }
+    {label: 'Id', value: 'id'},
+    {label: 'Label', value: 'label'}
   ],
   totalItems: 100, // Typically extracted from meta on the request
 

tests/dummy/app/pods/paged/route.js

@@ -1,6 +1,7 @@
 import Ember from 'ember'
+const {Route} = Ember
 
-export default Ember.Route.extend({
+export default Route.extend({
   setupController (controller, model) {
     this._super(controller, model)
     controller.fetchPage(0)

tests/dummy/app/pods/simple/controller.js

@@ -3,22 +3,22 @@
  */
 
 import Ember from 'ember'
-const {isEmpty} = Ember
+const {A, Controller, isEmpty} = Ember
 import computed, {readOnly} from 'ember-computed-decorators'
 import {sort} from 'ember-frost-sort'
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 
   // == Dependencies ==========================================================
 
   // == Properties ============================================================
 
-  expandedItems: [],
-  selectedItems: [],
-  sortOrder: ['-id'],
+  expandedItems: A([]),
+  selectedItems: A([]),
+  sortOrder: A(['-id']),
   sortingProperties: [
-    { label: 'Id', value: 'id' },
-    { label: 'Label', value: 'label' }
+    {label: 'Id', value: 'id'},
+    {label: 'Label', value: 'label'}
   ],
 
   // == Computed Properties ===================================================

tests/dummy/app/pods/simple/route.js

@@ -1,6 +1,7 @@
 import Ember from 'ember'
+const {Route} = Ember
 
-export default Ember.Route.extend({
+export default Route.extend({
   model () {
     return this.store.findAll('list-item')
   }

tests/dummy/app/router.js

@@ -1,7 +1,9 @@
 import Ember from 'ember'
+const {Router: EmberRouter} = Ember
+
 import config from './config/environment'
 
-const Router = Ember.Router.extend({
+const Router = EmberRouter.extend({
   location: config.locationType,
   rootURL: config.rootURL
 })

tests/dummy/app/scenarios/list-items.js

@@ -1,4 +1,4 @@
-import { Scenario } from 'ember-data-factory-guy'
+import {Scenario} from 'ember-data-factory-guy'
 
 export default class extends Scenario {
   run () {
@@ -7,8 +7,8 @@ export default class extends Scenario {
     // Infinite Scroll
     const infinite1 = this.buildList('list-item', 100)
     const infinite2 = this.buildList('list-item', 100)
-    this.mockQuery('list-item', {pageSize: 100, start: 0}).returns({ json: infinite1 })
-    this.mockQuery('list-item', {pageSize: 100, start: 100}).returns({ json: infinite2 })
+    this.mockQuery('list-item', {pageSize: 100, start: 0}).returns({json: infinite1})
+    this.mockQuery('list-item', {pageSize: 100, start: 100}).returns({json: infinite2})
 
     // Pagination
     Array.from(Array(10).keys()).forEach((page) => {

tests/dummy/app/scenarios/main.js

@@ -1,4 +1,4 @@
-import { Scenario } from 'ember-data-factory-guy'
+import {Scenario} from 'ember-data-factory-guy'
 import ListItems from './list-items'
 
 Scenario.settings({