From 3c9d046a5bfa9820e25d733fb545e947c301408e Mon Sep 17 00:00:00 2001 From: Matthew Dahl Date: Sun, 5 Feb 2017 22:59:34 -0800 Subject: [PATCH] Upgrade to work with Ember 2.11 --- .travis.yml | 1 + addon/components/frost-list.js | 4 +-- app/components/frost-list-expansion.js | 2 +- app/components/frost-list-item.js | 2 +- app/components/frost-list-pagination.js | 2 +- app/components/frost-list.js | 2 +- app/helpers/floor.js | 2 +- app/helpers/is-lead-selection.js | 2 +- app/utils/selection.js | 2 +- bower.json | 7 +--- config/ember-try.js | 11 ++++++ index.js | 3 ++ package.json | 36 ++++++++----------- testem.js | 15 ++++++++ testem.json | 11 ------ tests/acceptance/frost-list-test.js | 11 +++--- tests/dummy/app/app.js | 8 +++-- tests/dummy/app/pods/infinite/controller.js | 13 ++++--- tests/dummy/app/pods/infinite/route.js | 3 +- tests/dummy/app/pods/paged/controller.js | 14 ++++---- tests/dummy/app/pods/paged/route.js | 3 +- tests/dummy/app/pods/simple/controller.js | 14 ++++---- tests/dummy/app/pods/simple/route.js | 3 +- tests/dummy/app/router.js | 4 ++- tests/dummy/app/scenarios/list-items.js | 6 ++-- tests/dummy/app/scenarios/main.js | 2 +- tests/dummy/config/environment.js | 6 ++++ tests/helpers/destroy-app.js | 3 +- tests/helpers/mock-component.js | 6 ++-- tests/helpers/module-for-acceptance.js | 2 +- tests/helpers/resolver.js | 2 +- tests/helpers/start-app.js | 8 +++-- tests/index.html | 1 - .../components/frost-list-core-test.js | 6 ++-- .../components/frost-list-expansion-test.js | 8 ++--- .../components/frost-list-item-test.js | 12 +++---- .../components/frost-list-pagination-test.js | 8 ++--- .../frost-list-selection-indicator-test.js | 4 +-- .../integration/components/frost-list-test.js | 12 +++---- tests/test-helper.js | 2 +- tests/unit/components/frost-list-core-test.js | 8 ++--- .../components/frost-list-expansion-test.js | 6 ++-- tests/unit/components/frost-list-item-test.js | 10 +++--- .../frost-list-selection-indicator-test.js | 2 +- tests/unit/components/frost-list-test.js | 16 +++++---- .../unit/components/frost-pagination-test.js | 16 ++++----- tests/unit/helpers/floor-test.js | 6 ++-- tests/unit/helpers/is-lead-selection.js | 8 ++--- tests/unit/utils/selection-test.js | 10 +++--- 49 files changed, 184 insertions(+), 161 deletions(-) create mode 100644 testem.js delete mode 100644 testem.json diff --git a/.travis.yml b/.travis.yml index 5d909b2..f77aba4 100644 --- a/.travis.yml +++ b/.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 diff --git a/addon/components/frost-list.js b/addon/components/frost-list.js index 35adfb2..44c507b 100644 --- a/addon/components/frost-list.js +++ b/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 { diff --git a/app/components/frost-list-expansion.js b/app/components/frost-list-expansion.js index cdbe354..79ee741 100644 --- a/app/components/frost-list-expansion.js +++ b/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' diff --git a/app/components/frost-list-item.js b/app/components/frost-list-item.js index 99c5235..b7940bc 100644 --- a/app/components/frost-list-item.js +++ b/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' diff --git a/app/components/frost-list-pagination.js b/app/components/frost-list-pagination.js index af83b26..f2b97ba 100644 --- a/app/components/frost-list-pagination.js +++ b/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' diff --git a/app/components/frost-list.js b/app/components/frost-list.js index b5c6e15..91aff3f 100644 --- a/app/components/frost-list.js +++ b/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' diff --git a/app/helpers/floor.js b/app/helpers/floor.js index 8b813e0..2d31742 100644 --- a/app/helpers/floor.js +++ b/app/helpers/floor.js @@ -1 +1 @@ -export { default, floor } from 'ember-frost-list/helpers/floor' +export {default, floor} from 'ember-frost-list/helpers/floor' diff --git a/app/helpers/is-lead-selection.js b/app/helpers/is-lead-selection.js index 9c092d7..f4de59e 100644 --- a/app/helpers/is-lead-selection.js +++ b/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' diff --git a/app/utils/selection.js b/app/utils/selection.js index 2aa11da..da3ef50 100644 --- a/app/utils/selection.js +++ b/app/utils/selection.js @@ -1 +1 @@ -export { default } from 'ember-frost-list/utils/selection' +export {default} from 'ember-frost-list/utils/selection' diff --git a/bower.json b/bower.json index ed8b39d..377023e 100644 --- a/bower.json +++ b/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" } } diff --git a/config/ember-try.js b/config/ember-try.js index aa280e3..9e837f7 100644 --- a/config/ember-try.js +++ b/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: { diff --git a/index.js b/index.js index 8138b85..0e70202 100644 --- a/index.js +++ b/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 */ } } diff --git a/package.json b/package.json index 0e12125..44dcb27 100644 --- a/package.json +++ b/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" } -} \ No newline at end of file +} diff --git a/testem.js b/testem.js new file mode 100644 index 0000000..cfca56c --- /dev/null +++ b/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' +} diff --git a/testem.json b/testem.json deleted file mode 100644 index 8c6da40..0000000 --- a/testem.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "framework": "mocha", - "test_page": "tests/index.html?hidepassed&coverage", - "disable_watching": true, - "launch_in_ci": [ - "Chrome" - ], - "launch_in_dev": [ - "Chrome" - ] -} diff --git a/tests/acceptance/frost-list-test.js b/tests/acceptance/frost-list-test.js index 0314d5b..37c485f 100644 --- a/tests/acceptance/frost-list-test.js +++ b/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') diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js index 69c5af7..48900ad 100644 --- a/tests/dummy/app/app.js +++ b/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 diff --git a/tests/dummy/app/pods/infinite/controller.js b/tests/dummy/app/pods/infinite/controller.js index 11e10c4..3a0b641 100644 --- a/tests/dummy/app/pods/infinite/controller.js +++ b/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({ } } }) - diff --git a/tests/dummy/app/pods/infinite/route.js b/tests/dummy/app/pods/infinite/route.js index 7b7c87a..50b547e 100644 --- a/tests/dummy/app/pods/infinite/route.js +++ b/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) diff --git a/tests/dummy/app/pods/paged/controller.js b/tests/dummy/app/pods/paged/controller.js index a31edc1..3daa0d7 100644 --- a/tests/dummy/app/pods/paged/controller.js +++ b/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 diff --git a/tests/dummy/app/pods/paged/route.js b/tests/dummy/app/pods/paged/route.js index 7b7c87a..50b547e 100644 --- a/tests/dummy/app/pods/paged/route.js +++ b/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) diff --git a/tests/dummy/app/pods/simple/controller.js b/tests/dummy/app/pods/simple/controller.js index e4c4671..226b9ef 100644 --- a/tests/dummy/app/pods/simple/controller.js +++ b/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 =================================================== diff --git a/tests/dummy/app/pods/simple/route.js b/tests/dummy/app/pods/simple/route.js index ffece64..8472756 100644 --- a/tests/dummy/app/pods/simple/route.js +++ b/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') } diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js index 52d6e24..d1b2d60 100644 --- a/tests/dummy/app/router.js +++ b/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 }) diff --git a/tests/dummy/app/scenarios/list-items.js b/tests/dummy/app/scenarios/list-items.js index f7b67a8..3a79fca 100644 --- a/tests/dummy/app/scenarios/list-items.js +++ b/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) => { diff --git a/tests/dummy/app/scenarios/main.js b/tests/dummy/app/scenarios/main.js index ba6d0b7..35af909 100644 --- a/tests/dummy/app/scenarios/main.js +++ b/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({ diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index 44b2e9f..33d4b45 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -17,6 +17,12 @@ module.exports = function (environment) { APP: { // Here you can pass flags/options to your application instance // when it is created + }, + + 'ember-prop-types': { + spreadProperty: 'options', + throwErrors: true, + validateOnUpdate: true } } diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js index cbef9c4..d153ce8 100644 --- a/tests/helpers/destroy-app.js +++ b/tests/helpers/destroy-app.js @@ -1,5 +1,6 @@ import Ember from 'ember' +const {run} = Ember export default function destroyApp (application) { - Ember.run(application, 'destroy') + run(application, 'destroy') } diff --git a/tests/helpers/mock-component.js b/tests/helpers/mock-component.js index e5ce3cf..76f3638 100644 --- a/tests/helpers/mock-component.js +++ b/tests/helpers/mock-component.js @@ -1,11 +1,9 @@ import Ember from 'ember' -const { Component, getOwner } = Ember - -const assign = Ember.assign || Ember.merge +const {Component, getOwner, merge} = Ember export function registerMockComponent (context, name = 'mock-component', opts = {}) { const owner = getOwner(context) - const options = assign({ tagName: 'dummy' }, opts) + const options = merge({tagName: 'dummy'}, opts) const mockComponent = Component.extend(options) unregisterMockComponent(context) diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js index 34753ae..3dbbfb9 100644 --- a/tests/helpers/module-for-acceptance.js +++ b/tests/helpers/module-for-acceptance.js @@ -2,8 +2,8 @@ import { module } from 'qunit' -import startApp from '../helpers/start-app' import destroyApp from '../helpers/destroy-app' +import startApp from '../helpers/start-app' export default function (name, options = {}) { module(name, { diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js index 614c345..5b6b5e8 100644 --- a/tests/helpers/resolver.js +++ b/tests/helpers/resolver.js @@ -1,5 +1,5 @@ -import Resolver from '../../resolver' import config from '../../config/environment' +import Resolver from '../../resolver' const resolver = Resolver.create() diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js index b310225..5f32945 100644 --- a/tests/helpers/start-app.js +++ b/tests/helpers/start-app.js @@ -1,14 +1,16 @@ import Ember from 'ember' +const {merge, run} = Ember + import Application from '../../app' import config from '../../config/environment' export default function startApp (attrs) { let application - let attributes = Ember.merge({}, config.APP) - attributes = Ember.merge(attributes, attrs) // use defaults, but you can override; + let attributes = merge({}, config.APP) + attributes = merge(attributes, attrs) // use defaults, but you can override; - Ember.run(() => { + run(() => { application = Application.create(attributes) application.setupForTesting() application.injectTestHelpers() diff --git a/tests/index.html b/tests/index.html index 4979aa5..6f1b6a7 100644 --- a/tests/index.html +++ b/tests/index.html @@ -26,7 +26,6 @@ - {{content-for 'body-footer'}} {{content-for 'test-body-footer'}} diff --git a/tests/integration/components/frost-list-core-test.js b/tests/integration/components/frost-list-core-test.js index 2e67071..396e5d3 100644 --- a/tests/integration/components/frost-list-core-test.js +++ b/tests/integration/components/frost-list-core-test.js @@ -1,7 +1,7 @@ -import { expect } from 'chai' -import { describeComponent, it } from 'ember-mocha' +import {expect} from 'chai' +import {describeComponent, it} from 'ember-mocha' import hbs from 'htmlbars-inline-precompile' -import { registerMockComponent, unregisterMockComponent } from '../../helpers/mock-component' +import {registerMockComponent, unregisterMockComponent} from '../../helpers/mock-component' describeComponent( 'frost-list-core', diff --git a/tests/integration/components/frost-list-expansion-test.js b/tests/integration/components/frost-list-expansion-test.js index 7745884..e12cde4 100644 --- a/tests/integration/components/frost-list-expansion-test.js +++ b/tests/integration/components/frost-list-expansion-test.js @@ -1,8 +1,8 @@ -import { expect } from 'chai' -import { $hook, initialize as initializeHook } from 'ember-hook' -import { describeComponent, it } from 'ember-mocha' +import {expect} from 'chai' +import {$hook, initialize as initializeHook} from 'ember-hook' +import {describeComponent, it} from 'ember-mocha' import hbs from 'htmlbars-inline-precompile' -import { afterEach, beforeEach, describe } from 'mocha' +import {afterEach, beforeEach, describe} from 'mocha' import sinon from 'sinon' describeComponent( diff --git a/tests/integration/components/frost-list-item-test.js b/tests/integration/components/frost-list-item-test.js index 78bbe4a..dfbfce5 100644 --- a/tests/integration/components/frost-list-item-test.js +++ b/tests/integration/components/frost-list-item-test.js @@ -1,7 +1,7 @@ -import { expect } from 'chai' -import { describeComponent, it } from 'ember-mocha' -import { afterEach, beforeEach, describe } from 'mocha' +import {expect} from 'chai' +import {describeComponent, it} from 'ember-mocha' import hbs from 'htmlbars-inline-precompile' +import {afterEach, beforeEach, describe} from 'mocha' import sinon from 'sinon' describeComponent( @@ -42,7 +42,7 @@ describeComponent( }) it.skip('sets "is-selected" class when model.isSelected=true', function () { - this.set('model', { isSelected: true }) + this.set('model', {isSelected: true}) this.render(hbs` {{frost-list-item @@ -56,7 +56,7 @@ describeComponent( }) it.skip('sets "is-expanded" class when model.isSelected=true', function () { - this.set('model', { isExpanded: true }) + this.set('model', {isExpanded: true}) this.render(hbs` {{frost-list-item @@ -75,7 +75,7 @@ describeComponent( externalActionSpy = sandbox.spy() this.on('externalAction', externalActionSpy) - this.set('model', { isSelected: true }) + this.set('model', {isSelected: true}) this.render(hbs` {{frost-list-item diff --git a/tests/integration/components/frost-list-pagination-test.js b/tests/integration/components/frost-list-pagination-test.js index 40df893..37fe74c 100644 --- a/tests/integration/components/frost-list-pagination-test.js +++ b/tests/integration/components/frost-list-pagination-test.js @@ -1,8 +1,8 @@ -import { expect } from 'chai' -import { $hook, initialize as initializeHook } from 'ember-hook' -import { describeComponent, it } from 'ember-mocha' +import {expect} from 'chai' +import {$hook, initialize as initializeHook} from 'ember-hook' +import {describeComponent, it} from 'ember-mocha' import hbs from 'htmlbars-inline-precompile' -import { afterEach, beforeEach, describe } from 'mocha' +import {afterEach, beforeEach, describe} from 'mocha' import sinon from 'sinon' describeComponent( diff --git a/tests/integration/components/frost-list-selection-indicator-test.js b/tests/integration/components/frost-list-selection-indicator-test.js index d2fe268..af1f4b0 100644 --- a/tests/integration/components/frost-list-selection-indicator-test.js +++ b/tests/integration/components/frost-list-selection-indicator-test.js @@ -1,5 +1,5 @@ -import { expect } from 'chai' -import { describeComponent, it } from 'ember-mocha' +import {expect} from 'chai' +import {describeComponent, it} from 'ember-mocha' import hbs from 'htmlbars-inline-precompile' describeComponent( diff --git a/tests/integration/components/frost-list-test.js b/tests/integration/components/frost-list-test.js index 5c386b4..ba48744 100644 --- a/tests/integration/components/frost-list-test.js +++ b/tests/integration/components/frost-list-test.js @@ -1,13 +1,13 @@ +import {expect} from 'chai' +const {A} = Ember import Ember from 'ember' -const { A } = Ember -import { expect } from 'chai' -import { make, manualSetup } from 'ember-data-factory-guy' -import { describeComponent, it } +import {make, manualSetup} from 'ember-data-factory-guy' +import {$hook, initialize as initializeHook} from 'ember-hook' +import {describeComponent, it} from 'ember-mocha' import wait from 'ember-test-helpers/wait' import hbs from 'htmlbars-inline-precompile' -import { beforeEach, describe } from 'mocha' -import { $hook, initialize as initializeHook } from 'ember-hook' +import {beforeEach, describe} from 'mocha' describeComponent( 'frost-list', diff --git a/tests/test-helper.js b/tests/test-helper.js index 110ae91..7494206 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -1,4 +1,4 @@ import resolver from './helpers/resolver' -import { setResolver } from 'ember-mocha' +import {setResolver} from 'ember-mocha' setResolver(resolver) diff --git a/tests/unit/components/frost-list-core-test.js b/tests/unit/components/frost-list-core-test.js index 1859979..7f77a08 100644 --- a/tests/unit/components/frost-list-core-test.js +++ b/tests/unit/components/frost-list-core-test.js @@ -1,9 +1,9 @@ -import { expect } from 'chai' +import {expect} from 'chai' import Ember from 'ember' -const { A } = Ember -import { describeComponent } from 'ember-mocha' +const {A} = Ember +import {describeComponent} from 'ember-mocha' import PropTypeMixin from 'ember-prop-types' -import { afterEach, beforeEach, describe, it } from 'mocha' +import {afterEach, beforeEach, describe, it} from 'mocha' import sinon from 'sinon' describeComponent( diff --git a/tests/unit/components/frost-list-expansion-test.js b/tests/unit/components/frost-list-expansion-test.js index 26dc753..344fd10 100644 --- a/tests/unit/components/frost-list-expansion-test.js +++ b/tests/unit/components/frost-list-expansion-test.js @@ -1,6 +1,6 @@ -import { expect } from 'chai' -import { describeComponent } from 'ember-mocha' -import { beforeEach, it } from 'mocha' +import {expect} from 'chai' +import {describeComponent} from 'ember-mocha' +import {beforeEach, it} from 'mocha' describeComponent( 'frost-list-expansion', diff --git a/tests/unit/components/frost-list-item-test.js b/tests/unit/components/frost-list-item-test.js index 63a2695..403048b 100644 --- a/tests/unit/components/frost-list-item-test.js +++ b/tests/unit/components/frost-list-item-test.js @@ -1,6 +1,6 @@ -import { expect } from 'chai' -import { describeComponent } from 'ember-mocha' -import { beforeEach, describe, it } from 'mocha' +import {expect} from 'chai' +import {describeComponent} from 'ember-mocha' +import {beforeEach, describe, it} from 'mocha' describeComponent( 'frost-list-item', @@ -44,7 +44,7 @@ describeComponent( }) it.skip('"isExpanded" computed property', function () { - component.set('model', { isExpanded: true }) + component.set('model', {isExpanded: true}) expect( component.get('isExpanded') @@ -52,7 +52,7 @@ describeComponent( }) it.skip('"isSelected" computed property', function () { - component.set('model', { isSelected: true }) + component.set('model', {isSelected: true}) expect( component.get('isSelected') diff --git a/tests/unit/components/frost-list-selection-indicator-test.js b/tests/unit/components/frost-list-selection-indicator-test.js index c52472f..20de57c 100644 --- a/tests/unit/components/frost-list-selection-indicator-test.js +++ b/tests/unit/components/frost-list-selection-indicator-test.js @@ -1,6 +1,6 @@ import {expect} from 'chai' import {describeComponent} from 'ember-mocha' -import { beforeEach, it } from 'mocha' +import {beforeEach, it} from 'mocha' describeComponent( 'frost-list-selection-indicator', diff --git a/tests/unit/components/frost-list-test.js b/tests/unit/components/frost-list-test.js index 62b56df..bae2f07 100644 --- a/tests/unit/components/frost-list-test.js +++ b/tests/unit/components/frost-list-test.js @@ -1,8 +1,10 @@ -import { expect } from 'chai' +import {expect} from 'chai' import Ember from 'ember' -import { describeComponent } from 'ember-mocha' +const {Logger} = Ember + +import {describeComponent} from 'ember-mocha' import PropTypeMixin from 'ember-prop-types' -import { afterEach, beforeEach, describe, it } from 'mocha' +import {afterEach, beforeEach, describe, it} from 'mocha' import sinon from 'sinon' describeComponent( @@ -37,7 +39,7 @@ describeComponent( describe.skip('InitContext()', function () { it('errors when config is set with item', function () { - const EmberLoggerSpy = sandbox.spy(Ember.Logger, 'error') + const EmberLoggerSpy = sandbox.spy(Logger, 'error') component.setProperties( { @@ -53,7 +55,7 @@ describeComponent( }) it('errors when config is set with expansion', function () { - const EmberLoggerSpy = sandbox.spy(Ember.Logger, 'error') + const EmberLoggerSpy = sandbox.spy(Logger, 'error') component.setProperties( { @@ -69,7 +71,7 @@ describeComponent( }) it('errors when config is set with sorting', function () { - const EmberLoggerSpy = sandbox.spy(Ember.Logger, 'error') + const EmberLoggerSpy = sandbox.spy(Logger, 'error') component.setProperties( { @@ -85,7 +87,7 @@ describeComponent( }) it('does not error when config is set by itself', function () { - const EmberLoggerSpy = sandbox.spy(Ember.Logger, 'error') + const EmberLoggerSpy = sandbox.spy(Logger, 'error') component.set('config', {}) component.initContext() diff --git a/tests/unit/components/frost-pagination-test.js b/tests/unit/components/frost-pagination-test.js index fc9c92a..92f4208 100644 --- a/tests/unit/components/frost-pagination-test.js +++ b/tests/unit/components/frost-pagination-test.js @@ -1,7 +1,7 @@ -import { expect } from 'chai' -import { describeComponent } from 'ember-mocha' +import {expect} from 'chai' +import {describeComponent} from 'ember-mocha' import PropTypeMixin from 'ember-prop-types' -import { beforeEach, describe, it } from 'mocha' +import {beforeEach, describe, it} from 'mocha' describeComponent( 'frost-pagination', @@ -57,31 +57,31 @@ describeComponent( ] }) - it.skip('sets correct dependent keys for _end computed property', function () { + it('sets correct dependent keys for _end computed property', function () { expect( component._end._dependentKeys ).to.eql(_endDependentKeys) }) - it.skip('sets correct dependent keys for _isLeftDisabled computed property', function () { + it('sets correct dependent keys for _isLeftDisabled computed property', function () { expect( component._isLeftDisabled._dependentKeys ).to.eql(_isLeftDisabledDependentKeys) }) - it.skip('sets correct dependent keys for _isRightDisabled computed property', function () { + it('sets correct dependent keys for _isRightDisabled computed property', function () { expect( component._isRightDisabled._dependentKeys ).to.eql(_isRightDisabledDependentKeys) }) - it.skip('sets correct dependent keys for _offset computed property', function () { + it('sets correct dependent keys for _offset computed property', function () { expect( component._offset._dependentKeys ).to.eql(_offsetDependentKeys) }) - it.skip('sets correct dependent keys for _paginationText computed property', function () { + it('sets correct dependent keys for _paginationText computed property', function () { expect( component._paginationText._dependentKeys ).to.eql(_paginationTextDependentKeys) diff --git a/tests/unit/helpers/floor-test.js b/tests/unit/helpers/floor-test.js index 88806cf..6ed156c 100644 --- a/tests/unit/helpers/floor-test.js +++ b/tests/unit/helpers/floor-test.js @@ -1,6 +1,6 @@ -import { expect } from 'chai' -import { describe, it } from 'mocha' -import { floor } from 'ember-frost-list/helpers/floor' +import {expect} from 'chai' +import {floor} from 'ember-frost-list/helpers/floor' +import {describe, it} from 'mocha' describe.skip('FloorHelper', function () { it('works for positive numbers', function () { diff --git a/tests/unit/helpers/is-lead-selection.js b/tests/unit/helpers/is-lead-selection.js index fa159a6..65da6e7 100644 --- a/tests/unit/helpers/is-lead-selection.js +++ b/tests/unit/helpers/is-lead-selection.js @@ -1,12 +1,12 @@ /* jshint expr:true */ -import { expect } from 'chai' +import {expect} from 'chai' +import { + floor +} from 'ember-frost-list/helpers/is-lead-selection' import { describe, it } from 'mocha' -import { - floor -} from 'ember-frost-list/helpers/is-lead-selection' describe.skip('FloorHelper', function () { // Replace this with your real tests. diff --git a/tests/unit/utils/selection-test.js b/tests/unit/utils/selection-test.js index 15998e4..e5d656a 100644 --- a/tests/unit/utils/selection-test.js +++ b/tests/unit/utils/selection-test.js @@ -1,11 +1,11 @@ -import { expect } from 'chai' -import { describe, it } from 'mocha' +import {expect} from 'chai' import selection from 'ember-frost-list/utils/selection' +import {describe, it} from 'mocha' -describe.skip('Unit | Utility | selection', function () { +describe('Unit | Utility | selection', function () { // Replace this with your real tests. - it('works', function () { + it.skip('works', function () { let result = selection() - expect(result).to.be.ok + expect(result).not.to.equal(undefined) }) })