diff --git a/app/abilities/organization.js b/app/abilities/organization.js index 4abc448a4..7a546d414 100644 --- a/app/abilities/organization.js +++ b/app/abilities/organization.js @@ -1,13 +1,8 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import { get, computed } from '@ember/object'; +import { inject as service } from '@ember/service'; import { Ability } from 'ember-can'; -const { - computed, - computed: { alias }, - get, - inject: { service } -} = Ember; - export default Ability.extend({ currentUser: service(), diff --git a/app/abilities/project.js b/app/abilities/project.js index 8c5dc689c..99575287b 100644 --- a/app/abilities/project.js +++ b/app/abilities/project.js @@ -1,14 +1,9 @@ -import Ember from 'ember'; +import { equal, alias } from '@ember/object/computed'; +import { get, computed } from '@ember/object'; +import { inject as service } from '@ember/service'; +import { isEmpty } from '@ember/utils'; import { Ability } from 'ember-can'; -const { - computed, - computed: { alias, equal }, - get, - inject: { service }, - isEmpty -} = Ember; - /** * Ability object used to determine what the current user can do with a project * diff --git a/app/abilities/task.js b/app/abilities/task.js index f779dcae1..71a34a628 100644 --- a/app/abilities/task.js +++ b/app/abilities/task.js @@ -1,14 +1,9 @@ -import Ember from 'ember'; +import { or, equal, alias } from '@ember/object/computed'; +import { get, computed } from '@ember/object'; +import { inject as service } from '@ember/service'; +import { isEmpty } from '@ember/utils'; import { Ability } from 'ember-can'; -const { - computed, - computed: { alias, equal, or }, - get, - inject: { service }, - isEmpty -} = Ember; - export default Ability.extend({ currentUser: service(), diff --git a/app/adapters/project.js b/app/adapters/project.js index 905857f83..43794d64f 100644 --- a/app/adapters/project.js +++ b/app/adapters/project.js @@ -1,8 +1,6 @@ -import Ember from 'ember'; +import { get } from '@ember/object'; import ApplicationAdapter from './application'; -const { get } = Ember; - export default ApplicationAdapter.extend({ /** * Clears out query parameters which are used to build a url. diff --git a/app/adapters/slugged-route.js b/app/adapters/slugged-route.js index eddff7275..d29f0cef4 100644 --- a/app/adapters/slugged-route.js +++ b/app/adapters/slugged-route.js @@ -1,8 +1,6 @@ -import Ember from 'ember'; +import { get } from '@ember/object'; import ApplicationAdapter from './application'; -const { get } = Ember; - export default ApplicationAdapter.extend({ /** * Clears out query parameters which are used to build a url. diff --git a/app/adapters/task.js b/app/adapters/task.js index c0af77107..7b58917e3 100644 --- a/app/adapters/task.js +++ b/app/adapters/task.js @@ -1,11 +1,7 @@ +import { underscore } from '@ember/string'; +import { get } from '@ember/object'; +import { isBlank } from '@ember/utils'; import ApplicationAdapter from './application'; -import Ember from 'ember'; - -const { - String: { underscore }, - get, - isBlank -} = Ember; export default ApplicationAdapter.extend({ // need to delete slug and sluggedRouteSlug properties from the query. diff --git a/app/adapters/user.js b/app/adapters/user.js index b76d97634..eb45db51e 100644 --- a/app/adapters/user.js +++ b/app/adapters/user.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; +import { get } from '@ember/object'; +import { inject as service } from '@ember/service'; import ApplicationAdapter from './application'; -const { - get, - inject: { service } -} = Ember; - export default ApplicationAdapter.extend({ currentUser: service(), diff --git a/app/components/animated-high-five.js b/app/components/animated-high-five.js index ef2d646f5..2d654e9ae 100644 --- a/app/components/animated-high-five.js +++ b/app/components/animated-high-five.js @@ -1,12 +1,7 @@ -import Ember from 'ember'; - -const { - Component, - computed, - get, - run, - set -} = Ember; +import { setDiff } from '@ember/object/computed'; +import Component from '@ember/component'; +import { run } from '@ember/runloop'; +import { set, get, computed } from '@ember/object'; export default Component.extend({ classNames: ['animated-high-five'], @@ -31,7 +26,7 @@ export default Component.extend({ run.cancel(resetTimer); }, - availableImages: computed.setDiff('images', 'currentImageArray'), + availableImages: setDiff('images', 'currentImageArray'), currentImageArray: computed('currentImage', function() { let currentImage = get(this, 'currentImage'); diff --git a/app/components/categories-list.js b/app/components/categories-list.js index 9eb23c8e9..2eae671fb 100644 --- a/app/components/categories-list.js +++ b/app/components/categories-list.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - computed -} = Ember; +import { sort } from '@ember/object/computed'; +import Component from '@ember/component'; /** * `categories-list` composes the list of categories @@ -36,5 +32,5 @@ export default Component.extend({ * @property sortedCategories * @type Array */ - sortedCategories: computed.sort('categories', 'sortByName') + sortedCategories: sort('categories', 'sortByName') }); diff --git a/app/components/category-item.js b/app/components/category-item.js index a645ed38c..990d15a95 100644 --- a/app/components/category-item.js +++ b/app/components/category-item.js @@ -1,14 +1,8 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; +import { set, get, computed } from '@ember/object'; import { notEmpty } from 'ember-computed'; -const { - Component, - computed, - get, - inject: { service }, - set -} = Ember; - /** * `category-item` composes a category's icon, and description. * diff --git a/app/components/code-theme-selector.js b/app/components/code-theme-selector.js index f52a011c4..4ce2cd542 100644 --- a/app/components/code-theme-selector.js +++ b/app/components/code-theme-selector.js @@ -1,12 +1,8 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { get } from '@ember/object'; +import { inject as service } from '@ember/service'; import { alias } from 'ember-computed'; -const { - Component, - get, - inject: { service } -} = Ember; - /** * The `code-theme-selector` component is used to toggle code themes on * tasks/comments/etc. diff --git a/app/components/comment-item.js b/app/components/comment-item.js index 857eeb1de..458e77d52 100644 --- a/app/components/comment-item.js +++ b/app/components/comment-item.js @@ -1,15 +1,9 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; +import { isEqual } from '@ember/utils'; +import { set, get, computed } from '@ember/object'; import { parse } from 'code-corps-ember/utils/mention-parser'; -const { - Component, - computed, - get, - inject: { service }, - isEqual, - set -} = Ember; - /** `comment-item` composes a comment diff --git a/app/components/common/busy-model-wrapper.js b/app/components/common/busy-model-wrapper.js index 5cb95ebfb..306d78df7 100644 --- a/app/components/common/busy-model-wrapper.js +++ b/app/components/common/busy-model-wrapper.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ tagName:'', diff --git a/app/components/create-comment-form.js b/app/components/create-comment-form.js index a8c6d6316..6a8ef74a1 100644 --- a/app/components/create-comment-form.js +++ b/app/components/create-comment-form.js @@ -1,11 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - get, - inject: { service }, - set -} = Ember; +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; +import { set, get } from '@ember/object'; /** `create-comment-form` composes the comment form. The comment form allows for diff --git a/app/components/demo-categories.js b/app/components/demo-categories.js index cc79cc437..30e21c871 100644 --- a/app/components/demo-categories.js +++ b/app/components/demo-categories.js @@ -1,11 +1,10 @@ +import Component from '@ember/component'; +import { later } from '@ember/runloop'; +import { set, get, observer } from '@ember/object'; import Ember from 'ember'; import { task, timeout } from 'ember-concurrency'; const { - Component, - observer, - run: { later }, - get, set, testing } = Ember; diff --git a/app/components/demo-category-item.js b/app/components/demo-category-item.js index baefc6826..d5a24f3c4 100644 --- a/app/components/demo-category-item.js +++ b/app/components/demo-category-item.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { Component, computed, get } = Ember; +import Component from '@ember/component'; +import { get, computed } from '@ember/object'; export default Component.extend({ classNames: ['category-item'], diff --git a/app/components/demo-projects.js b/app/components/demo-projects.js index ee4cfbb94..f9522bf31 100644 --- a/app/components/demo-projects.js +++ b/app/components/demo-projects.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['demo-projects'], diff --git a/app/components/demo-skills.js b/app/components/demo-skills.js index 3b953649c..78bdb12bd 100644 --- a/app/components/demo-skills.js +++ b/app/components/demo-skills.js @@ -1,11 +1,10 @@ +import Component from '@ember/component'; +import { later } from '@ember/runloop'; +import { set, get, observer } from '@ember/object'; import Ember from 'ember'; import { task, timeout } from 'ember-concurrency'; const { - Component, - observer, - run: { later }, - get, set, testing } = Ember; diff --git a/app/components/donation-goal-edit.js b/app/components/donation-goal-edit.js index 73befddad..e33b173cf 100644 --- a/app/components/donation-goal-edit.js +++ b/app/components/donation-goal-edit.js @@ -1,11 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - get, - getProperties, - setProperties -} = Ember; +import Component from '@ember/component'; +import { setProperties, getProperties, get } from '@ember/object'; /** * `donation-goal-edit` used to edit new and existing donation goals diff --git a/app/components/donation-goal.js b/app/components/donation-goal.js index 89f6fad96..d478a3448 100644 --- a/app/components/donation-goal.js +++ b/app/components/donation-goal.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - computed -} = Ember; +import { alias } from '@ember/object/computed'; +import Component from '@ember/component'; /** * `donation-goal` used to display information about a donation goal @@ -36,6 +32,6 @@ export default Component.extend({ */ canEdit: false, - achieved: computed.alias('donationGoal.achieved'), - current: computed.alias('donationGoal.current') + achieved: alias('donationGoal.achieved'), + current: alias('donationGoal.current') }); diff --git a/app/components/donation-goals-activation.js b/app/components/donation-goals-activation.js index f231876b6..db35a33e8 100644 --- a/app/components/donation-goals-activation.js +++ b/app/components/donation-goals-activation.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['donation-goals-activation'] diff --git a/app/components/donation-goals.js b/app/components/donation-goals.js index 036403dc7..b246d1f38 100644 --- a/app/components/donation-goals.js +++ b/app/components/donation-goals.js @@ -1,11 +1,12 @@ -import Ember from 'ember'; - -const { - Component, - computed: { - alias, filterBy, not, notEmpty, setDiff, sort - } -} = Ember; +import Component from '@ember/component'; +import { + sort, + setDiff, + notEmpty, + not, + filterBy, + alias +} from '@ember/object/computed'; /** * `donation-goals` used to display and manage a project's donation goals diff --git a/app/components/donation/card-item.js b/app/components/donation/card-item.js index ce13c5e07..659046ec1 100644 --- a/app/components/donation/card-item.js +++ b/app/components/donation/card-item.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['card-item'] diff --git a/app/components/donation/card-logo.js b/app/components/donation/card-logo.js index a2cdd7207..cf24ea012 100644 --- a/app/components/donation/card-logo.js +++ b/app/components/donation/card-logo.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['card-logo__container'] diff --git a/app/components/donation/donation-container.js b/app/components/donation/donation-container.js index ecd7eb99d..f86f2d812 100644 --- a/app/components/donation/donation-container.js +++ b/app/components/donation/donation-container.js @@ -1,11 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - computed: { - and, empty, or - } -} = Ember; +import Component from '@ember/component'; +import { or, empty, and } from '@ember/object/computed'; export default Component.extend({ classNames: ['donation-container'], diff --git a/app/components/donation/project-header.js b/app/components/donation/project-header.js index 34234cbc6..fe58e5a1a 100644 --- a/app/components/donation/project-header.js +++ b/app/components/donation/project-header.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['project-header'] diff --git a/app/components/donations/create-donation.js b/app/components/donations/create-donation.js index d57d76cf8..cdbb87cd5 100644 --- a/app/components/donations/create-donation.js +++ b/app/components/donations/create-donation.js @@ -1,13 +1,11 @@ -import Ember from 'ember'; - -const { - Component, - computed, - getProperties, - isEmpty, +import Component from '@ember/component'; +import { isEmpty } from '@ember/utils'; +import { + set, observer, - set -} = Ember; + getProperties, + computed +} from '@ember/object'; export default Component.extend({ classNames: ['create-donation'], diff --git a/app/components/donations/donation-amount-button.js b/app/components/donations/donation-amount-button.js index 2f07dc62c..a44426b15 100644 --- a/app/components/donations/donation-amount-button.js +++ b/app/components/donations/donation-amount-button.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['preset-amount'], diff --git a/app/components/donations/donation-progress.js b/app/components/donations/donation-progress.js index 45a6b9514..bde6bd9be 100644 --- a/app/components/donations/donation-progress.js +++ b/app/components/donations/donation-progress.js @@ -1,9 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - computed -} = Ember; +import { alias } from '@ember/object/computed'; +import Component from '@ember/component'; +import { computed } from '@ember/object'; /** * Displays progress towards the current donation goal @@ -36,13 +33,13 @@ export default Component.extend({ * * @property {Number} amountNeeded */ - amountNeeded: computed.alias('donationGoal.amount'), + amountNeeded: alias('donationGoal.amount'), /** * The description this donation goal * @property {String} description */ - description: computed.alias('donationGoal.description'), + description: alias('donationGoal.description'), /** * A computed field. Uses fields `amountDonated` and `amountNeeded` to diff --git a/app/components/donations/donation-status.js b/app/components/donations/donation-status.js index ec5c211fc..007fba050 100644 --- a/app/components/donations/donation-status.js +++ b/app/components/donations/donation-status.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['donation-status'], diff --git a/app/components/donations/show-donation.js b/app/components/donations/show-donation.js index b32dc67d7..4e34f991d 100644 --- a/app/components/donations/show-donation.js +++ b/app/components/donations/show-donation.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['show-donation'] diff --git a/app/components/drag-zone.js b/app/components/drag-zone.js index 2153debef..b04a57cc8 100644 --- a/app/components/drag-zone.js +++ b/app/components/drag-zone.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - get, - inject: { service } -} = Ember; +import Component from '@ember/component'; +import { get } from '@ember/object'; +import { inject as service } from '@ember/service'; export default Component.extend({ classNames: ['drag-zone', 'flexbox-container'], diff --git a/app/components/editor-with-preview.js b/app/components/editor-with-preview.js index 2ff6e86eb..10d7643dc 100644 --- a/app/components/editor-with-preview.js +++ b/app/components/editor-with-preview.js @@ -1,3 +1,8 @@ +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; +import { isEmpty } from '@ember/utils'; +import { run } from '@ember/runloop'; +import { set, get, computed } from '@ember/object'; import Ember from 'ember'; import { equal, @@ -5,13 +10,6 @@ import { } from 'ember-computed'; const { - Component, - computed, - get, - inject: { service }, - isEmpty, - run, - set, String } = Ember; diff --git a/app/components/error-formatter.js b/app/components/error-formatter.js index 0614f7c5e..f2ec9b167 100644 --- a/app/components/error-formatter.js +++ b/app/components/error-formatter.js @@ -1,10 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - computed, - get -} = Ember; +import Component from '@ember/component'; +import { get, computed } from '@ember/object'; /** `error-formatter' returns a formatted error message. Place within an 'if' diff --git a/app/components/error-wrapper.js b/app/components/error-wrapper.js index 98ce64d8f..77c163ac6 100644 --- a/app/components/error-wrapper.js +++ b/app/components/error-wrapper.js @@ -1,11 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - computed, - inject: { service }, - observer -} = Ember; +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; +import { observer, computed } from '@ember/object'; /** `error-wrapper` handles http response status code errors and other server diff --git a/app/components/flash-messages.js b/app/components/flash-messages.js index f042fac73..6f5d3eae6 100644 --- a/app/components/flash-messages.js +++ b/app/components/flash-messages.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - inject: { service } -} = Ember; +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; /** `flash-messages` is a container for displaying flash messages. It leverages diff --git a/app/components/github-connect-state.js b/app/components/github-connect-state.js index afc8cea54..676949e97 100644 --- a/app/components/github-connect-state.js +++ b/app/components/github-connect-state.js @@ -1,10 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - computed, - get -} = Ember; +import Component from '@ember/component'; +import { get, computed } from '@ember/object'; /** The github-connect-state component is used to display a button if not diff --git a/app/components/github-repo.js b/app/components/github-repo.js index 6276789bc..d2e02e6f3 100644 --- a/app/components/github-repo.js +++ b/app/components/github-repo.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - computed: { alias, notEmpty }, - Component -} = Ember; +import { notEmpty, alias } from '@ember/object/computed'; +import Component from '@ember/component'; export default Component.extend({ classNames: ['github-repo'], diff --git a/app/components/github/connected-installation.js b/app/components/github/connected-installation.js index 6a4ceab27..7721515ed 100644 --- a/app/components/github/connected-installation.js +++ b/app/components/github/connected-installation.js @@ -1,12 +1,6 @@ -import Ember from 'ember'; - -const { - computed, - computed: { alias }, - Component, - get, - getProperties -} = Ember; +import { alias } from '@ember/object/computed'; +import Component from '@ember/component'; +import { getProperties, get, computed } from '@ember/object'; export default Component.extend({ classNames: ['github-app-installation connected'], diff --git a/app/components/github/unconnected-installation.js b/app/components/github/unconnected-installation.js index b8d143ded..51096ada7 100644 --- a/app/components/github/unconnected-installation.js +++ b/app/components/github/unconnected-installation.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['github-app-installation unconnected'] diff --git a/app/components/image-drop.js b/app/components/image-drop.js index 450a69fc4..2dd7b1ca5 100644 --- a/app/components/image-drop.js +++ b/app/components/image-drop.js @@ -1,20 +1,13 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { or, notEmpty, alias } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; +import { isEmpty } from '@ember/utils'; +import { run } from '@ember/runloop'; +import { set, getProperties, get, computed } from '@ember/object'; +import { htmlSafe } from '@ember/string'; import EmberUploader from 'ember-uploader'; import ENV from 'code-corps-ember/config/environment'; -const { - Component, - computed, - computed: { alias, notEmpty, or }, - get, - getProperties, - inject: { service }, - isEmpty, - run, - set, - String: { htmlSafe } -} = Ember; - const { Uploader } = EmberUploader; export default Component.extend({ diff --git a/app/components/landing-subsection.js b/app/components/landing-subsection.js index 427ad0a44..a8f487e94 100644 --- a/app/components/landing-subsection.js +++ b/app/components/landing-subsection.js @@ -1,12 +1,8 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { htmlSafe } from '@ember/string'; +import { computed } from '@ember/object'; import CanAnimateMixin from 'code-corps-ember/mixins/can-animate'; -const { - Component, - String: { htmlSafe }, - computed -} = Ember; - export default Component.extend(CanAnimateMixin, { attributeBindings: ['style'], classNames: ['landing-subsection'], diff --git a/app/components/loading-bar.js b/app/components/loading-bar.js index ae2a52626..8ed1b6e65 100644 --- a/app/components/loading-bar.js +++ b/app/components/loading-bar.js @@ -1,14 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - computed: { - alias - }, - inject: { - service - } -} = Ember; +import Component from '@ember/component'; +import { alias } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; export default Component.extend({ classNameBindings: ['isLoading'], diff --git a/app/components/loading-spinner.js b/app/components/loading-spinner.js index 7f9181807..0bb298ebe 100644 --- a/app/components/loading-spinner.js +++ b/app/components/loading-spinner.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['loading-spinner'] diff --git a/app/components/login-form.js b/app/components/login-form.js index 6afde9283..91db1cf0b 100644 --- a/app/components/login-form.js +++ b/app/components/login-form.js @@ -1,11 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - get, - inject: { service }, - set -} = Ember; +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; +import { set, get } from '@ember/object'; /** `login-form` composes the login form, and makes the required calls to diff --git a/app/components/modal-confirm.js b/app/components/modal-confirm.js index 54535da97..6ad1f257e 100644 --- a/app/components/modal-confirm.js +++ b/app/components/modal-confirm.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { set, get } from '@ember/object'; import { task } from 'ember-concurrency'; -const { - Component, - get, - set -} = Ember; /** `modal-confirm` Replaces javascript confirm with a modal built with ember-modal-dialog diff --git a/app/components/modal-dialog.js b/app/components/modal-dialog.js index bd983d823..62e088825 100644 --- a/app/components/modal-dialog.js +++ b/app/components/modal-dialog.js @@ -1,8 +1,10 @@ -import Ember from 'ember'; +import { on } from '@ember/object/evented'; +import { set } from '@ember/object'; import ModalDialog from 'ember-modal-dialog/components/modal-dialog'; -import { EKMixin as EmberKeyboardMixin, keyDown } from 'ember-keyboard'; - -const { on, set } = Ember; +import { + EKMixin as EmberKeyboardMixin, + keyDown +} from 'ember-keyboard'; export default ModalDialog.extend(EmberKeyboardMixin, { init() { diff --git a/app/components/navigation-menu.js b/app/components/navigation-menu.js index c16884f7f..501b86e42 100644 --- a/app/components/navigation-menu.js +++ b/app/components/navigation-menu.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - inject: { service } -} = Ember; +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; /** `navigation-menu` composes the top navigation-menu. diff --git a/app/components/organization-header.js b/app/components/organization-header.js index 2338dd6ec..f1f8b329a 100644 --- a/app/components/organization-header.js +++ b/app/components/organization-header.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['organization-header'], diff --git a/app/components/organization-menu.js b/app/components/organization-menu.js index 4216b0511..e16d7bc85 100644 --- a/app/components/organization-menu.js +++ b/app/components/organization-menu.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['organization-menu', 'organization-menu--horizontal'] diff --git a/app/components/organization-profile.js b/app/components/organization-profile.js index 7ba1f02b4..72f8840d0 100644 --- a/app/components/organization-profile.js +++ b/app/components/organization-profile.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['organization-profile'] diff --git a/app/components/organization-settings-form.js b/app/components/organization-settings-form.js index 052d7d16b..32a42bc74 100644 --- a/app/components/organization-settings-form.js +++ b/app/components/organization-settings-form.js @@ -1,11 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - get, - inject: { service }, - set -} = Ember; +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; +import { set, get } from '@ember/object'; export default Component.extend({ classNames: ['organization-settings-form', 'settings-form'], diff --git a/app/components/organization-settings.js b/app/components/organization-settings.js index 00d6fa37e..557064773 100644 --- a/app/components/organization-settings.js +++ b/app/components/organization-settings.js @@ -1,5 +1,3 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({}); diff --git a/app/components/pager-control.js b/app/components/pager-control.js index 30ead9d1e..02f99cdcb 100644 --- a/app/components/pager-control.js +++ b/app/components/pager-control.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - computed, - computed: { alias, equal, gt } -} = Ember; +import Component from '@ember/component'; +import { computed } from '@ember/object'; +import { gt, equal, alias } from '@ember/object/computed'; /** The `PagerControlComponent` provides pagination controls, e.g. previous/next diff --git a/app/components/password/forgot-password.js b/app/components/password/forgot-password.js index 24ecb45c3..56d02c768 100644 --- a/app/components/password/forgot-password.js +++ b/app/components/password/forgot-password.js @@ -1,5 +1,6 @@ -import Ember from 'ember'; -const { Component, set, get, inject: { service } } = Ember; +import Component from '@ember/component'; +import { get, set } from '@ember/object'; +import { inject as service } from '@ember/service'; import { task } from 'ember-concurrency'; export default Component.extend({ diff --git a/app/components/password/reset-password.js b/app/components/password/reset-password.js index 25aab2267..031d230bb 100644 --- a/app/components/password/reset-password.js +++ b/app/components/password/reset-password.js @@ -1,5 +1,6 @@ -import Ember from 'ember'; -const { Component, set, get, inject: { service } } = Ember; +import Component from '@ember/component'; +import { get, set } from '@ember/object'; +import { inject as service } from '@ember/service'; import { task } from 'ember-concurrency'; export default Component.extend({ diff --git a/app/components/payments/account-setup.js b/app/components/payments/account-setup.js index 33a5ad350..70ec8f903 100644 --- a/app/components/payments/account-setup.js +++ b/app/components/payments/account-setup.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['account-setup'] diff --git a/app/components/payments/bank-account.js b/app/components/payments/bank-account.js index d9024dc0e..184510045 100644 --- a/app/components/payments/bank-account.js +++ b/app/components/payments/bank-account.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - computed, - get -} = Ember; +import { alias } from '@ember/object/computed'; +import Component from '@ember/component'; +import { get, computed } from '@ember/object'; export default Component.extend({ classNameBindings: ['statusClass'], @@ -13,7 +9,7 @@ export default Component.extend({ accountNumber: null, routingNumber: null, - status: computed.alias('stripeConnectAccount.bankAccountStatus'), + status: alias('stripeConnectAccount.bankAccountStatus'), statusClass: computed('status', function() { return `account-setup__section--${get(this, 'status')}`; diff --git a/app/components/payments/contact-info.js b/app/components/payments/contact-info.js index e20cbd769..fcb06832c 100644 --- a/app/components/payments/contact-info.js +++ b/app/components/payments/contact-info.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['contact-info'] diff --git a/app/components/payments/create-account.js b/app/components/payments/create-account.js index bfd58a518..751184f36 100644 --- a/app/components/payments/create-account.js +++ b/app/components/payments/create-account.js @@ -1,13 +1,8 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { get, computed } from '@ember/object'; +import { isEmpty } from '@ember/utils'; import moment from 'moment'; -const { - Component, - computed, - get, - isEmpty -} = Ember; - export default Component.extend({ classNameBindings: ['statusClass'], classNames: ['create-account', 'account-setup__section'], diff --git a/app/components/payments/donation-goals.js b/app/components/payments/donation-goals.js index d0335acd5..c1c81c4f9 100644 --- a/app/components/payments/donation-goals.js +++ b/app/components/payments/donation-goals.js @@ -1,10 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - computed, - get -} = Ember; +import Component from '@ember/component'; +import { get, computed } from '@ember/object'; export default Component.extend({ classNameBindings: ['statusClass'], diff --git a/app/components/payments/funds-recipient.js b/app/components/payments/funds-recipient.js index 22ad8aa66..8552fa03f 100644 --- a/app/components/payments/funds-recipient.js +++ b/app/components/payments/funds-recipient.js @@ -1,11 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - computed, - computed: { alias }, - get -} = Ember; +import Component from '@ember/component'; +import { alias } from '@ember/object/computed'; +import { get, computed } from '@ember/object'; export default Component.extend({ classNameBindings: ['statusClass'], diff --git a/app/components/payments/funds-recipient/details-form.js b/app/components/payments/funds-recipient/details-form.js index 07498e48f..9e135b5c2 100644 --- a/app/components/payments/funds-recipient/details-form.js +++ b/app/components/payments/funds-recipient/details-form.js @@ -1,13 +1,7 @@ -import Ember from 'ember'; - -const { - Component, - computed: { equal }, - get, - isEmpty, - set, - setProperties -} = Ember; +import Component from '@ember/component'; +import { equal } from '@ember/object/computed'; +import { isEmpty } from '@ember/utils'; +import { setProperties, set, get } from '@ember/object'; export default Component.extend({ classNames: ['details-form'], diff --git a/app/components/payments/funds-recipient/identity-document-file-upload.js b/app/components/payments/funds-recipient/identity-document-file-upload.js index d4e2ca51c..aa6832959 100644 --- a/app/components/payments/funds-recipient/identity-document-file-upload.js +++ b/app/components/payments/funds-recipient/identity-document-file-upload.js @@ -1,14 +1,8 @@ -import Ember from 'ember'; +import { getProperties, get, computed } from '@ember/object'; +import { isEmpty } from '@ember/utils'; import EmberUploader from 'ember-uploader'; import ENV from 'code-corps-ember/config/environment'; -const { - computed, - get, - getProperties, - isEmpty -} = Ember; - const { Uploader } = EmberUploader; /** diff --git a/app/components/payments/funds-recipient/personal-id-number.js b/app/components/payments/funds-recipient/personal-id-number.js index 34428636f..f0b82c916 100644 --- a/app/components/payments/funds-recipient/personal-id-number.js +++ b/app/components/payments/funds-recipient/personal-id-number.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - computed: { alias } -} = Ember; +import Component from '@ember/component'; +import { alias } from '@ember/object/computed'; export default Component.extend({ classNames: ['personal-id-number'], diff --git a/app/components/payments/funds-recipient/verification-document.js b/app/components/payments/funds-recipient/verification-document.js index 8cb27480b..9b0f13d6f 100644 --- a/app/components/payments/funds-recipient/verification-document.js +++ b/app/components/payments/funds-recipient/verification-document.js @@ -1,19 +1,13 @@ -import Ember from 'ember'; - -const { - Component, - computed, - get, - set - -} = Ember; +import { alias } from '@ember/object/computed'; +import Component from '@ember/component'; +import { set, get, computed } from '@ember/object'; const VALIDATION_ERROR = 'The file you selected is invalid. Only .jpg and .png images of up to 8mb in size are supported.'; const UPLOAD_ERROR = 'There was a problem with uploading your file. Please try again.'; export default Component.extend({ classNames: ['verification-document'], - status: computed.alias('stripeConnectAccount.verificationDocumentStatus'), + status: alias('stripeConnectAccount.verificationDocumentStatus'), progressPercentage: 0, progressMessage: computed('progressPercentage', function() { diff --git a/app/components/power-select/before-task-options.js b/app/components/power-select/before-task-options.js index 9a05b5f0a..66b97864d 100644 --- a/app/components/power-select/before-task-options.js +++ b/app/components/power-select/before-task-options.js @@ -1,7 +1,5 @@ +import { get } from '@ember/object'; import BeforeOptionsComponent from 'ember-power-select/components/power-select/before-options'; -import Ember from 'ember'; - -const { get } = Ember; export default BeforeOptionsComponent.extend({ actions: { diff --git a/app/components/progress-bar-container.js b/app/components/progress-bar-container.js index 821e41fe5..d98a8a729 100644 --- a/app/components/progress-bar-container.js +++ b/app/components/progress-bar-container.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; /** `progress-bar-container` is the container for a progress-bar. diff --git a/app/components/progress-bar.js b/app/components/progress-bar.js index da7bc60b3..ab629f05b 100644 --- a/app/components/progress-bar.js +++ b/app/components/progress-bar.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - String: { htmlSafe }, - computed -} = Ember; +import Component from '@ember/component'; +import { htmlSafe } from '@ember/string'; +import { computed } from '@ember/object'; /** The `progress-bar` component is used to represent progress on a given diff --git a/app/components/project-card.js b/app/components/project-card.js index 5c0537a07..35906c65b 100644 --- a/app/components/project-card.js +++ b/app/components/project-card.js @@ -1,12 +1,7 @@ -import Ember from 'ember'; - -const { - Component, - computed, - computed: { mapBy }, - get, - inject: { service } -} = Ember; +import Component from '@ember/component'; +import { mapBy } from '@ember/object/computed'; +import { get, computed } from '@ember/object'; +import { inject as service } from '@ember/service'; /** `project-card` composes a card that contains the given project's description, diff --git a/app/components/project-card/donation-progress.js b/app/components/project-card/donation-progress.js index 0312bb5ac..c8e804b17 100644 --- a/app/components/project-card/donation-progress.js +++ b/app/components/project-card/donation-progress.js @@ -1,9 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - computed -} = Ember; +import { alias } from '@ember/object/computed'; +import Component from '@ember/component'; +import { computed } from '@ember/object'; /** * Displays progress towards the current donation goal @@ -36,13 +33,13 @@ export default Component.extend({ * * @property {Number} amountNeeded */ - amountNeeded: computed.alias('donationGoal.amount'), + amountNeeded: alias('donationGoal.amount'), /** * The description this donation goal * @property {String} description */ - description: computed.alias('donationGoal.description'), + description: alias('donationGoal.description'), /** * A computed field. Uses fields `amountDonated` and `amountNeeded` to diff --git a/app/components/project-card/project-users.js b/app/components/project-card/project-users.js index 600573fdb..e199f8778 100644 --- a/app/components/project-card/project-users.js +++ b/app/components/project-card/project-users.js @@ -1,11 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - computed, - computed: { alias }, - get -} = Ember; +import Component from '@ember/component'; +import { alias } from '@ember/object/computed'; +import { get, computed } from '@ember/object'; const VISIBLE_USERS_COUNT = 8; diff --git a/app/components/project-categories-list.js b/app/components/project-categories-list.js index 3c4b7abeb..77a78aff6 100644 --- a/app/components/project-categories-list.js +++ b/app/components/project-categories-list.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - computed: { sort } -} = Ember; +import Component from '@ember/component'; +import { sort } from '@ember/object/computed'; /** `project-categories-list` displays a list of categories within the project, diff --git a/app/components/project-category-item.js b/app/components/project-category-item.js index 31a78b76e..10083aa86 100644 --- a/app/components/project-category-item.js +++ b/app/components/project-category-item.js @@ -1,12 +1,7 @@ -import Ember from 'ember'; - -const { - Component, - computed, - computed: { alias, notEmpty }, - get, - inject: { service } -} = Ember; +import Component from '@ember/component'; +import { notEmpty, alias } from '@ember/object/computed'; +import { get, computed } from '@ember/object'; +import { inject as service } from '@ember/service'; /** `project-category-item` represents a category with a project. When selected diff --git a/app/components/project-header.js b/app/components/project-header.js index bb002fdcf..f8631fdd1 100644 --- a/app/components/project-header.js +++ b/app/components/project-header.js @@ -1,13 +1,7 @@ -import Ember from 'ember'; - -const { - Component, - computed, - computed: { alias, mapBy }, - get, - getProperties, - inject: { service } -} = Ember; +import Component from '@ember/component'; +import { mapBy, alias } from '@ember/object/computed'; +import { getProperties, get, computed } from '@ember/object'; +import { inject as service } from '@ember/service'; /** Displays information about the project and allows a user to join the project diff --git a/app/components/project-item.js b/app/components/project-item.js index a542361c7..7f4a73310 100644 --- a/app/components/project-item.js +++ b/app/components/project-item.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; /** `project-item` presents a project with the icon, title and description. Each diff --git a/app/components/project-join-modal.js b/app/components/project-join-modal.js index 40c2fe57c..a2688f7db 100644 --- a/app/components/project-join-modal.js +++ b/app/components/project-join-modal.js @@ -1,14 +1,12 @@ -import Ember from 'ember'; -import { EKMixin as EmberKeyboardMixin, keyDown } from 'ember-keyboard'; - -const { - Component, - computed: { alias }, - get, - inject: { service }, - on, - set -} = Ember; +import Component from '@ember/component'; +import { alias } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; +import { on } from '@ember/object/evented'; +import { set, get } from '@ember/object'; +import { + EKMixin as EmberKeyboardMixin, + keyDown +} from 'ember-keyboard'; export default Component.extend(EmberKeyboardMixin, { classNames: ['project-join-modal-container'], diff --git a/app/components/project-list.js b/app/components/project-list.js index 42a4e08c3..39248d93e 100644 --- a/app/components/project-list.js +++ b/app/components/project-list.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; /** `project-list` presents a list of projects. diff --git a/app/components/project-long-description.js b/app/components/project-long-description.js index 60e2e090b..551218a1e 100644 --- a/app/components/project-long-description.js +++ b/app/components/project-long-description.js @@ -1,12 +1,7 @@ -import Ember from 'ember'; - -const { - Component, - computed: { or }, - get, - isPresent, - set -} = Ember; +import Component from '@ember/component'; +import { or } from '@ember/object/computed'; +import { isPresent } from '@ember/utils'; +import { set, get } from '@ember/object'; /** `project-long-description` displays and allows editing of the long diff --git a/app/components/project-menu.js b/app/components/project-menu.js index 436eefcd6..7599fcd46 100644 --- a/app/components/project-menu.js +++ b/app/components/project-menu.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - computed: { alias, gt, filterBy }, - inject: { service } -} = Ember; +import Component from '@ember/component'; +import { filterBy, gt, alias } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; /** `project-menu` allows navigation within project functions. Users who diff --git a/app/components/project-settings-form.js b/app/components/project-settings-form.js index 1de9d041e..19a36dda6 100644 --- a/app/components/project-settings-form.js +++ b/app/components/project-settings-form.js @@ -1,11 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - get, - inject: { service }, - set -} = Ember; +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; +import { set, get } from '@ember/object'; export default Component.extend({ classNames: ['project-settings-form', 'settings-form'], diff --git a/app/components/project-skill-item.js b/app/components/project-skill-item.js index 904937605..85fd81694 100644 --- a/app/components/project-skill-item.js +++ b/app/components/project-skill-item.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - getProperties -} = Ember; +import Component from '@ember/component'; +import { getProperties } from '@ember/object'; export default Component.extend({ classNames: ['skill', 'has-spinner', 'default', 'small'], diff --git a/app/components/project-skills-list.js b/app/components/project-skills-list.js index d3db56a73..6ddb68ba6 100644 --- a/app/components/project-skills-list.js +++ b/app/components/project-skills-list.js @@ -1,12 +1,6 @@ -import Ember from 'ember'; - -const { - computed, - computed: { mapBy }, - Component, - get, - getProperties -} = Ember; +import { mapBy } from '@ember/object/computed'; +import Component from '@ember/component'; +import { getProperties, get, computed } from '@ember/object'; export default Component.extend({ classNames: ['project-skills-list'], diff --git a/app/components/project-users.js b/app/components/project-users.js index beaa38c11..f9aabcd14 100644 --- a/app/components/project-users.js +++ b/app/components/project-users.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - computed: { alias } -} = Ember; +import Component from '@ember/component'; +import { alias } from '@ember/object/computed'; export default Component.extend({ classNames: ['project-users'], diff --git a/app/components/related-skills.js b/app/components/related-skills.js index f5e390d26..aa7cbded6 100644 --- a/app/components/related-skills.js +++ b/app/components/related-skills.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - set -} = Ember; +import Component from '@ember/component'; +import { set } from '@ember/object'; /** * `related-skills` renders a list of associated skill records for an entity diff --git a/app/components/role-item.js b/app/components/role-item.js index 84f7f6789..41abaf64a 100644 --- a/app/components/role-item.js +++ b/app/components/role-item.js @@ -1,14 +1,7 @@ -import Ember from 'ember'; - -const { - Component, - computed, - computed: { notEmpty }, - get, - getProperties, - inject: { service }, - set -} = Ember; +import Component from '@ember/component'; +import { notEmpty } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; +import { set, getProperties, get, computed } from '@ember/object'; export default Component.extend({ classNames: ['role-item'], diff --git a/app/components/scroll-top.js b/app/components/scroll-top.js index 4ed2d6c11..dda49de50 100644 --- a/app/components/scroll-top.js +++ b/app/components/scroll-top.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ click() { diff --git a/app/components/select-inline-dropdown/list-item.js b/app/components/select-inline-dropdown/list-item.js index 46f94eed6..903965107 100644 --- a/app/components/select-inline-dropdown/list-item.js +++ b/app/components/select-inline-dropdown/list-item.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ tagName: '', diff --git a/app/components/select/birth-date.js b/app/components/select/birth-date.js index c2998452c..989905066 100644 --- a/app/components/select/birth-date.js +++ b/app/components/select/birth-date.js @@ -1,15 +1,8 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { set, getProperties, get, computed } from '@ember/object'; import moment from 'moment'; import { range } from 'code-corps-ember/utils/array-utils'; -const { - Component, - computed, - get, - getProperties, - set -} = Ember; - export default Component.extend({ classNames: ['select-birth-date'], diff --git a/app/components/select/country-select.js b/app/components/select/country-select.js index cd8dfb0b2..c2f6175d9 100644 --- a/app/components/select/country-select.js +++ b/app/components/select/country-select.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['select-country'], diff --git a/app/components/select/github-repo.js b/app/components/select/github-repo.js index 40649a1d9..9ab8c08e2 100644 --- a/app/components/select/github-repo.js +++ b/app/components/select/github-repo.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['select-github-repo'], diff --git a/app/components/select/state-select.js b/app/components/select/state-select.js index 85d0d1b32..d26effd89 100644 --- a/app/components/select/state-select.js +++ b/app/components/select/state-select.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['select-state'], diff --git a/app/components/settings-menu.js b/app/components/settings-menu.js index bb64c9a50..1e2f0771d 100644 --- a/app/components/settings-menu.js +++ b/app/components/settings-menu.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; /** `settings-menu` allows navigation within a user's settings. diff --git a/app/components/signup-email-input.js b/app/components/signup-email-input.js index 89f772250..9defa440c 100644 --- a/app/components/signup-email-input.js +++ b/app/components/signup-email-input.js @@ -1,15 +1,8 @@ -import Ember from 'ember'; - -const { - Component, - computed, - computed: { alias, and, empty, not }, - get, - inject: { service }, - observer, - run: { cancel, debounce, once }, - set -} = Ember; +import Component from '@ember/component'; +import { not, empty, and, alias } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; +import { once, debounce, cancel } from '@ember/runloop'; +import { set, observer, get, computed } from '@ember/object'; export default Component.extend({ cachedEmail: '', diff --git a/app/components/signup-form.js b/app/components/signup-form.js index 10da7f95e..222b331aa 100644 --- a/app/components/signup-form.js +++ b/app/components/signup-form.js @@ -1,15 +1,9 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { gte, and, alias } from '@ember/object/computed'; +import { later } from '@ember/runloop'; +import { set, get, computed } from '@ember/object'; import { task } from 'ember-concurrency'; -const { - Component, - computed, - computed: { alias, and, gte }, - get, - run: { later }, - set -} = Ember; - export default Component.extend({ classNames: ['form--centered', 'signup-form'], emailValid: false, diff --git a/app/components/signup-password-input.js b/app/components/signup-password-input.js index 85b85b21b..e9374ae41 100644 --- a/app/components/signup-password-input.js +++ b/app/components/signup-password-input.js @@ -1,13 +1,9 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { computed } from '@ember/object'; +import { not, lt, gte, alias } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; import strength from 'password-strength'; -const { - Component, - computed, - computed: { alias, gte, lt, not }, - inject: { service } -} = Ember; - export default Component.extend({ classNames: ['input-group'], diff --git a/app/components/signup-username-input.js b/app/components/signup-username-input.js index cc4220e5e..ac1019346 100644 --- a/app/components/signup-username-input.js +++ b/app/components/signup-username-input.js @@ -1,12 +1,8 @@ -import Ember from 'ember'; - -const { - Component, - computed: { alias, and, empty, equal, not }, - inject: { service }, - observer, - run: { cancel, debounce, once } -} = Ember; +import Component from '@ember/component'; +import { not, equal, empty, and, alias } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; +import { observer } from '@ember/object'; +import { once, debounce, cancel } from '@ember/runloop'; /** `signup-username-input` composes the username input on the signup page. It diff --git a/app/components/site-footer.js b/app/components/site-footer.js index 537c5b294..2a836edfb 100644 --- a/app/components/site-footer.js +++ b/app/components/site-footer.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ tagName: 'footer', diff --git a/app/components/skill-button.js b/app/components/skill-button.js index 84ea6dfb6..c3d2e0c0f 100644 --- a/app/components/skill-button.js +++ b/app/components/skill-button.js @@ -1,12 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - computed, - computed: { not }, - get, - set -} = Ember; +import Component from '@ember/component'; +import { not } from '@ember/object/computed'; +import { set, get, computed } from '@ember/object'; export default Component.extend({ alwaysShowX: false, diff --git a/app/components/skill-list-item-link.js b/app/components/skill-list-item-link.js index 3e22d5235..b94c6a580 100644 --- a/app/components/skill-list-item-link.js +++ b/app/components/skill-list-item-link.js @@ -1,11 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - get, - inject: { service }, - set -} = Ember; +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; +import { set, get } from '@ember/object'; /** Shows whether a user has a skill and allows them to add or remove the skill diff --git a/app/components/skill-list-item.js b/app/components/skill-list-item.js index 2875e7a23..00c363415 100644 --- a/app/components/skill-list-item.js +++ b/app/components/skill-list-item.js @@ -1,12 +1,7 @@ -import Ember from 'ember'; - -const { - Component, - computed, - computed: { alias, and, notEmpty }, - get, - inject: { service } -} = Ember; +import Component from '@ember/component'; +import { notEmpty, and, alias } from '@ember/object/computed'; +import { get, computed } from '@ember/object'; +import { inject as service } from '@ember/service'; /** Shows whether a user has a skill and determines whether to display the diff --git a/app/components/skill-list-items.js b/app/components/skill-list-items.js index a5c1ad742..bc631d2d4 100644 --- a/app/components/skill-list-items.js +++ b/app/components/skill-list-items.js @@ -1,12 +1,13 @@ -import Ember from 'ember'; - -const { - Component, - computed, - computed: { alias, filter, setDiff, sort, union }, - get, - inject: { service } -} = Ember; +import Component from '@ember/component'; +import { + union, + sort, + setDiff, + filter, + alias +} from '@ember/object/computed'; +import { get, computed } from '@ember/object'; +import { inject as service } from '@ember/service'; export default Component.extend({ classNameBindings: ['overflowHidden:overflow-hidden'], diff --git a/app/components/skills-textfield.js b/app/components/skills-textfield.js index 76c916d4c..3c5b84f1c 100644 --- a/app/components/skills-textfield.js +++ b/app/components/skills-textfield.js @@ -1,8 +1,7 @@ -import Ember from 'ember'; +import { set, get } from '@ember/object'; +import TextField from '@ember/component/text-field'; import { getCode } from 'ember-keyboard'; -const { get, set, TextField } = Ember; - export default TextField.extend({ tagname: 'input', diff --git a/app/components/skills-typeahead-result.js b/app/components/skills-typeahead-result.js index 32694a830..c56c0eebe 100644 --- a/app/components/skills-typeahead-result.js +++ b/app/components/skills-typeahead-result.js @@ -1,13 +1,7 @@ -import Ember from 'ember'; - -const { - Component, - computed: { alias }, - computed, - get, - getProperties, - inject: { service } -} = Ember; +import Component from '@ember/component'; +import { alias } from '@ember/object/computed'; +import { getProperties, get, computed } from '@ember/object'; +import { inject as service } from '@ember/service'; export default Component.extend({ classNameBindings: ['hasSkill', 'selected:selected'], diff --git a/app/components/skills-typeahead.js b/app/components/skills-typeahead.js index b216cec0a..70a7fea72 100644 --- a/app/components/skills-typeahead.js +++ b/app/components/skills-typeahead.js @@ -1,17 +1,15 @@ -import Ember from 'ember'; - -const { - Component, - computed, - computed: { alias, and, not, notEmpty }, - get, - getProperties, - inject: { service }, - isEmpty, +import Component from '@ember/component'; +import { notEmpty, not, and, alias } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; +import { isEmpty } from '@ember/utils'; +import { once } from '@ember/runloop'; +import { + set, observer, - run: { once }, - set -} = Ember; + getProperties, + get, + computed +} from '@ember/object'; export default Component.extend({ classNames: ['skills-typeahead'], diff --git a/app/components/slugged-route-model-details.js b/app/components/slugged-route-model-details.js index 667a2c413..7745fbd76 100644 --- a/app/components/slugged-route-model-details.js +++ b/app/components/slugged-route-model-details.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['slugged-route-model-details'] diff --git a/app/components/submittable-textarea.js b/app/components/submittable-textarea.js index c307cabd7..64f3842f6 100644 --- a/app/components/submittable-textarea.js +++ b/app/components/submittable-textarea.js @@ -1,8 +1,7 @@ -import Ember from 'ember'; +import TextArea from '@ember/component/text-area'; +import { on } from '@ember/object/evented'; import { EKMixin, EKOnFocusMixin, keyDown } from 'ember-keyboard'; -const { TextArea, on } = Ember; - export default TextArea.extend(EKMixin, EKOnFocusMixin, { init() { this._super(...arguments); diff --git a/app/components/svg/sprite-icon.js b/app/components/svg/sprite-icon.js index a578f0023..62f6d09cc 100644 --- a/app/components/svg/sprite-icon.js +++ b/app/components/svg/sprite-icon.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ tagName: 'span', diff --git a/app/components/svg/sprite-map.js b/app/components/svg/sprite-map.js index b8b29c49e..dd89983e4 100644 --- a/app/components/svg/sprite-map.js +++ b/app/components/svg/sprite-map.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['svg__sprite-map'] diff --git a/app/components/task-board.js b/app/components/task-board.js index dc739f8c8..0fe4a6ef8 100644 --- a/app/components/task-board.js +++ b/app/components/task-board.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['task-board'] diff --git a/app/components/task-card.js b/app/components/task-card.js index 2fbf2a9e4..55a18dc55 100644 --- a/app/components/task-card.js +++ b/app/components/task-card.js @@ -1,17 +1,10 @@ +import Component from '@ember/component'; +import { mapBy, alias } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; +import { set, getProperties, get, computed } from '@ember/object'; import EmberCan from 'ember-can'; -import Ember from 'ember'; import createTaskUserOptions from 'code-corps-ember/utils/create-task-user-options'; -const { - Component, - computed, - computed: { alias, mapBy }, - get, - getProperties, - inject: { service }, - set -} = Ember; - const ICON_CLASS = 'ember-power-select-status-icon'; const TRIGGER_CLASS = 'ember-power-select-trigger'; diff --git a/app/components/task-card/user/selected-item.js b/app/components/task-card/user/selected-item.js index 863895075..b353af0f4 100644 --- a/app/components/task-card/user/selected-item.js +++ b/app/components/task-card/user/selected-item.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['select-inline', 'select-inline__selected-item'] diff --git a/app/components/task-card/user/unselected-item.js b/app/components/task-card/user/unselected-item.js index 308918797..df6893318 100644 --- a/app/components/task-card/user/unselected-item.js +++ b/app/components/task-card/user/unselected-item.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['select-inline', 'select-inline__unselected-item'] diff --git a/app/components/task-comment-list.js b/app/components/task-comment-list.js index fd1717346..af37927be 100644 --- a/app/components/task-comment-list.js +++ b/app/components/task-comment-list.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; /** The task-comment-list component composes the list of comments for a task. diff --git a/app/components/task-details.js b/app/components/task-details.js index 9cecb4be1..b64854281 100644 --- a/app/components/task-details.js +++ b/app/components/task-details.js @@ -1,13 +1,7 @@ -import Ember from 'ember'; - -const { - Component, - computed, - computed: { alias }, - get, - inject: { service }, - set -} = Ember; +import Component from '@ember/component'; +import { alias } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; +import { set, get, computed } from '@ember/object'; /** The task-details component composes a task object, it's author, info, diff --git a/app/components/task-header.js b/app/components/task-header.js index 1934b70c6..f83b87095 100644 --- a/app/components/task-header.js +++ b/app/components/task-header.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; /** The task-header component represents the header of a task. It is composed of diff --git a/app/components/task-list-cards.js b/app/components/task-list-cards.js index 744b5622e..1bad08b05 100644 --- a/app/components/task-list-cards.js +++ b/app/components/task-list-cards.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; import EmberDragulaContainer from 'ember-dragula/components/ember-dragula-container'; -const { - computed: { alias } -} = Ember; - export default EmberDragulaContainer.extend({ attributeBindings: ['data-model-id', 'data-model-type'], classNames: ['task-list-cards'], diff --git a/app/components/task-new-form.js b/app/components/task-new-form.js index 30653b0dc..421094289 100644 --- a/app/components/task-new-form.js +++ b/app/components/task-new-form.js @@ -1,10 +1,6 @@ +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; import { alias, and, empty, notEmpty } from '@ember/object/computed'; -import Ember from 'ember'; - -const { - Component, - inject: { service } -} = Ember; /** The task-new-form component is used for creating new tasks. It includes diff --git a/app/components/task-status-button.js b/app/components/task-status-button.js index 6f682cda8..8ba287bb1 100644 --- a/app/components/task-status-button.js +++ b/app/components/task-status-button.js @@ -1,11 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - computed: { equal }, - get, - set -} = Ember; +import Component from '@ember/component'; +import { equal } from '@ember/object/computed'; +import { set, get } from '@ember/object'; /** The task-status-button component is a button that is used for closing and diff --git a/app/components/task-status.js b/app/components/task-status.js index 7849fa8a0..f7d3dcfa7 100644 --- a/app/components/task-status.js +++ b/app/components/task-status.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - computed: { alias } -} = Ember; +import Component from '@ember/component'; +import { alias } from '@ember/object/computed'; /** A badge that presents a task's status diff --git a/app/components/task-title.js b/app/components/task-title.js index 82c00e35a..9e2bbaf78 100644 --- a/app/components/task-title.js +++ b/app/components/task-title.js @@ -1,12 +1,7 @@ -import Ember from 'ember'; - -const { - Component, - computed, - get, - inject: { service }, - set -} = Ember; +import { alias } from '@ember/object/computed'; +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; +import { set, get, computed } from '@ember/object'; /** @class task-title @@ -29,7 +24,7 @@ export default Component.extend({ @property canEdit @type Boolean */ - canEdit: computed.alias('currentUserIsTaskAuthor'), + canEdit: alias('currentUserIsTaskAuthor'), /** Returns the current user's ID. @@ -37,7 +32,7 @@ export default Component.extend({ @property currentUserId @type Number */ - currentUserId: computed.alias('currentUser.user.id'), + currentUserId: alias('currentUser.user.id'), /** Returns the task author's ID. @@ -45,7 +40,7 @@ export default Component.extend({ @property taskAuthorId @type Number */ - taskAuthorId: computed.alias('task.user.id'), + taskAuthorId: alias('task.user.id'), /** Consumes `currentUserId` and `taskAuthorId` and returns if the current user diff --git a/app/components/task/sidebar/integrations-section.js b/app/components/task/sidebar/integrations-section.js index f66126838..2f726ac49 100644 --- a/app/components/task/sidebar/integrations-section.js +++ b/app/components/task/sidebar/integrations-section.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['task-sidebar-section'], diff --git a/app/components/team-member.js b/app/components/team-member.js index a00b71797..7a765bfce 100644 --- a/app/components/team-member.js +++ b/app/components/team-member.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - computed -} = Ember; +import Component from '@ember/component'; +import { computed } from '@ember/object'; export default Component.extend({ tagName: 'li', diff --git a/app/components/thank-you-container.js b/app/components/thank-you-container.js index b9e46d2e1..8ea43ac53 100644 --- a/app/components/thank-you-container.js +++ b/app/components/thank-you-container.js @@ -1,12 +1,7 @@ -import Ember from 'ember'; - -const { - Component, - computed, - computed: { filter, mapBy }, - get, - inject: { service } -} = Ember; +import Component from '@ember/component'; +import { mapBy, filter } from '@ember/object/computed'; +import { get, computed } from '@ember/object'; +import { inject as service } from '@ember/service'; const MAX_VOLUNTEERS = 12; diff --git a/app/components/user-byline.js b/app/components/user-byline.js index c03e40765..53927dff9 100644 --- a/app/components/user-byline.js +++ b/app/components/user-byline.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Component -} = Ember; +import Component from '@ember/component'; export default Component.extend({ tagName: 'span', diff --git a/app/components/user-details.js b/app/components/user-details.js index 0e9a1c8b9..9a97b4164 100644 --- a/app/components/user-details.js +++ b/app/components/user-details.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - computed: { mapBy } -} = Ember; +import Component from '@ember/component'; +import { mapBy } from '@ember/object/computed'; export default Component.extend({ classNames: ['user-details'], diff --git a/app/components/user-dropdown.js b/app/components/user-dropdown.js index 4a4748cc1..9d1ecaa8b 100644 --- a/app/components/user-dropdown.js +++ b/app/components/user-dropdown.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Component, - inject: { service } -} = Ember; +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; /** `user-dropdown` is the dropdown used for navigation within the main site diff --git a/app/components/user-list-item.js b/app/components/user-list-item.js index 90edcdd6a..84db8b1c9 100644 --- a/app/components/user-list-item.js +++ b/app/components/user-list-item.js @@ -1,11 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - get, - inject: { service }, - set -} = Ember; +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; +import { set, get } from '@ember/object'; export default Component.extend({ classNames: ['user-list-item'], diff --git a/app/components/user-menu.js b/app/components/user-menu.js index 1c33311ef..12c07d72a 100644 --- a/app/components/user-menu.js +++ b/app/components/user-menu.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { Component, set } = Ember; +import Component from '@ember/component'; +import { set } from '@ember/object'; /** The user-menu component is used to show/hide the user-dropdown menu diff --git a/app/components/user-projects-list.js b/app/components/user-projects-list.js index 7ecc5d6be..223344bd6 100644 --- a/app/components/user-projects-list.js +++ b/app/components/user-projects-list.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['user-projects-list'] diff --git a/app/components/user-settings-form.js b/app/components/user-settings-form.js index e0d78f787..9a4d22fec 100644 --- a/app/components/user-settings-form.js +++ b/app/components/user-settings-form.js @@ -1,11 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - get, - inject: { service }, - set -} = Ember; +import Component from '@ember/component'; +import { inject as service } from '@ember/service'; +import { set, get } from '@ember/object'; /** `user-settings-form` composes the form for changing a user's settings diff --git a/app/components/user-sidebar.js b/app/components/user-sidebar.js index 81839d319..70aa22ba8 100644 --- a/app/components/user-sidebar.js +++ b/app/components/user-sidebar.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; /** `user-sidebar` is a sidebar on the user's profile diff --git a/app/components/user/display-username.js b/app/components/user/display-username.js index 297d50d64..84f4da74c 100644 --- a/app/components/user/display-username.js +++ b/app/components/user/display-username.js @@ -1,11 +1,6 @@ -import Ember from 'ember'; - -const { - Component, - computed, - computed: { alias }, - get -} = Ember; +import Component from '@ember/component'; +import { alias } from '@ember/object/computed'; +import { get, computed } from '@ember/object'; export default Component.extend({ tagName: 'span', diff --git a/app/components/volunteer-headshot.js b/app/components/volunteer-headshot.js index 67d1e1226..871d7740c 100644 --- a/app/components/volunteer-headshot.js +++ b/app/components/volunteer-headshot.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; - -const { - Component, - computed, - get, - isPresent -} = Ember; +import { alias } from '@ember/object/computed'; +import Component from '@ember/component'; +import { get, computed } from '@ember/object'; +import { isPresent } from '@ember/utils'; /** The `volunteer-headshot` component presents a thumbnail of a volunteer, their @@ -30,7 +26,7 @@ export default Component.extend({ @property userRoles @type Ember.Array */ - userRoles: computed.alias('volunteer.userRoles'), + userRoles: alias('volunteer.userRoles'), /** A randomly selected role from the `userRoles` property. diff --git a/app/controllers/application.js b/app/controllers/application.js index f6804fa52..990dd9a46 100644 --- a/app/controllers/application.js +++ b/app/controllers/application.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; - -const { - computed, - Controller, - get, - inject: { service } -} = Ember; +import { not, alias, and } from '@ember/object/computed'; +import Controller from '@ember/controller'; +import { get } from '@ember/object'; +import { inject as service } from '@ember/service'; export default Controller.extend({ codeTheme: service(), @@ -13,13 +9,13 @@ export default Controller.extend({ projectTaskBoard: service(), session: service(), - isNotOnboarding: computed.not('isOnboarding'), - isNotViewingProjectTaskBoard: computed.not('isViewingProjectTaskBoard'), - isOnboarding: computed.alias('onboarding.isOnboarding'), - isViewingProjectTaskBoard: computed.alias('projectTaskBoard.isViewing'), + isNotOnboarding: not('isOnboarding'), + isNotViewingProjectTaskBoard: not('isViewingProjectTaskBoard'), + isOnboarding: alias('onboarding.isOnboarding'), + isViewingProjectTaskBoard: alias('projectTaskBoard.isViewing'), - shouldShowFooter: computed.and('isNotOnboarding', 'isNotViewingProjectTaskBoard'), - shouldShowSpacer: computed.alias('isNotViewingProjectTaskBoard'), + shouldShowFooter: and('isNotOnboarding', 'isNotViewingProjectTaskBoard'), + shouldShowSpacer: alias('isNotViewingProjectTaskBoard'), actions: { invalidateSession() { diff --git a/app/controllers/index.js b/app/controllers/index.js index 0b27f4cfe..0496fe82f 100644 --- a/app/controllers/index.js +++ b/app/controllers/index.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Controller } = Ember; +import Controller from '@ember/controller'; export default Controller.extend({ typedStrings: [ diff --git a/app/controllers/project/checkout.js b/app/controllers/project/checkout.js index df48ee504..dea2d9741 100644 --- a/app/controllers/project/checkout.js +++ b/app/controllers/project/checkout.js @@ -1,17 +1,11 @@ -import Ember from 'ember'; +import Controller from '@ember/controller'; +import { not, bool, alias } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; +import { set, getProperties, get } from '@ember/object'; +import RSVP from 'rsvp'; import FriendlyError from 'code-corps-ember/utils/friendly-error'; import { isValidationError } from 'code-corps-ember/utils/error-utils'; -const { - Controller, - computed: { alias, bool, not }, - get, - getProperties, - inject: { service }, - set, - RSVP -} = Ember; - const CUSTOMER_CREATION_ERROR = 'There was a problem in connecting your account with our payment processor. Please try again.'; const CARD_CREATION_ERROR = 'There was a problem in using your payment information. Please try again.'; const SUBSCRIPTION_CREATION_ERROR = 'There was a problem in setting up your monthly donation. Please try again.'; diff --git a/app/controllers/project/donate.js b/app/controllers/project/donate.js index a3522b2a0..fd385de07 100644 --- a/app/controllers/project/donate.js +++ b/app/controllers/project/donate.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; - -const { - Controller, - computed: { alias }, - get -} = Ember; +import Controller from '@ember/controller'; +import { alias } from '@ember/object/computed'; +import { get } from '@ember/object'; export default Controller.extend({ amount: 25, diff --git a/app/controllers/project/index.js b/app/controllers/project/index.js index 7eaec653f..d83ba8787 100644 --- a/app/controllers/project/index.js +++ b/app/controllers/project/index.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; - -const { - Controller, - computed: { alias, mapBy }, - inject: { service } -} = Ember; +import Controller from '@ember/controller'; +import { mapBy, alias } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; export default Controller.extend({ currentUser: service(), diff --git a/app/controllers/project/settings/donations/goals.js b/app/controllers/project/settings/donations/goals.js index 36a057c97..e4bf7ca0c 100644 --- a/app/controllers/project/settings/donations/goals.js +++ b/app/controllers/project/settings/donations/goals.js @@ -1,14 +1,9 @@ -import Ember from 'ember'; +import Controller from '@ember/controller'; +import { inject as service } from '@ember/service'; +import { set, get } from '@ember/object'; import FriendlyError from 'code-corps-ember/utils/friendly-error'; import { isValidationError } from 'code-corps-ember/utils/error-utils'; -const { - Controller, - get, - inject: { service }, - set -} = Ember; - const PROBLEM_SAVING_DONATION_GOAL = 'There was a problem saving your donation goal. Please try again.'; export default Controller.extend({ diff --git a/app/controllers/project/settings/donations/payments.js b/app/controllers/project/settings/donations/payments.js index 9a623970e..7932a0b4b 100644 --- a/app/controllers/project/settings/donations/payments.js +++ b/app/controllers/project/settings/donations/payments.js @@ -1,16 +1,11 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import Controller from '@ember/controller'; +import { inject as service } from '@ember/service'; +import { merge } from '@ember/polyfills'; +import RSVP from 'rsvp'; +import { set, get } from '@ember/object'; import FriendlyError from 'code-corps-ember/utils/friendly-error'; -const { - computed: { alias }, - Controller, - get, - inject: { service }, - merge, - RSVP, - set -} = Ember; - const ACCOUNT_CREATION_ERROR = 'There was a problem with creating your account. Please check your input and try again.'; const ACCOUNT_UPDATE_ERROR = 'There was a problem with your account information. Please check your input and try again.'; const BANK_ACCOUNT_TOKEN_CREATION_ERROR = 'There was a problem in using your bank account information. Please check your input and try again.'; diff --git a/app/controllers/project/settings/profile.js b/app/controllers/project/settings/profile.js index 8c25f2c4a..15c028619 100644 --- a/app/controllers/project/settings/profile.js +++ b/app/controllers/project/settings/profile.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; - -const { - computed: { alias }, - Controller, - get, - inject: { service } -} = Ember; +import { alias } from '@ember/object/computed'; +import Controller from '@ember/controller'; +import { get } from '@ember/object'; +import { inject as service } from '@ember/service'; export default Controller.extend({ projectSkillsList: service(), diff --git a/app/controllers/project/tasks/new.js b/app/controllers/project/tasks/new.js index abd4d45be..739d09b9b 100644 --- a/app/controllers/project/tasks/new.js +++ b/app/controllers/project/tasks/new.js @@ -1,14 +1,9 @@ -import Ember from 'ember'; +import { mapBy } from '@ember/object/computed'; +import Controller from '@ember/controller'; +import RSVP from 'rsvp'; +import { set, get } from '@ember/object'; import { isNonValidationError } from 'code-corps-ember/utils/error-utils'; -const { - computed: { mapBy }, - Controller, - get, - RSVP, - set -} = Ember; - export default Controller.extend({ unsavedTaskSkills: [], diff --git a/app/controllers/project/tasks/task.js b/app/controllers/project/tasks/task.js index 59302e3e5..a54701b02 100644 --- a/app/controllers/project/tasks/task.js +++ b/app/controllers/project/tasks/task.js @@ -1,15 +1,9 @@ -import Ember from 'ember'; +import { filterBy, alias } from '@ember/object/computed'; +import Controller from '@ember/controller'; +import { inject as service } from '@ember/service'; +import { set, getProperties, get } from '@ember/object'; import { isNonValidationError } from 'code-corps-ember/utils/error-utils'; -const { - computed: { alias, filterBy }, - Controller, - get, - getProperties, - inject: { service }, - set -} = Ember; - export default Controller.extend({ /** diff --git a/app/controllers/settings/profile.js b/app/controllers/settings/profile.js index dbbee632e..b159d6ea3 100644 --- a/app/controllers/settings/profile.js +++ b/app/controllers/settings/profile.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; - -const { - computed: { alias }, - Controller, - get, - inject: { service } -} = Ember; +import { alias } from '@ember/object/computed'; +import Controller from '@ember/controller'; +import { get } from '@ember/object'; +import { inject as service } from '@ember/service'; export default Controller.extend({ userSkillsList: service(), diff --git a/app/controllers/start/expertise.js b/app/controllers/start/expertise.js index 2d2240c1c..eaf222d96 100644 --- a/app/controllers/start/expertise.js +++ b/app/controllers/start/expertise.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; +import Controller from '@ember/controller'; +import { inject as service } from '@ember/service'; import OnboardingControllerMixin from '../../mixins/onboarding-controller'; -const { - Controller, - inject: { service } -} = Ember; - export default Controller.extend(OnboardingControllerMixin, { userRoles: service() }); diff --git a/app/controllers/start/hello.js b/app/controllers/start/hello.js index da96af703..1bd7d30a9 100644 --- a/app/controllers/start/hello.js +++ b/app/controllers/start/hello.js @@ -1,14 +1,9 @@ -import Ember from 'ember'; +import { empty, or } from '@ember/object/computed'; +import Controller from '@ember/controller'; +import { inject as service } from '@ember/service'; +import { set, get } from '@ember/object'; import OnboardingControllerMixin from '../../mixins/onboarding-controller'; -const { - computed, - Controller, - get, - inject: { service }, - set -} = Ember; - export default Controller.extend(OnboardingControllerMixin, { /** * disables continue button while uploading @@ -17,9 +12,9 @@ export default Controller.extend(OnboardingControllerMixin, { */ uploadingImage: false, - firstNameIsEmpty: computed.empty('model.firstName'), - lastNameIsEmpty: computed.empty('model.lastName'), - usersNameIsEmpty: computed.or('firstNameIsEmpty', 'lastNameIsEmpty'), + firstNameIsEmpty: empty('model.firstName'), + lastNameIsEmpty: empty('model.lastName'), + usersNameIsEmpty: or('firstNameIsEmpty', 'lastNameIsEmpty'), flashMessages: service(), loadingBar: service(), diff --git a/app/controllers/start/interests.js b/app/controllers/start/interests.js index 7184c2120..bc87bf970 100644 --- a/app/controllers/start/interests.js +++ b/app/controllers/start/interests.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; +import Controller from '@ember/controller'; +import { inject as service } from '@ember/service'; import OnboardingControllerMixin from '../../mixins/onboarding-controller'; -const { - Controller, - inject: { service } -} = Ember; - export default Controller.extend(OnboardingControllerMixin, { userCategories: service() }); diff --git a/app/controllers/start/skills.js b/app/controllers/start/skills.js index f5d862c3a..7f57ab0f8 100644 --- a/app/controllers/start/skills.js +++ b/app/controllers/start/skills.js @@ -1,13 +1,9 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import Controller from '@ember/controller'; +import { get } from '@ember/object'; +import { inject as service } from '@ember/service'; import OnboardingControllerMixin from '../../mixins/onboarding-controller'; -const { - computed: { alias }, - Controller, - get, - inject: { service } -} = Ember; - export default Controller.extend(OnboardingControllerMixin, { currentUser: service(), store: service(), diff --git a/app/helpers/capitalize.js b/app/helpers/capitalize.js index f6e98b6a0..fc761daae 100644 --- a/app/helpers/capitalize.js +++ b/app/helpers/capitalize.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - isEmpty, - Helper -} = Ember; +import { isEmpty } from '@ember/utils'; +import Helper from '@ember/component/helper'; export function capitalize([string]) { if (isEmpty(string)) { diff --git a/app/helpers/end-with-period.js b/app/helpers/end-with-period.js index 3347ea929..dab178091 100644 --- a/app/helpers/end-with-period.js +++ b/app/helpers/end-with-period.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Helper } = Ember; +import Helper from '@ember/component/helper'; export function endWithPeriod([string]) { let lastCharacter = string.slice(-1); diff --git a/app/helpers/float.js b/app/helpers/float.js index ba61f1701..fa4dd916f 100644 --- a/app/helpers/float.js +++ b/app/helpers/float.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Helper: { helper } -} = Ember; +import { helper } from '@ember/component/helper'; function convertToFloat(value) { return parseFloat(value); diff --git a/app/helpers/format-currency.js b/app/helpers/format-currency.js index f87ea6a39..eee482aa0 100644 --- a/app/helpers/format-currency.js +++ b/app/helpers/format-currency.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; +import { helper } from '@ember/component/helper'; import prettyFloat from 'code-corps-ember/utils/pretty-float'; -const { - Helper: { helper } -} = Ember; - const COMMAS_EVERY_THREE_DIGITS = /(\d)(?=(\d{3})+(?!\d))/g; function applyFormatting(dollars) { diff --git a/app/helpers/format-percentage.js b/app/helpers/format-percentage.js index 2ec33dee8..0525c2b95 100644 --- a/app/helpers/format-percentage.js +++ b/app/helpers/format-percentage.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; +import { helper } from '@ember/component/helper'; import prettyFloat from 'code-corps-ember/utils/pretty-float'; -const { - Helper: { helper } -} = Ember; - function applyFormatting(percentage) { return percentage.length == 0 ? '' : `${percentage}%`; } diff --git a/app/helpers/highlight-substrings.js b/app/helpers/highlight-substrings.js index 82468832a..937332046 100644 --- a/app/helpers/highlight-substrings.js +++ b/app/helpers/highlight-substrings.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { Helper, isEmpty } = Ember; +import Helper from '@ember/component/helper'; +import { isEmpty } from '@ember/utils'; export function highlightSubstrings([string, substring]) { if (isEmpty(substring) || isEmpty(string)) { diff --git a/app/initializers/promise.js b/app/initializers/promise.js index 55a62e1d8..edf891486 100644 --- a/app/initializers/promise.js +++ b/app/initializers/promise.js @@ -3,9 +3,7 @@ // This change guaranties that async code runs with the Ember run-loop in mind. // To elaborate, without this, until ember-cli fully supports ecma8, we might get // errors along the lines of 'calling set on destroyed object' -import Ember from 'ember'; - -const { RSVP } = Ember; +import RSVP from 'rsvp'; export function initialize() { window.Promise = RSVP.Promise; diff --git a/app/mixins/can-animate.js b/app/mixins/can-animate.js index 825a8e7a0..42f4ad6cc 100644 --- a/app/mixins/can-animate.js +++ b/app/mixins/can-animate.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; - -const { - $, - computed, - Mixin, - run -} = Ember; +import $ from 'jquery'; +import { computed } from '@ember/object'; +import Mixin from '@ember/object/mixin'; +import { run } from '@ember/runloop'; export default Mixin.create({ scrollTimeout: 100, diff --git a/app/mixins/contains-code.js b/app/mixins/contains-code.js index c2fb4f06a..a0dd9dec1 100644 --- a/app/mixins/contains-code.js +++ b/app/mixins/contains-code.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - computed, - Mixin -} = Ember; +import { computed } from '@ember/object'; +import Mixin from '@ember/object/mixin'; /** * `contains-code` provides a computed property to the extended class diff --git a/app/mixins/loading-bar.js b/app/mixins/loading-bar.js index ad5fde73f..0d009faba 100644 --- a/app/mixins/loading-bar.js +++ b/app/mixins/loading-bar.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; - -const { - get, - inject: { service }, - Mixin -} = Ember; +import { get } from '@ember/object'; +import { inject as service } from '@ember/service'; +import Mixin from '@ember/object/mixin'; export default Mixin.create({ loadingBar: service(), diff --git a/app/mixins/onboarding-controller.js b/app/mixins/onboarding-controller.js index e023f7776..baef1db0f 100644 --- a/app/mixins/onboarding-controller.js +++ b/app/mixins/onboarding-controller.js @@ -1,19 +1,13 @@ -import Ember from 'ember'; - -const { - computed, - get, - getProperties, - inject: { service }, - Mixin, - set -} = Ember; +import { alias } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; +import Mixin from '@ember/object/mixin'; +import { set, getProperties, get } from '@ember/object'; export default Mixin.create({ currentUser: service(), onboarding: service(), - user: computed.alias('currentUser.user'), + user: alias('currentUser.user'), actions: { continue() { diff --git a/app/models/project.js b/app/models/project.js index 54768900f..1ceef93e6 100644 --- a/app/models/project.js +++ b/app/models/project.js @@ -1,9 +1,8 @@ +import { gt, filterBy } from '@ember/object/computed'; +import { get, computed } from '@ember/object'; import Model from 'ember-data/model'; import attr from 'ember-data/attr'; import { belongsTo, hasMany } from 'ember-data/relationships'; -import Ember from 'ember'; - -const { computed, computed: { filterBy, gt }, get } = Ember; export default Model.extend({ approved: attr(), diff --git a/app/models/role.js b/app/models/role.js index 8e10576ad..d24587355 100644 --- a/app/models/role.js +++ b/app/models/role.js @@ -1,9 +1,7 @@ +import { equal } from '@ember/object/computed'; import Model from 'ember-data/model'; import attr from 'ember-data/attr'; import { hasMany } from 'ember-data/relationships'; -import Ember from 'ember'; - -const { computed } = Ember; export default Model.extend({ ability: attr(), @@ -12,7 +10,7 @@ export default Model.extend({ userRoles: hasMany('user-role', { async: true }), - isCreative: computed.equal('kind', 'creative'), - isSupport: computed.equal('kind', 'support'), - isTechnology: computed.equal('kind', 'technology') + isCreative: equal('kind', 'creative'), + isSupport: equal('kind', 'support'), + isTechnology: equal('kind', 'technology') }); diff --git a/app/models/task-list.js b/app/models/task-list.js index 86c7775e1..87538e09f 100644 --- a/app/models/task-list.js +++ b/app/models/task-list.js @@ -1,13 +1,8 @@ +import { sort } from '@ember/object/computed'; import Model from 'ember-data/model'; import attr from 'ember-data/attr'; import { belongsTo, hasMany } from 'ember-data/relationships'; -import Ember from 'ember'; - -const { - computed: { sort } -} = Ember; - /** Task-list is a collection of categorized tasks that belong to a project. diff --git a/app/models/user.js b/app/models/user.js index 7ffe1ec89..45e56979a 100644 --- a/app/models/user.js +++ b/app/models/user.js @@ -1,9 +1,7 @@ +import { computed } from '@ember/object'; import Model from 'ember-data/model'; import attr from 'ember-data/attr'; import { belongsTo, hasMany } from 'ember-data/relationships'; -import Ember from 'ember'; - -const { computed } = Ember; export default Model.extend({ biography: attr(), diff --git a/app/router.js b/app/router.js index 1bd648502..9a79efac2 100644 --- a/app/router.js +++ b/app/router.js @@ -1,13 +1,9 @@ -import Ember from 'ember'; +import { get } from '@ember/object'; +import { inject as service } from '@ember/service'; +import { run } from '@ember/runloop'; import EmberRouter from '@ember/routing/router'; import config from './config/environment'; -const { - get, - inject: { service }, - run -} = Ember; - const Router = EmberRouter.extend({ location: config.locationType, rootURL: config.rootURL, diff --git a/app/routes/about.js b/app/routes/about.js index 7e6eac3e8..63cdfc3df 100644 --- a/app/routes/about.js +++ b/app/routes/about.js @@ -1,5 +1,3 @@ -import Ember from 'ember'; - -const { Route } = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ }); diff --git a/app/routes/application.js b/app/routes/application.js index f0c265072..9ba5fc72e 100644 --- a/app/routes/application.js +++ b/app/routes/application.js @@ -1,17 +1,12 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; +import { isPresent } from '@ember/utils'; +import Route from '@ember/routing/route'; +import { set, get } from '@ember/object'; import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin'; import ENV from 'code-corps-ember/config/environment'; import LoadingBar from 'code-corps-ember/mixins/loading-bar'; -const { - computed, - get, - inject: { service }, - isPresent, - Route, - set -} = Ember; - export default Route.extend(ApplicationRouteMixin, LoadingBar, { currentUser: service(), flashMessages: service(), @@ -19,8 +14,8 @@ export default Route.extend(ApplicationRouteMixin, LoadingBar, { onboarding: service(), i18n: service(), - isOnboarding: computed.alias('onboarding.isOnboarding'), - onboardingRoute: computed.alias('onboarding.routeForCurrentStep'), + isOnboarding: alias('onboarding.isOnboarding'), + onboardingRoute: alias('onboarding.routeForCurrentStep'), headTags: [ { diff --git a/app/routes/github.js b/app/routes/github.js index ee61db26b..26a15a306 100644 --- a/app/routes/github.js +++ b/app/routes/github.js @@ -1,13 +1,9 @@ -import Ember from 'ember'; +import { get } from '@ember/object'; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; import { formatError } from 'code-corps-ember/utils/error-utils'; -const { - get, - inject: { service }, - Route -} = Ember; - const STATE_INVALID = 'Something went wrong while connecting to GitHub. Please try again.'; export default Route.extend(AuthenticatedRouteMixin, { diff --git a/app/routes/index.js b/app/routes/index.js index 59741a071..41652b141 100644 --- a/app/routes/index.js +++ b/app/routes/index.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; - -const { - get, - inject: { service }, - Route -} = Ember; +import { get } from '@ember/object'; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; export default Route.extend({ session: service(), diff --git a/app/routes/login.js b/app/routes/login.js index e227c79a3..d03184467 100644 --- a/app/routes/login.js +++ b/app/routes/login.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; +import Route from '@ember/routing/route'; import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin'; -const { Route } = Ember; - export default Route.extend(UnauthenticatedRouteMixin, { }); diff --git a/app/routes/organizations/slugged-route.js b/app/routes/organizations/slugged-route.js index 80b70a857..ba73b21dc 100644 --- a/app/routes/organizations/slugged-route.js +++ b/app/routes/organizations/slugged-route.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; +import Route from '@ember/routing/route'; import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; -const { - Route -} = Ember; - export default Route.extend(AuthenticatedRouteMixin, { model(params) { return this.store.queryRecord('slugged-route', { diff --git a/app/routes/organizations/slugged-route/settings.js b/app/routes/organizations/slugged-route/settings.js index 7d395bc64..faa92a4ea 100644 --- a/app/routes/organizations/slugged-route/settings.js +++ b/app/routes/organizations/slugged-route/settings.js @@ -1,12 +1,8 @@ -import Ember from 'ember'; +import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; import { CanMixin } from 'ember-can'; -const { - Route, - inject: { service } -} = Ember; - export default Route.extend(AuthenticatedRouteMixin, CanMixin, { session: service(), diff --git a/app/routes/password/forgot.js b/app/routes/password/forgot.js index f67015218..02e3d196f 100644 --- a/app/routes/password/forgot.js +++ b/app/routes/password/forgot.js @@ -1,5 +1,6 @@ -import Ember from 'ember'; -const { Route, get, inject: { service } } = Ember; +import Route from '@ember/routing/route'; +import { get } from '@ember/object'; +import { inject as service } from '@ember/service'; export default Route.extend({ diff --git a/app/routes/password/reset.js b/app/routes/password/reset.js index 7077c0e55..fd4a75e6f 100644 --- a/app/routes/password/reset.js +++ b/app/routes/password/reset.js @@ -1,5 +1,6 @@ -import Ember from 'ember'; -const { Route, get, set, inject: { service } } = Ember; +import Route from '@ember/routing/route'; +import { set, get } from '@ember/object'; +import { inject as service } from '@ember/service'; export default Route.extend({ queryParams: { diff --git a/app/routes/project.js b/app/routes/project.js index 7d64322ef..5161ed2f0 100644 --- a/app/routes/project.js +++ b/app/routes/project.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Route -} = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ model(params) { diff --git a/app/routes/project/checkout.js b/app/routes/project/checkout.js index e2ea53e5c..639921c71 100644 --- a/app/routes/project/checkout.js +++ b/app/routes/project/checkout.js @@ -1,12 +1,7 @@ -import Ember from 'ember'; - -const { - get, - inject: { service }, - Route, - RSVP, - set -} = Ember; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; +import RSVP from 'rsvp'; +import { set, get } from '@ember/object'; const ALREADY_A_SUBSCRIBER = "You're already supporting this project."; diff --git a/app/routes/project/donate.js b/app/routes/project/donate.js index 8efe77672..e0d0c3cd9 100644 --- a/app/routes/project/donate.js +++ b/app/routes/project/donate.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; - -const { - get, - inject: { service }, - Route, - RSVP -} = Ember; +import { get } from '@ember/object'; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; +import RSVP from 'rsvp'; const ALREADY_A_SUBSCRIBER = "You're already supporting this project."; diff --git a/app/routes/project/index.js b/app/routes/project/index.js index e454d9b84..9c64de84c 100644 --- a/app/routes/project/index.js +++ b/app/routes/project/index.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; - -const { - inject: { service }, - Route, - RSVP -} = Ember; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; +import RSVP from 'rsvp'; export default Route.extend({ userSubscriptions: service(), diff --git a/app/routes/project/settings.js b/app/routes/project/settings.js index fb21f5d13..14a0102d6 100644 --- a/app/routes/project/settings.js +++ b/app/routes/project/settings.js @@ -1,13 +1,9 @@ -import Ember from 'ember'; +import { get } from '@ember/object'; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; import { CanMixin } from 'ember-can'; -const { - get, - inject: { service }, - Route -} = Ember; - export default Route.extend(AuthenticatedRouteMixin, CanMixin, { projectSkillsList: service(), session: service(), diff --git a/app/routes/project/settings/contributors.js b/app/routes/project/settings/contributors.js index d78fb0e8b..5da9fadda 100644 --- a/app/routes/project/settings/contributors.js +++ b/app/routes/project/settings/contributors.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Route } = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ model() { diff --git a/app/routes/project/settings/donations/goals.js b/app/routes/project/settings/donations/goals.js index 788194e91..a3ddf9021 100644 --- a/app/routes/project/settings/donations/goals.js +++ b/app/routes/project/settings/donations/goals.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Route -} = Ember; +import Route from '@ember/routing/route'; /** * `project.settings.donations` diff --git a/app/routes/project/settings/donations/payments.js b/app/routes/project/settings/donations/payments.js index a1b0df573..489baa68f 100644 --- a/app/routes/project/settings/donations/payments.js +++ b/app/routes/project/settings/donations/payments.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Route -} = Ember; +import Route from '@ember/routing/route'; /** * `project.settings.donations.payments` diff --git a/app/routes/project/settings/integrations.js b/app/routes/project/settings/integrations.js index 79fb4a4c0..6b62afc6a 100644 --- a/app/routes/project/settings/integrations.js +++ b/app/routes/project/settings/integrations.js @@ -1,13 +1,8 @@ -import Ember from 'ember'; - -const { - computed: { alias }, - get, - inject: { service }, - Route, - RSVP, - setProperties -} = Ember; +import { alias } from '@ember/object/computed'; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; +import RSVP from 'rsvp'; +import { setProperties, get } from '@ember/object'; export default Route.extend({ currentUser: service(), diff --git a/app/routes/project/tasks.js b/app/routes/project/tasks.js index 5cb91281a..b879f4440 100644 --- a/app/routes/project/tasks.js +++ b/app/routes/project/tasks.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Route } = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ model() { diff --git a/app/routes/project/tasks/new.js b/app/routes/project/tasks/new.js index 2b38217eb..ac99da9e6 100644 --- a/app/routes/project/tasks/new.js +++ b/app/routes/project/tasks/new.js @@ -1,15 +1,10 @@ +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; +import RSVP from 'rsvp'; +import { set, get } from '@ember/object'; import EmberCan from 'ember-can'; -import Ember from 'ember'; import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; -const { - get, - inject: { service }, - Route, - RSVP, - set -} = Ember; - export default Route.extend(AuthenticatedRouteMixin, { currentUser: service(), diff --git a/app/routes/project/tasks/task.js b/app/routes/project/tasks/task.js index 2547438ee..f2132348e 100644 --- a/app/routes/project/tasks/task.js +++ b/app/routes/project/tasks/task.js @@ -1,11 +1,6 @@ -import Ember from 'ember'; - -const { - get, - inject: { service }, - Route, - setProperties -} = Ember; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; +import { setProperties, get } from '@ember/object'; export default Route.extend({ currentUser: service(), diff --git a/app/routes/project/thank-you.js b/app/routes/project/thank-you.js index 480de64a8..f2bf4406c 100644 --- a/app/routes/project/thank-you.js +++ b/app/routes/project/thank-you.js @@ -1,7 +1,5 @@ +import Route from '@ember/routing/route'; import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; -import Ember from 'ember'; - -const { Route } = Ember; export default Route.extend(AuthenticatedRouteMixin, { model() { diff --git a/app/routes/projects-list.js b/app/routes/projects-list.js index 1c8a3b44e..08dd94ecc 100644 --- a/app/routes/projects-list.js +++ b/app/routes/projects-list.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Route } = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ model() { diff --git a/app/routes/projects.js b/app/routes/projects.js index 1f73cf767..8cf6569ad 100644 --- a/app/routes/projects.js +++ b/app/routes/projects.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Route } = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ model(params) { diff --git a/app/routes/settings.js b/app/routes/settings.js index 6a68dfda2..11ae97a2f 100644 --- a/app/routes/settings.js +++ b/app/routes/settings.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; +import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; -const { - Route, - inject: { service } -} = Ember; - export default Route.extend(AuthenticatedRouteMixin, { currentUser: service(), diff --git a/app/routes/signup.js b/app/routes/signup.js index 98887ffbe..4f6b76084 100644 --- a/app/routes/signup.js +++ b/app/routes/signup.js @@ -1,14 +1,9 @@ -import Ember from 'ember'; +import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; +import { set, get } from '@ember/object'; import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin'; import { isNonValidationError } from 'code-corps-ember/utils/error-utils'; -const { - get, - Route, - inject: { service }, - set -} = Ember; - export default Route.extend(UnauthenticatedRouteMixin, { queryParams: { context: 'default' }, diff --git a/app/routes/slugged-route.js b/app/routes/slugged-route.js index b85398dd8..6419ec18e 100644 --- a/app/routes/slugged-route.js +++ b/app/routes/slugged-route.js @@ -1,8 +1,4 @@ -import Ember from 'ember'; - -const { - Route -} = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ diff --git a/app/routes/start.js b/app/routes/start.js index 829cec108..713bf8f7a 100644 --- a/app/routes/start.js +++ b/app/routes/start.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; +import Route from '@ember/routing/route'; import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; -const { Route } = Ember; - export default Route.extend(AuthenticatedRouteMixin, { }); diff --git a/app/routes/start/expertise.js b/app/routes/start/expertise.js index 53e9bf681..112f669aa 100644 --- a/app/routes/start/expertise.js +++ b/app/routes/start/expertise.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Route, - inject: { service } -} = Ember; +import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; export default Route.extend({ currentUser: service(), diff --git a/app/routes/start/hello.js b/app/routes/start/hello.js index 48d16e2fe..665f51ec1 100644 --- a/app/routes/start/hello.js +++ b/app/routes/start/hello.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Route, - inject: { service } -} = Ember; +import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; export default Route.extend({ currentUser: service(), diff --git a/app/routes/start/interests.js b/app/routes/start/interests.js index dd291a76b..696a9e3a6 100644 --- a/app/routes/start/interests.js +++ b/app/routes/start/interests.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Route } = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ model() { diff --git a/app/routes/start/skills.js b/app/routes/start/skills.js index a5984c1f3..e12091cf7 100644 --- a/app/routes/start/skills.js +++ b/app/routes/start/skills.js @@ -1,6 +1,6 @@ -import Ember from 'ember'; - -const { get, inject: { service }, Route } = Ember; +import { get } from '@ember/object'; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; export default Route.extend({ currentUser: service(), diff --git a/app/routes/team.js b/app/routes/team.js index 7e6eac3e8..63cdfc3df 100644 --- a/app/routes/team.js +++ b/app/routes/team.js @@ -1,5 +1,3 @@ -import Ember from 'ember'; - -const { Route } = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ }); diff --git a/app/routes/terms-of-use.js b/app/routes/terms-of-use.js index 468e0eb32..6c74252aa 100644 --- a/app/routes/terms-of-use.js +++ b/app/routes/terms-of-use.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Route } = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ }); diff --git a/app/services/ajax.js b/app/services/ajax.js index 629abbce5..a0cb4b937 100644 --- a/app/services/ajax.js +++ b/app/services/ajax.js @@ -1,12 +1,7 @@ +import { get, computed } from '@ember/object'; +import { inject as service } from '@ember/service'; import AjaxService from 'ember-ajax/services/ajax'; import ENV from 'code-corps-ember/config/environment'; -import Ember from 'ember'; - -const { - computed, - get, - inject: { service } -} = Ember; export default AjaxService.extend({ host: ENV.API_BASE_URL, diff --git a/app/services/background.js b/app/services/background.js index dc9781578..09a1252a2 100644 --- a/app/services/background.js +++ b/app/services/background.js @@ -1,11 +1,7 @@ -import Ember from 'ember'; - -const { - $, - computed, - run, - Service -} = Ember; +import $ from 'jquery'; +import { computed } from '@ember/object'; +import { run } from '@ember/runloop'; +import Service from '@ember/service'; export default Service.extend({ reset() { diff --git a/app/services/code-theme.js b/app/services/code-theme.js index c774c7eca..ac7dd2ac7 100644 --- a/app/services/code-theme.js +++ b/app/services/code-theme.js @@ -1,14 +1,11 @@ -import Ember from 'ember'; - -const { - computed, - Service -} = Ember; +import { not } from '@ember/object/computed'; +import { computed } from '@ember/object'; +import Service from '@ember/service'; export default Service.extend({ isLight: true, - isDark: computed.not('isLight'), + isDark: not('isLight'), className: computed('isLight', 'isDark', function() { if (this.get('isLight')) { diff --git a/app/services/current-user.js b/app/services/current-user.js index 55e002933..5da7df8f2 100644 --- a/app/services/current-user.js +++ b/app/services/current-user.js @@ -1,13 +1,7 @@ -import Ember from 'ember'; - -const { - get, - inject: { service }, - isEmpty, - RSVP, - Service, - set -} = Ember; +import { isEmpty } from '@ember/utils'; +import RSVP from 'rsvp'; +import Service, { inject as service } from '@ember/service'; +import { set, get } from '@ember/object'; export default Service.extend({ metrics: service(), diff --git a/app/services/drag-state.js b/app/services/drag-state.js index cf917228f..bb62a117b 100644 --- a/app/services/drag-state.js +++ b/app/services/drag-state.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Service } = Ember; +import Service from '@ember/service'; export default Service.extend({ isDragging: false, diff --git a/app/services/github-state.js b/app/services/github-state.js index dfec3eeff..1573683d7 100644 --- a/app/services/github-state.js +++ b/app/services/github-state.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { get, Service, inject: { service } } = Ember; +import { get } from '@ember/object'; +import Service, { inject as service } from '@ember/service'; /** * Converts an integer to a hex string and returns the last two characters diff --git a/app/services/loading-bar.js b/app/services/loading-bar.js index b72174830..e18f5b743 100644 --- a/app/services/loading-bar.js +++ b/app/services/loading-bar.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - Service, - set -} = Ember; +import Service from '@ember/service'; +import { set } from '@ember/object'; export default Service.extend({ isLoading: false, diff --git a/app/services/mention-fetcher.js b/app/services/mention-fetcher.js index 3d5cafcab..9355ceb7b 100644 --- a/app/services/mention-fetcher.js +++ b/app/services/mention-fetcher.js @@ -1,15 +1,6 @@ -import Ember from 'ember'; -// import { parse } from 'code-corps-ember/utils/mention-parser'; - -// NOTE: mentions are disabled until we reimplement them phoenix-side, so right now -// this service just returns the unmodified body - -const { - get, - inject: { service }, - RSVP, - Service -} = Ember; +import { get } from '@ember/object'; +import RSVP from 'rsvp'; +import Service, { inject as service } from '@ember/service'; export default Service.extend({ store: service(), diff --git a/app/services/navigation-menu.js b/app/services/navigation-menu.js index 2c5faa25d..c114ac22d 100644 --- a/app/services/navigation-menu.js +++ b/app/services/navigation-menu.js @@ -1,12 +1,6 @@ -import Ember from 'ember'; - -const { - computed, - computed: { alias, equal }, - get, - inject: { service }, - Service -} = Ember; +import { equal, alias } from '@ember/object/computed'; +import { get, computed } from '@ember/object'; +import Service, { inject as service } from '@ember/service'; export default Service.extend({ currentUser: service(), diff --git a/app/services/onboarding.js b/app/services/onboarding.js index 34fdee23e..117fd40c6 100644 --- a/app/services/onboarding.js +++ b/app/services/onboarding.js @@ -1,13 +1,6 @@ -import Ember from 'ember'; - -const { - computed, - computed: { alias, equal, mapBy, or, union }, - get, - getProperties, - inject: { service }, - Service -} = Ember; +import { union, or, mapBy, equal, alias } from '@ember/object/computed'; +import { getProperties, get, computed } from '@ember/object'; +import Service, { inject as service } from '@ember/service'; export default Service.extend({ currentUser: service(), diff --git a/app/services/project-skills-list.js b/app/services/project-skills-list.js index ecd08f0c9..641e4ab7f 100644 --- a/app/services/project-skills-list.js +++ b/app/services/project-skills-list.js @@ -1,17 +1,8 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import Service, { inject as service } from '@ember/service'; +import { set, getProperties, get } from '@ember/object'; import recordsList from 'code-corps-ember/utils/records-list'; -const { - computed: { - alias - }, - get, - getProperties, - inject: { service }, - Service, - set -} = Ember; - export default Service.extend({ store: service(), diff --git a/app/services/project-task-board.js b/app/services/project-task-board.js index 40367c902..1b677f31a 100644 --- a/app/services/project-task-board.js +++ b/app/services/project-task-board.js @@ -1,13 +1,7 @@ -import Ember from 'ember'; +import Service from '@ember/service'; +import { set, get, computed } from '@ember/object'; import $ from 'jquery'; -const { - computed, - get, - Service, - set -} = Ember; - export default Service.extend({ isViewing: false, diff --git a/app/services/project-user.js b/app/services/project-user.js index 74565ecb6..f92509b47 100644 --- a/app/services/project-user.js +++ b/app/services/project-user.js @@ -1,10 +1,5 @@ -import Ember from 'ember'; - -const { - get, - inject: { service }, - Service -} = Ember; +import { get } from '@ember/object'; +import Service, { inject as service } from '@ember/service'; export default Service.extend({ currentUser: service(), diff --git a/app/services/task-assignment.js b/app/services/task-assignment.js index 2b5f1e90d..f443044d4 100644 --- a/app/services/task-assignment.js +++ b/app/services/task-assignment.js @@ -1,11 +1,5 @@ -import Ember from 'ember'; - -const { - get, - inject: { service }, - Service, - set -} = Ember; +import Service, { inject as service } from '@ember/service'; +import { set, get } from '@ember/object'; export default Service.extend({ store: service(), diff --git a/app/services/task-skills-list.js b/app/services/task-skills-list.js index 804633181..b00fb12a5 100644 --- a/app/services/task-skills-list.js +++ b/app/services/task-skills-list.js @@ -1,17 +1,8 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import Service, { inject as service } from '@ember/service'; +import { set, getProperties, get } from '@ember/object'; import recordsList from 'code-corps-ember/utils/records-list'; -const { - computed: { - alias - }, - get, - getProperties, - inject: { service }, - Service, - set -} = Ember; - export default Service.extend({ store: service(), diff --git a/app/services/user-categories.js b/app/services/user-categories.js index 92fc551fe..a631ad47f 100644 --- a/app/services/user-categories.js +++ b/app/services/user-categories.js @@ -1,17 +1,13 @@ -import Ember from 'ember'; - -const { - computed, - inject: { service }, - Service -} = Ember; +import { empty, alias } from '@ember/object/computed'; +import { computed } from '@ember/object'; +import Service, { inject as service } from '@ember/service'; export default Service.extend({ currentUser: service(), store: service(), - isEmpty: computed.empty('userCategories'), - user: computed.alias('currentUser.user'), + isEmpty: empty('userCategories'), + user: alias('currentUser.user'), userCategories: computed('user.userCategories', 'user.userCategories.@each.category', diff --git a/app/services/user-roles.js b/app/services/user-roles.js index 800efcf42..4913f3a6b 100644 --- a/app/services/user-roles.js +++ b/app/services/user-roles.js @@ -1,17 +1,13 @@ -import Ember from 'ember'; - -const { - computed, - inject: { service }, - Service -} = Ember; +import { empty, alias } from '@ember/object/computed'; +import { computed } from '@ember/object'; +import Service, { inject as service } from '@ember/service'; export default Service.extend({ currentUser: service(), store: service(), - isEmpty: computed.empty('userRoles'), - user: computed.alias('currentUser.user'), + isEmpty: empty('userRoles'), + user: alias('currentUser.user'), userRoles: computed('user.userRoles', 'user.userRoles.@each.role', diff --git a/app/services/user-skills-list.js b/app/services/user-skills-list.js index 15c5e438e..c5f20f4a8 100644 --- a/app/services/user-skills-list.js +++ b/app/services/user-skills-list.js @@ -1,16 +1,8 @@ -import Ember from 'ember'; +import { empty, alias } from '@ember/object/computed'; +import { getProperties, get } from '@ember/object'; +import Service, { inject as service } from '@ember/service'; import recordsList from 'code-corps-ember/utils/records-list'; -const { - computed: { - alias, empty - }, - get, - getProperties, - inject: { service }, - Service -} = Ember; - export default Service.extend({ currentUser: service(), store: service(), diff --git a/app/services/user-subscriptions.js b/app/services/user-subscriptions.js index 0b18f256b..95633cc2f 100644 --- a/app/services/user-subscriptions.js +++ b/app/services/user-subscriptions.js @@ -1,17 +1,12 @@ -import Ember from 'ember'; - -const { - computed, - get, - inject: { service }, - RSVP, - Service -} = Ember; +import { alias } from '@ember/object/computed'; +import { get } from '@ember/object'; +import RSVP from 'rsvp'; +import Service, { inject as service } from '@ember/service'; export default Service.extend({ currentUser: service(), - user: computed.alias('currentUser.user'), + user: alias('currentUser.user'), fetchForProject(project) { let user = get(this, 'user'); diff --git a/app/transforms/array.js b/app/transforms/array.js index 5f747e7c5..29cbe7430 100644 --- a/app/transforms/array.js +++ b/app/transforms/array.js @@ -1,7 +1,6 @@ -import Ember from 'ember'; +import { typeOf } from '@ember/utils'; import DS from 'ember-data'; -const { typeOf } = Ember; const { Transform } = DS; export default Transform.extend({ diff --git a/app/utils/create-task-user-options.js b/app/utils/create-task-user-options.js index cc7f3179b..f93e654b5 100644 --- a/app/utils/create-task-user-options.js +++ b/app/utils/create-task-user-options.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { get, isEmpty } = Ember; +import { get } from '@ember/object'; +import { isEmpty } from '@ember/utils'; /** * Takes in a list of project users, the current user id and, diff --git a/app/utils/mention-parser.js b/app/utils/mention-parser.js index 121fe1b0d..fb447319b 100644 --- a/app/utils/mention-parser.js +++ b/app/utils/mention-parser.js @@ -1,9 +1,5 @@ -import Ember from 'ember'; - -const { - get, - isPresent -} = Ember; +import { get } from '@ember/object'; +import { isPresent } from '@ember/utils'; function parse(body, mentions) { if (isPresent(body) && isPresent(mentions)) { diff --git a/app/utils/records-list.js b/app/utils/records-list.js index 0d00c154f..57d102adf 100644 --- a/app/utils/records-list.js +++ b/app/utils/records-list.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { get } = Ember; +import { get } from '@ember/object'; export default { /** diff --git a/tests/acceptance/github-test.js b/tests/acceptance/github-test.js index d93877d2e..d7175e49b 100644 --- a/tests/acceptance/github-test.js +++ b/tests/acceptance/github-test.js @@ -1,11 +1,9 @@ +import { set } from '@ember/object'; import { test } from 'qunit'; import moduleForAcceptance from 'code-corps-ember/tests/helpers/module-for-acceptance'; import { authenticateSession } from 'code-corps-ember/tests/helpers/ember-simple-auth'; import Mirage from 'ember-cli-mirage'; import page from '../pages/github'; -import Ember from 'ember'; - -const { set } = Ember; const code = 'test_code'; const state = 'test_state'; diff --git a/tests/acceptance/project-checkout-test.js b/tests/acceptance/project-checkout-test.js index b5304aa42..e4f82d61a 100644 --- a/tests/acceptance/project-checkout-test.js +++ b/tests/acceptance/project-checkout-test.js @@ -1,6 +1,7 @@ +import RSVP from 'rsvp'; +import Service from '@ember/service'; import { test } from 'qunit'; import moduleForAcceptance from 'code-corps-ember/tests/helpers/module-for-acceptance'; -import Ember from 'ember'; import Mirage from 'ember-cli-mirage'; import { authenticateSession } from 'code-corps-ember/tests/helpers/ember-simple-auth'; @@ -8,11 +9,6 @@ import { getFlashMessageCount } from 'code-corps-ember/tests/helpers/flash-messa import projectCheckoutPage from '../pages/project/checkout'; import signupPage from '../pages/signup'; -const { - RSVP, - Service -} = Ember; - // NOTE: Don't think these mocks can be moved, unless we can make them more generic than they are // As is, they mock specifically the `stripe` injection for the project.checkout controller diff --git a/tests/helpers/attributes.js b/tests/helpers/attributes.js index 0a7559a7a..ff8c60f80 100644 --- a/tests/helpers/attributes.js +++ b/tests/helpers/attributes.js @@ -1,9 +1,7 @@ +import { get } from '@ember/object'; import { test } from 'ember-qunit'; -import Ember from 'ember'; import 'code-corps-ember/tests/helpers/has-attributes'; -const { get } = Ember; - // modified from gist source for relationships // source: https://gist.github.com/he9qi/b6354a81a0672dc63294 export function testForAttributes(name, expectedAttributes) { diff --git a/tests/helpers/flash-message.js b/tests/helpers/flash-message.js index a4cdba1b8..356a5dca6 100644 --- a/tests/helpers/flash-message.js +++ b/tests/helpers/flash-message.js @@ -1,10 +1,6 @@ -import Ember from 'ember'; +import { getOwner } from '@ember/application'; import FlashObject from 'ember-cli-flash/flash/object'; -const { - getOwner -} = Ember; - FlashObject.reopen({ init() {} }); export function getFlashMessageCount(context) { diff --git a/tests/helpers/mock-routing.js b/tests/helpers/mock-routing.js index eb1fd1c40..093ea3faa 100644 --- a/tests/helpers/mock-routing.js +++ b/tests/helpers/mock-routing.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Service } = Ember; +import Service from '@ember/service'; const service = Service.extend({ availableRoutes() { diff --git a/tests/helpers/relationship.js b/tests/helpers/relationship.js index 39d08759e..fff57fd1d 100644 --- a/tests/helpers/relationship.js +++ b/tests/helpers/relationship.js @@ -1,7 +1,5 @@ +import { get } from '@ember/object'; import { test } from 'ember-qunit'; -import Ember from 'ember'; - -const { get } = Ember; function runAssertions(assert, store, modelName, relationshipName, relationshipKind) { assert.expect(2); diff --git a/tests/helpers/stub-service.js b/tests/helpers/stub-service.js index 997fec733..3ed617a21 100644 --- a/tests/helpers/stub-service.js +++ b/tests/helpers/stub-service.js @@ -1,9 +1,9 @@ +import Service from '@ember/service'; +import { typeOf } from '@ember/utils'; import Ember from 'ember'; const { - Logger: { error }, - Service, - typeOf + Logger: { error } } = Ember; let stubService = (scope, name, hash = {}) => { diff --git a/tests/integration/components/category-item-test.js b/tests/integration/components/category-item-test.js index cb485212c..27640384f 100644 --- a/tests/integration/components/category-item-test.js +++ b/tests/integration/components/category-item-test.js @@ -1,24 +1,21 @@ +import { getOwner } from '@ember/application'; +import { set, getProperties, get } from '@ember/object'; +import { run } from '@ember/runloop'; +import RSVP from 'rsvp'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import wait from 'ember-test-helpers/wait'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; -import { getFlashMessageCount, getFlashMessageAt } from 'code-corps-ember/tests/helpers/flash-message'; +import { + getFlashMessageCount, + getFlashMessageAt +} from 'code-corps-ember/tests/helpers/flash-message'; import pageComponent from 'code-corps-ember/tests/pages/components/category-item'; import PageObject from 'ember-cli-page-object'; let page = PageObject.create(pageComponent); -const { - getOwner, - get, - getProperties, - set, - run, - RSVP -} = Ember; - function renderPage() { page.render(hbs`{{category-item category=category}}`); } diff --git a/tests/integration/components/comment-item-test.js b/tests/integration/components/comment-item-test.js index 2db3eccaf..cd0d02400 100644 --- a/tests/integration/components/comment-item-test.js +++ b/tests/integration/components/comment-item-test.js @@ -1,19 +1,14 @@ +import RSVP from 'rsvp'; +import { run } from '@ember/runloop'; +import { setProperties, set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; import PageObject from 'ember-cli-page-object'; import commentItemComponent from 'code-corps-ember/tests/pages/components/comment-item'; let page = PageObject.create(commentItemComponent); -const { - RSVP, - run, - set, - setProperties -} = Ember; - function renderPage() { page.render(hbs`{{comment-item comment=comment}}`); } diff --git a/tests/integration/components/create-comment-form-test.js b/tests/integration/components/create-comment-form-test.js index 64b5f9711..a1ff033b2 100644 --- a/tests/integration/components/create-comment-form-test.js +++ b/tests/integration/components/create-comment-form-test.js @@ -1,6 +1,6 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import mockRouting from '../../helpers/mock-routing'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; import PageObject from 'ember-cli-page-object'; @@ -9,8 +9,6 @@ import createCommentForm from 'code-corps-ember/tests/pages/components/create-co let page = PageObject.create(createCommentForm); -const { set } = Ember; - let mockSession = { isAuthenticated: true }; function renderPage() { diff --git a/tests/integration/components/donation-goal-edit-test.js b/tests/integration/components/donation-goal-edit-test.js index 8fcdaaac1..b207debca 100644 --- a/tests/integration/components/donation-goal-edit-test.js +++ b/tests/integration/components/donation-goal-edit-test.js @@ -1,3 +1,4 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; @@ -5,10 +6,6 @@ import component from 'code-corps-ember/tests/pages/components/donation-goal-edi let page = PageObject.create(component); -import Ember from 'ember'; - -const { set } = Ember; - let mockGoal = { amount: 20, description: 'Some description' }; function setHandlers(context, { saveHandler = function() {}, cancelHandler = function() {} } = {}) { diff --git a/tests/integration/components/donation-goal-test.js b/tests/integration/components/donation-goal-test.js index 5ca839873..27f656cfa 100644 --- a/tests/integration/components/donation-goal-test.js +++ b/tests/integration/components/donation-goal-test.js @@ -1,13 +1,9 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/donation-goal'; -const { - set -} = Ember; - let mockGoal = { amount: 500, // dollars description: 'A test goal' diff --git a/tests/integration/components/donation-goals-activation-test.js b/tests/integration/components/donation-goals-activation-test.js index d0ec44688..7379a7a5f 100644 --- a/tests/integration/components/donation-goals-activation-test.js +++ b/tests/integration/components/donation-goals-activation-test.js @@ -1,10 +1,6 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; - -const { - set -} = Ember; function setHandlers(context, { activateDonationsHandler = function() {} } = {}) { set(context, 'activateDonationsHandler', activateDonationsHandler); diff --git a/tests/integration/components/donation-goals-test.js b/tests/integration/components/donation-goals-test.js index 03a387b65..f65e09ef2 100644 --- a/tests/integration/components/donation-goals-test.js +++ b/tests/integration/components/donation-goals-test.js @@ -1,13 +1,9 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/donation-goals'; -const { - set -} = Ember; - function setHandlers(context, { addHandler = function() {}, cancelHandler = function() {}, editHandler = function() {}, saveHandler = function() {} } = {}) { set(context, 'addHandler', addHandler); set(context, 'cancelHandler', cancelHandler); diff --git a/tests/integration/components/donation/donation-container-test.js b/tests/integration/components/donation/donation-container-test.js index 563ff14e0..803420bad 100644 --- a/tests/integration/components/donation/donation-container-test.js +++ b/tests/integration/components/donation/donation-container-test.js @@ -1,16 +1,12 @@ +import RSVP from 'rsvp'; import { moduleForComponent, test } from 'ember-qunit'; import donationContainerComponent from '../../../pages/components/donation/donation-container'; -import Ember from 'ember'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; let page = PageObject.create(donationContainerComponent); -const { - RSVP -} = Ember; - let visa = { id: 1, brand: 'Visa', last4: '4242' }; function K() { diff --git a/tests/integration/components/donations/create-donation-test.js b/tests/integration/components/donations/create-donation-test.js index e6c3dfea3..4778f7763 100644 --- a/tests/integration/components/donations/create-donation-test.js +++ b/tests/integration/components/donations/create-donation-test.js @@ -1,11 +1,10 @@ -import Ember from 'ember'; +import { set } from '@ember/object'; +import { run } from '@ember/runloop'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; import createDonationComponent from '../../../pages/components/donations/create-donation'; -const { set, run } = Ember; - let page = PageObject.create(createDonationComponent); function renderPage() { diff --git a/tests/integration/components/donations/donation-amount-button-test.js b/tests/integration/components/donations/donation-amount-button-test.js index 0e94aa16c..1ddc05186 100644 --- a/tests/integration/components/donations/donation-amount-button-test.js +++ b/tests/integration/components/donations/donation-amount-button-test.js @@ -1,11 +1,9 @@ -import Ember from 'ember'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; import donationAmountButtonComponent from '../../../pages/components/donations/donation-amount-button'; -const { set } = Ember; - let page = PageObject.create(donationAmountButtonComponent); function renderPage() { diff --git a/tests/integration/components/editor-with-preview-test.js b/tests/integration/components/editor-with-preview-test.js index ff6375e4a..3359b4bdf 100644 --- a/tests/integration/components/editor-with-preview-test.js +++ b/tests/integration/components/editor-with-preview-test.js @@ -1,15 +1,11 @@ +import RSVP from 'rsvp'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/editor-with-preview'; import { initialize as initializeKeyboard } from 'ember-keyboard'; -const { - RSVP -} = Ember; - let mockPreview = { markdown: 'A **body**', body: 'A body', diff --git a/tests/integration/components/flash-messages-test.js b/tests/integration/components/flash-messages-test.js index 4b76c253b..c57053901 100644 --- a/tests/integration/components/flash-messages-test.js +++ b/tests/integration/components/flash-messages-test.js @@ -1,14 +1,10 @@ +import { getOwner } from '@ember/application'; +import { run } from '@ember/runloop'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/flash-messages'; -const { - getOwner, - run -} = Ember; - let page = PageObject.create(component); moduleForComponent('flash-messages', 'Integration | Component | flash messages', { diff --git a/tests/integration/components/github-connect-state-test.js b/tests/integration/components/github-connect-state-test.js index f99cbba09..c5b7dd146 100644 --- a/tests/integration/components/github-connect-state-test.js +++ b/tests/integration/components/github-connect-state-test.js @@ -1,3 +1,4 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; @@ -8,10 +9,6 @@ import setupSessionService from 'ember-simple-auth/initializers/setup-session-se import pageComponent from 'code-corps-ember/tests/pages/components/github-connect-state'; import PageObject from 'ember-cli-page-object'; -import Ember from 'ember'; - -const { set } = Ember; - let page = PageObject.create(pageComponent); moduleForComponent('github-connect-state', 'Integration | Component | github connect state', { diff --git a/tests/integration/components/github-connect-test.js b/tests/integration/components/github-connect-test.js index 098a1fac6..d6e2024f0 100644 --- a/tests/integration/components/github-connect-test.js +++ b/tests/integration/components/github-connect-test.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { set, get } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; @@ -7,7 +7,6 @@ import component from 'code-corps-ember/tests/pages/components/github-connect'; import setupSession from 'ember-simple-auth/initializers/setup-session'; import setupSessionService from 'ember-simple-auth/initializers/setup-session-service'; -const { get, set } = Ember; const baseUrl = 'https://github.com/login/oauth/authorize'; let page = PageObject.create(component); diff --git a/tests/integration/components/github-repo-test.js b/tests/integration/components/github-repo-test.js index 889cc5054..2436c4e55 100644 --- a/tests/integration/components/github-repo-test.js +++ b/tests/integration/components/github-repo-test.js @@ -1,16 +1,12 @@ +import { set } from '@ember/object'; +import { run } from '@ember/runloop'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import githubRepoComponent from 'code-corps-ember/tests/pages/components/github-repo'; let page = PageObject.create(githubRepoComponent); -const { - set, - run -} = Ember; - function renderPage() { page.render(hbs` {{#github-repo model=model}} diff --git a/tests/integration/components/github/connected-installation-test.js b/tests/integration/components/github/connected-installation-test.js index 34863a0d8..6b53aeed4 100644 --- a/tests/integration/components/github/connected-installation-test.js +++ b/tests/integration/components/github/connected-installation-test.js @@ -1,11 +1,10 @@ +import { setProperties, set } from '@ember/object'; +import { run } from '@ember/runloop'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/github/connected-installation'; -const { set, setProperties, run } = Ember; - let page = PageObject.create(component); function renderPage() { diff --git a/tests/integration/components/github/unconnected-installation-test.js b/tests/integration/components/github/unconnected-installation-test.js index 51bc753fe..979d550e2 100644 --- a/tests/integration/components/github/unconnected-installation-test.js +++ b/tests/integration/components/github/unconnected-installation-test.js @@ -1,11 +1,10 @@ +import { setProperties, set } from '@ember/object'; +import { run } from '@ember/runloop'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/github/unconnected-installation'; -const { set, setProperties, run } = Ember; - let page = PageObject.create(component); function renderPage() { diff --git a/tests/integration/components/image-drop-test.js b/tests/integration/components/image-drop-test.js index 27564aa6c..ee0d4e916 100644 --- a/tests/integration/components/image-drop-test.js +++ b/tests/integration/components/image-drop-test.js @@ -1,15 +1,11 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import fillInFileInput from '../../helpers/fill-in-file-input'; import removeDoubleQuotes from '../../helpers/remove-double-quotes'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/image-drop'; -const { - set -} = Ember; - let page = PageObject.create(component); moduleForComponent('image-drop', 'Integration | Component | image drop', { diff --git a/tests/integration/components/organization-settings-form-test.js b/tests/integration/components/organization-settings-form-test.js index 0a856607a..e6668c763 100644 --- a/tests/integration/components/organization-settings-form-test.js +++ b/tests/integration/components/organization-settings-form-test.js @@ -1,12 +1,12 @@ -import Ember from 'ember'; +import { getOwner } from '@ember/application'; +import RSVP from 'rsvp'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import { getFlashMessageCount } from 'code-corps-ember/tests/helpers/flash-message'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/organization-settings-form'; -const { getOwner, RSVP, set } = Ember; - let page = PageObject.create(component); moduleForComponent('organization-settings-form', 'Integration | Component | organization settings form', { diff --git a/tests/integration/components/password/forgot-password-test.js b/tests/integration/components/password/forgot-password-test.js index ace65d2f3..2c77a6800 100644 --- a/tests/integration/components/password/forgot-password-test.js +++ b/tests/integration/components/password/forgot-password-test.js @@ -1,5 +1,5 @@ -import Ember from 'ember'; -const { RSVP, getOwner } = Ember; +import RSVP from 'rsvp'; +import { getOwner } from '@ember/application'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import forgotPasswordComponent from 'code-corps-ember/tests/pages/components/password/forgot-password'; diff --git a/tests/integration/components/password/reset-password-test.js b/tests/integration/components/password/reset-password-test.js index 15de0a7e0..8cd41f904 100644 --- a/tests/integration/components/password/reset-password-test.js +++ b/tests/integration/components/password/reset-password-test.js @@ -1,5 +1,5 @@ -import Ember from 'ember'; -const { RSVP, getOwner } = Ember; +import RSVP from 'rsvp'; +import { getOwner } from '@ember/application'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import resetPasswordComponent from 'code-corps-ember/tests/pages/components/password/reset-password'; diff --git a/tests/integration/components/payments/bank-account-test.js b/tests/integration/components/payments/bank-account-test.js index 251b76ba3..c9b0a3191 100644 --- a/tests/integration/components/payments/bank-account-test.js +++ b/tests/integration/components/payments/bank-account-test.js @@ -1,14 +1,10 @@ -import Ember from 'ember'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; import bankAccountComponent from '../../../pages/components/payments/bank-account'; -const { - set -} = Ember; - let page = PageObject.create(bankAccountComponent); function setHandler(context, submitHandler = function() {}) { diff --git a/tests/integration/components/payments/create-account-test.js b/tests/integration/components/payments/create-account-test.js index bf4a2aae2..5dc29daf6 100644 --- a/tests/integration/components/payments/create-account-test.js +++ b/tests/integration/components/payments/create-account-test.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; @@ -6,10 +6,6 @@ import moment from 'moment'; import createAccountComponent from '../../../pages/components/payments/create-account'; -const { - set -} = Ember; - let page = PageObject.create(createAccountComponent); function setHandler(context, submitHandler = function() {}) { diff --git a/tests/integration/components/payments/donation-goals-test.js b/tests/integration/components/payments/donation-goals-test.js index 404168fec..873c3c4ef 100644 --- a/tests/integration/components/payments/donation-goals-test.js +++ b/tests/integration/components/payments/donation-goals-test.js @@ -1,14 +1,10 @@ -import Ember from 'ember'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; import paymentsDonationGoalsComponent from '../../../pages/components/payments/donation-goals'; -const { - set -} = Ember; - let page = PageObject.create(paymentsDonationGoalsComponent); function renderPage() { diff --git a/tests/integration/components/payments/funds-recipient-test.js b/tests/integration/components/payments/funds-recipient-test.js index 3c067c708..8f964cf6f 100644 --- a/tests/integration/components/payments/funds-recipient-test.js +++ b/tests/integration/components/payments/funds-recipient-test.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { setProperties } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; @@ -7,10 +7,6 @@ import fundsRecipientComponent from '../../../pages/components/payments/funds-re let page = PageObject.create(fundsRecipientComponent); -const { - setProperties -} = Ember; - function setHandlers(context, { detailsHandler = function() {}, documentHandler = function() {}, idHandler = function() {} }) { setProperties(context, { detailsHandler, documentHandler, idHandler }); } diff --git a/tests/integration/components/payments/funds-recipient/details-form-test.js b/tests/integration/components/payments/funds-recipient/details-form-test.js index 2056eaaf6..3aa756e27 100644 --- a/tests/integration/components/payments/funds-recipient/details-form-test.js +++ b/tests/integration/components/payments/funds-recipient/details-form-test.js @@ -1,11 +1,7 @@ +import { get } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; -import Ember from 'ember'; - -const { - get -} = Ember; import detailsFormComponent from 'code-corps-ember/tests/pages/components/payments/funds-recipient/details-form'; diff --git a/tests/integration/components/payments/funds-recipient/identity-document-file-upload-test.js b/tests/integration/components/payments/funds-recipient/identity-document-file-upload-test.js index bb3017bd7..700a07471 100644 --- a/tests/integration/components/payments/funds-recipient/identity-document-file-upload-test.js +++ b/tests/integration/components/payments/funds-recipient/identity-document-file-upload-test.js @@ -1,7 +1,7 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import { startMirage } from 'code-corps-ember/initializers/ember-cli-mirage'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/payments/funds-recipient/identity-document-file-upload'; @@ -16,8 +16,6 @@ const template = hbs`{{ uploadError=onUploadError }}`; -const { set } = Ember; - const smallPNG = { name: 'file.png', type: 'image/png', diff --git a/tests/integration/components/payments/funds-recipient/personal-id-number-test.js b/tests/integration/components/payments/funds-recipient/personal-id-number-test.js index 4901bf68a..341914f40 100644 --- a/tests/integration/components/payments/funds-recipient/personal-id-number-test.js +++ b/tests/integration/components/payments/funds-recipient/personal-id-number-test.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; @@ -7,10 +7,6 @@ import legalEntityPersonalIdNumberComponent from 'code-corps-ember/tests/pages/c let page = PageObject.create(legalEntityPersonalIdNumberComponent); -const { - set -} = Ember; - function setHandler(context, submitHandler = function() {}) { set(context, 'submitHandler', submitHandler); } diff --git a/tests/integration/components/project-card-test.js b/tests/integration/components/project-card-test.js index 85311f148..269010437 100644 --- a/tests/integration/components/project-card-test.js +++ b/tests/integration/components/project-card-test.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; @@ -7,8 +7,6 @@ import pageComponent from 'code-corps-ember/tests/pages/components/project-card' let page = PageObject.create(pageComponent); -const { set } = Ember; - function renderPage() { page.render(hbs` {{project-card onJoin=onJoin project=project skills=skills}} diff --git a/tests/integration/components/project-card/project-users-test.js b/tests/integration/components/project-card/project-users-test.js index ba7782bd3..42acb29f9 100644 --- a/tests/integration/components/project-card/project-users-test.js +++ b/tests/integration/components/project-card/project-users-test.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { set } from '@ember/object'; import { faker } from 'ember-cli-mirage'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; @@ -7,8 +7,6 @@ import pageComponent from 'code-corps-ember/tests/pages/components/project-card/ let page = PageObject.create(pageComponent); -const { set } = Ember; - moduleForComponent('project-card/project-users', 'Integration | Component | project card/project users', { integration: true, beforeEach() { diff --git a/tests/integration/components/project-join-modal-test.js b/tests/integration/components/project-join-modal-test.js index 76c8352e2..2e4da2b85 100644 --- a/tests/integration/components/project-join-modal-test.js +++ b/tests/integration/components/project-join-modal-test.js @@ -1,14 +1,12 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; import PageObject from 'ember-cli-page-object'; import pageComponent from 'code-corps-ember/tests/pages/components/project-join-modal'; let page = PageObject.create(pageComponent); -const { set } = Ember; - function renderPage() { page.render(hbs` {{project-join-modal diff --git a/tests/integration/components/project-list-test.js b/tests/integration/components/project-list-test.js index f0cf4125a..f28241230 100644 --- a/tests/integration/components/project-list-test.js +++ b/tests/integration/components/project-list-test.js @@ -1,13 +1,9 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/project-list'; -const { - set -} = Ember; - let page = PageObject.create(component); moduleForComponent('project-list', 'Integration | Component | project list', { diff --git a/tests/integration/components/project-long-description-test.js b/tests/integration/components/project-long-description-test.js index 7d293e573..5cc14b654 100644 --- a/tests/integration/components/project-long-description-test.js +++ b/tests/integration/components/project-long-description-test.js @@ -1,16 +1,12 @@ -import Ember from 'ember'; +import { merge } from '@ember/polyfills'; +import RSVP from 'rsvp'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/project-long-description'; -const { - merge, - RSVP, - set -} = Ember; - let page = PageObject.create(component); moduleForComponent('project-long-description', 'Integration | Component | project long description', { diff --git a/tests/integration/components/project-settings-form-test.js b/tests/integration/components/project-settings-form-test.js index 889e2af7b..b9317f1a4 100644 --- a/tests/integration/components/project-settings-form-test.js +++ b/tests/integration/components/project-settings-form-test.js @@ -1,12 +1,12 @@ -import Ember from 'ember'; +import { getOwner } from '@ember/application'; +import RSVP from 'rsvp'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import { getFlashMessageCount } from 'code-corps-ember/tests/helpers/flash-message'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/project-settings-form'; -const { getOwner, RSVP, set } = Ember; - let page = PageObject.create(component); moduleForComponent('project-settings-form', 'Integration | Component | project settings form', { diff --git a/tests/integration/components/project-skill-item-test.js b/tests/integration/components/project-skill-item-test.js index a3eec39dd..bad5d8438 100644 --- a/tests/integration/components/project-skill-item-test.js +++ b/tests/integration/components/project-skill-item-test.js @@ -1,15 +1,11 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/project-skill-item'; let page = PageObject.create(component); -const { - set -} = Ember; - function setHandler(context, clickHandler = () => {}) { set(context, 'clickHandler', clickHandler); } diff --git a/tests/integration/components/project-skills-list-test.js b/tests/integration/components/project-skills-list-test.js index 743ec7351..41f2eb22b 100644 --- a/tests/integration/components/project-skills-list-test.js +++ b/tests/integration/components/project-skills-list-test.js @@ -1,15 +1,11 @@ +import { setProperties, set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/project-skills-list'; let page = PageObject.create(component); -const { - set, setProperties -} = Ember; - function setHandler(context, clickHandler = () => {}) { set(context, 'clickHandler', clickHandler); } diff --git a/tests/integration/components/role-item-test.js b/tests/integration/components/role-item-test.js index 3b434293e..ad5af04f4 100644 --- a/tests/integration/components/role-item-test.js +++ b/tests/integration/components/role-item-test.js @@ -1,19 +1,18 @@ +import { getOwner } from '@ember/application'; +import RSVP from 'rsvp'; +import { run } from '@ember/runloop'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import wait from 'ember-test-helpers/wait'; -import { getFlashMessageCount, getFlashMessageAt } from 'code-corps-ember/tests/helpers/flash-message'; +import { + getFlashMessageCount, + getFlashMessageAt +} from 'code-corps-ember/tests/helpers/flash-message'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/role-item'; -const { - getOwner, - RSVP, - run, - set -} = Ember; - const page = PageObject.create(component); const template = hbs`{{role-item role=role userRoles=userRoles}}`; diff --git a/tests/integration/components/select-inline-dropdown/list-item-test.js b/tests/integration/components/select-inline-dropdown/list-item-test.js index 2806bcad9..ab7d9b6f1 100644 --- a/tests/integration/components/select-inline-dropdown/list-item-test.js +++ b/tests/integration/components/select-inline-dropdown/list-item-test.js @@ -1,10 +1,8 @@ +import { setProperties } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import pageComponent from 'code-corps-ember/tests/pages/components/select-inline-dropdown/list-item'; import PageObject from 'ember-cli-page-object'; -import Ember from 'ember'; - -const { setProperties } = Ember; let page = PageObject.create(pageComponent); diff --git a/tests/integration/components/select/birth-date-test.js b/tests/integration/components/select/birth-date-test.js index 5b18b4beb..4556730ab 100644 --- a/tests/integration/components/select/birth-date-test.js +++ b/tests/integration/components/select/birth-date-test.js @@ -1,14 +1,9 @@ -import Ember from 'ember'; +import { set, getProperties } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import selectBirthDateComponent from '../../../pages/components/select/birth-date'; import PageObject from 'ember-cli-page-object'; -const { - getProperties, - set -} = Ember; - let page = PageObject.create(selectBirthDateComponent); function renderPage() { diff --git a/tests/integration/components/select/country-select-test.js b/tests/integration/components/select/country-select-test.js index 498ef7ed7..71cbb4b32 100644 --- a/tests/integration/components/select/country-select-test.js +++ b/tests/integration/components/select/country-select-test.js @@ -1,11 +1,9 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; -import Ember from 'ember'; import hbs from 'htmlbars-inline-precompile'; import selectCountry from '../../../pages/components/select/country-select'; import PageObject from 'ember-cli-page-object'; -const { set } = Ember; - function setHandler(context, onChange = function() {}) { set(context, 'onChange', onChange); } diff --git a/tests/integration/components/select/github-repo-test.js b/tests/integration/components/select/github-repo-test.js index 48a42eede..488c68746 100644 --- a/tests/integration/components/select/github-repo-test.js +++ b/tests/integration/components/select/github-repo-test.js @@ -1,11 +1,10 @@ -import Ember from 'ember'; +import { run } from '@ember/runloop'; +import { set, get } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import selectGithubRepoComponent from '../../../pages/components/select/github-repo'; import PageObject from 'ember-cli-page-object'; -const { get, run, set } = Ember; - let page = PageObject.create(selectGithubRepoComponent); function renderPage() { diff --git a/tests/integration/components/select/state-select-test.js b/tests/integration/components/select/state-select-test.js index 12c16f3a7..5b4085ed5 100644 --- a/tests/integration/components/select/state-select-test.js +++ b/tests/integration/components/select/state-select-test.js @@ -1,11 +1,9 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; -import Ember from 'ember'; import hbs from 'htmlbars-inline-precompile'; import selectState from '../../../pages/components/select/state-select'; import PageObject from 'ember-cli-page-object'; -const { set } = Ember; - let page = PageObject.create(selectState); function setHandler(context, onChange = function() {}) { diff --git a/tests/integration/components/signup-email-input-test.js b/tests/integration/components/signup-email-input-test.js index 58edb72c4..f4218a411 100644 --- a/tests/integration/components/signup-email-input-test.js +++ b/tests/integration/components/signup-email-input-test.js @@ -1,13 +1,11 @@ +import { run } from '@ember/runloop'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import startMirage from '../../helpers/setup-mirage-for-integration'; import wait from 'ember-test-helpers/wait'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/signup-password-input'; -const { run } = Ember; - let page = PageObject.create(component); moduleForComponent('signup-email-input', 'Integration | Component | signup email input', { diff --git a/tests/integration/components/signup-form-test.js b/tests/integration/components/signup-form-test.js index 2ef9e3443..689745c20 100644 --- a/tests/integration/components/signup-form-test.js +++ b/tests/integration/components/signup-form-test.js @@ -1,11 +1,10 @@ -import Ember from 'ember'; +import { run } from '@ember/runloop'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/signup-form'; -const { run, set } = Ember; - const page = PageObject.create(component); function renderPage() { diff --git a/tests/integration/components/signup-username-input-test.js b/tests/integration/components/signup-username-input-test.js index 570e9cccd..a9206056c 100644 --- a/tests/integration/components/signup-username-input-test.js +++ b/tests/integration/components/signup-username-input-test.js @@ -1,6 +1,6 @@ +import { run } from '@ember/runloop'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import startMirage from '../../helpers/setup-mirage-for-integration'; import wait from 'ember-test-helpers/wait'; import PageObject from 'ember-cli-page-object'; @@ -8,8 +8,6 @@ import component from 'code-corps-ember/tests/pages/components/signup-username-i let page = PageObject.create(component); -const { run } = Ember; - moduleForComponent('signup-username-input', 'Integration | Component | signup username input', { integration: true, setup() { diff --git a/tests/integration/components/skill-button-test.js b/tests/integration/components/skill-button-test.js index 3d2c20d16..4256c068d 100644 --- a/tests/integration/components/skill-button-test.js +++ b/tests/integration/components/skill-button-test.js @@ -1,11 +1,9 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import skillButton from 'code-corps-ember/tests/pages/components/skill-button'; -const { set } = Ember; - function setHandler(context, removeHandler = function() {}) { set(context, 'removeHandler', removeHandler); } diff --git a/tests/integration/components/skill-list-item-link-test.js b/tests/integration/components/skill-list-item-link-test.js index 92a916ff9..0967832fc 100644 --- a/tests/integration/components/skill-list-item-link-test.js +++ b/tests/integration/components/skill-list-item-link-test.js @@ -1,14 +1,10 @@ -import Ember from 'ember'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; import PageObject from 'ember-cli-page-object'; import skillListItemLink from 'code-corps-ember/tests/pages/components/skill-list-item-link'; -const { - set -} = Ember; - let mockSession = { isAuthenticated: true }; let page = PageObject.create(skillListItemLink); diff --git a/tests/integration/components/skill-list-item-test.js b/tests/integration/components/skill-list-item-test.js index f3e239033..4b5ef31c1 100644 --- a/tests/integration/components/skill-list-item-test.js +++ b/tests/integration/components/skill-list-item-test.js @@ -1,13 +1,11 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import mockRouting from '../../helpers/mock-routing'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; import PageObject from 'ember-cli-page-object'; import skillListItem from 'code-corps-ember/tests/pages/components/skill-list-item'; -const { set } = Ember; - let mockSession = { isAuthenticated: true }; let skill = { diff --git a/tests/integration/components/skill-list-items-test.js b/tests/integration/components/skill-list-items-test.js index e8f19b522..94e637584 100644 --- a/tests/integration/components/skill-list-items-test.js +++ b/tests/integration/components/skill-list-items-test.js @@ -1,12 +1,10 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; import PageObject from 'ember-cli-page-object'; import skillListItems from 'code-corps-ember/tests/pages/components/skill-list-items'; -const { set } = Ember; - let mockSession = { isAuthenticated: true }; let skills = [ diff --git a/tests/integration/components/skills-typeahead-result-test.js b/tests/integration/components/skills-typeahead-result-test.js index 3f637e7b1..cd036f3f8 100644 --- a/tests/integration/components/skills-typeahead-result-test.js +++ b/tests/integration/components/skills-typeahead-result-test.js @@ -1,11 +1,9 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import skillsTypeaheadResultComponent from '../../pages/components/skills-typeahead-result'; -const { set } = Ember; - let page = PageObject.create(skillsTypeaheadResultComponent); let skill = { diff --git a/tests/integration/components/skills-typeahead-test.js b/tests/integration/components/skills-typeahead-test.js index be1073663..3fb567fee 100644 --- a/tests/integration/components/skills-typeahead-test.js +++ b/tests/integration/components/skills-typeahead-test.js @@ -1,16 +1,12 @@ +import RSVP from 'rsvp'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; import PageObject from 'ember-cli-page-object'; import skillsTypeaheadComponent from '../../pages/components/skills-typeahead'; import wait from 'ember-test-helpers/wait'; -const { - RSVP, - set -} = Ember; - let page = PageObject.create(skillsTypeaheadComponent); let skills = [ diff --git a/tests/integration/components/svg/sprite-icon-test.js b/tests/integration/components/svg/sprite-icon-test.js index be852a3de..9a5bf70a7 100644 --- a/tests/integration/components/svg/sprite-icon-test.js +++ b/tests/integration/components/svg/sprite-icon-test.js @@ -1,15 +1,11 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import component from 'code-corps-ember/tests/pages/components/svg/sprite-icon'; import PageObject from 'ember-cli-page-object'; let page = PageObject.create(component); -const { - set -} = Ember; - function renderPage() { page.render(hbs` {{svg/sprite-icon diff --git a/tests/integration/components/task-card-test.js b/tests/integration/components/task-card-test.js index 40c31d781..5ee2414cd 100644 --- a/tests/integration/components/task-card-test.js +++ b/tests/integration/components/task-card-test.js @@ -1,3 +1,5 @@ +import RSVP from 'rsvp'; +import { setProperties, set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; @@ -5,11 +7,9 @@ import taskCardComponent from 'code-corps-ember/tests/pages/components/task-card import moment from 'moment'; import { Ability } from 'ember-can'; import DS from 'ember-data'; -import Ember from 'ember'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; const { PromiseObject } = DS; -const { RSVP, set, setProperties } = Ember; let page = PageObject.create(taskCardComponent); diff --git a/tests/integration/components/task-comment-list-test.js b/tests/integration/components/task-comment-list-test.js index e358d8f6c..e3d0dea65 100644 --- a/tests/integration/components/task-comment-list-test.js +++ b/tests/integration/components/task-comment-list-test.js @@ -1,12 +1,8 @@ +import RSVP from 'rsvp'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; -const { - RSVP -} = Ember; - moduleForComponent('task-comment-list', 'Integration | Component | task comment list', { integration: true, beforeEach() { diff --git a/tests/integration/components/task-details-test.js b/tests/integration/components/task-details-test.js index 1f2980798..9ecbacc97 100644 --- a/tests/integration/components/task-details-test.js +++ b/tests/integration/components/task-details-test.js @@ -1,15 +1,11 @@ +import RSVP from 'rsvp'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/task-details'; -const { - RSVP, - set -} = Ember; - let mockMentionFetcher = { fetchBodyWithMentions: RSVP.resolve, prefetchBodyWithMentions() {} diff --git a/tests/integration/components/task-header-test.js b/tests/integration/components/task-header-test.js index c7797f6b0..b0ebe6646 100644 --- a/tests/integration/components/task-header-test.js +++ b/tests/integration/components/task-header-test.js @@ -1,13 +1,9 @@ +import RSVP from 'rsvp'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/task-header'; -const { - RSVP -} = Ember; - let mockTask = { title: 'A task', body: 'A body', diff --git a/tests/integration/components/task-list-cards-test.js b/tests/integration/components/task-list-cards-test.js index 22e6be8b8..ff4f66052 100644 --- a/tests/integration/components/task-list-cards-test.js +++ b/tests/integration/components/task-list-cards-test.js @@ -1,5 +1,4 @@ -import Ember from 'ember'; -const { set } = Ember; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; diff --git a/tests/integration/components/task-status-button-test.js b/tests/integration/components/task-status-button-test.js index 1c16a09d7..113df509a 100644 --- a/tests/integration/components/task-status-button-test.js +++ b/tests/integration/components/task-status-button-test.js @@ -1,11 +1,9 @@ -import Ember from 'ember'; +import { get } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/task-status-button'; -const { get } = Ember; - let page = PageObject.create(component); moduleForComponent('task-status-button', 'Integration | Component | task status button', { diff --git a/tests/integration/components/task-title-test.js b/tests/integration/components/task-title-test.js index 17539b240..bd5eb474b 100644 --- a/tests/integration/components/task-title-test.js +++ b/tests/integration/components/task-title-test.js @@ -1,14 +1,10 @@ +import RSVP from 'rsvp'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import stubService from 'code-corps-ember/tests/helpers/stub-service'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/task-title'; -const { - RSVP -} = Ember; - let mockCurrentUser = { user: { id: 1 diff --git a/tests/integration/components/task/sidebar/integrations-section-test.js b/tests/integration/components/task/sidebar/integrations-section-test.js index 13066f2f9..54e86060f 100644 --- a/tests/integration/components/task/sidebar/integrations-section-test.js +++ b/tests/integration/components/task/sidebar/integrations-section-test.js @@ -1,15 +1,11 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import component from 'code-corps-ember/tests/pages/components/task/sidebar/integrations-section'; import PageObject from 'ember-cli-page-object'; let page = PageObject.create(component); -const { - set -} = Ember; - function renderPage() { page.render(hbs` {{task/sidebar/integrations-section diff --git a/tests/integration/components/task/user/users-list.js b/tests/integration/components/task/user/users-list.js index 92ee037a7..69ae68d1c 100644 --- a/tests/integration/components/task/user/users-list.js +++ b/tests/integration/components/task/user/users-list.js @@ -1,11 +1,9 @@ -import Ember from 'ember'; +import { setProperties, set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/task/user/users-list'; -const { set, setProperties } = Ember; - let page = PageObject.create(component); function renderPage() { diff --git a/tests/integration/components/user-byline-test.js b/tests/integration/components/user-byline-test.js index e53829f6e..331639196 100644 --- a/tests/integration/components/user-byline-test.js +++ b/tests/integration/components/user-byline-test.js @@ -1,16 +1,12 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import pageComponent from 'code-corps-ember/tests/pages/components/user-byline'; import moment from 'moment'; let page = PageObject.create(pageComponent); -const { - set -} = Ember; - function renderPage() { page.render(hbs` {{user-byline createdAt=createdAt createdFrom=createdFrom user=user}} diff --git a/tests/integration/components/user-details-test.js b/tests/integration/components/user-details-test.js index aaa2a9b99..af65e3f54 100644 --- a/tests/integration/components/user-details-test.js +++ b/tests/integration/components/user-details-test.js @@ -1,12 +1,8 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/user-details'; -import Ember from 'ember'; - -const { - set -} = Ember; let page = PageObject.create(component); diff --git a/tests/integration/components/user-dropdown-test.js b/tests/integration/components/user-dropdown-test.js index 168d22bbf..fdf247469 100644 --- a/tests/integration/components/user-dropdown-test.js +++ b/tests/integration/components/user-dropdown-test.js @@ -1,11 +1,7 @@ +import { computed } from '@ember/object'; +import { run } from '@ember/runloop'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; - -const { - computed, - run -} = Ember; moduleForComponent('user-dropdown', 'Integration | Component | user dropdown', { integration: true diff --git a/tests/integration/components/user-list-item-test.js b/tests/integration/components/user-list-item-test.js index 32edb0c84..9cb5e1c5f 100644 --- a/tests/integration/components/user-list-item-test.js +++ b/tests/integration/components/user-list-item-test.js @@ -1,17 +1,15 @@ +import { getOwner } from '@ember/application'; +import RSVP from 'rsvp'; +import { set, get } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; -import { getFlashMessageCount, getFlashMessageAt } from 'code-corps-ember/tests/helpers/flash-message'; +import { + getFlashMessageCount, + getFlashMessageAt +} from 'code-corps-ember/tests/helpers/flash-message'; import PageObject from 'ember-cli-page-object'; import component from 'code-corps-ember/tests/pages/components/user-list-item'; -const { - get, - getOwner, - RSVP, - set -} = Ember; - let user = { name: 'Josh Smith', username: 'joshsmith', diff --git a/tests/integration/components/user-menu-test.js b/tests/integration/components/user-menu-test.js index 4a6d23e41..9961c8f0d 100644 --- a/tests/integration/components/user-menu-test.js +++ b/tests/integration/components/user-menu-test.js @@ -1,11 +1,9 @@ +import { set, get, computed } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import Ember from 'ember'; import PageObject from 'ember-cli-page-object'; import userMenu from '../../pages/components/user-menu'; -const { computed, get, set } = Ember; - let page = PageObject.create(userMenu); const stubUser = { diff --git a/tests/integration/components/user-projects-list-test.js b/tests/integration/components/user-projects-list-test.js index 380796ba1..5a37c0423 100644 --- a/tests/integration/components/user-projects-list-test.js +++ b/tests/integration/components/user-projects-list-test.js @@ -1,10 +1,8 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import PageObject from 'ember-cli-page-object'; import userProjectsList from '../../pages/components/user-projects-list'; -import Ember from 'ember'; - -const { set } = Ember; let page = PageObject.create(userProjectsList); moduleForComponent('user-projects-list', 'Integration | Component | user projects list', { diff --git a/tests/integration/components/user-settings-form-test.js b/tests/integration/components/user-settings-form-test.js index 67ebd53e3..a96e851d6 100644 --- a/tests/integration/components/user-settings-form-test.js +++ b/tests/integration/components/user-settings-form-test.js @@ -1,12 +1,12 @@ -import Ember from 'ember'; +import { getOwner } from '@ember/application'; +import RSVP from 'rsvp'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import { getFlashMessageCount } from 'code-corps-ember/tests/helpers/flash-message'; import PageObject from 'ember-cli-page-object'; import userSettingsFormComponent from '../../pages/components/user-settings-form'; -const { getOwner, RSVP, set } = Ember; - let page = PageObject.create(userSettingsFormComponent); moduleForComponent('user-settings-form', 'Integration | Component | user settings form', { diff --git a/tests/integration/components/user-sidebar-test.js b/tests/integration/components/user-sidebar-test.js index 1487536ea..952a7a112 100644 --- a/tests/integration/components/user-sidebar-test.js +++ b/tests/integration/components/user-sidebar-test.js @@ -1,12 +1,10 @@ +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import startMirage from '../../helpers/setup-mirage-for-integration'; import PageObject from 'ember-cli-page-object'; -import Ember from 'ember'; import userSidebarComponent from '../../pages/components/user-sidebar'; -const { set } = Ember; - let page = PageObject.create(userSidebarComponent); moduleForComponent('user-sidebar', 'Integration | Component | user sidebar', { diff --git a/tests/pages/components/donations/create-donation.js b/tests/pages/components/donations/create-donation.js index 5e058e839..bea583bdd 100644 --- a/tests/pages/components/donations/create-donation.js +++ b/tests/pages/components/donations/create-donation.js @@ -1,4 +1,9 @@ -import { clickable, fillable, isVisible, value } from 'ember-cli-page-object'; +import { + clickable, + fillable, + isVisible, + value +} from 'ember-cli-page-object'; import donationAmountButtonComponent from './donation-amount-button'; import Ember from 'ember'; diff --git a/tests/pages/components/payments/bank-account.js b/tests/pages/components/payments/bank-account.js index afa7cd61c..8fe9e869f 100644 --- a/tests/pages/components/payments/bank-account.js +++ b/tests/pages/components/payments/bank-account.js @@ -1,4 +1,11 @@ -import { clickable, fillable, is, isVisible, hasClass, text } from 'ember-cli-page-object'; +import { + clickable, + fillable, + is, + isVisible, + hasClass, + text +} from 'ember-cli-page-object'; export default { scope: '.bank-account', diff --git a/tests/pages/components/payments/funds-recipient/verification-document.js b/tests/pages/components/payments/funds-recipient/verification-document.js index e6a8d6896..b3a70f3c0 100644 --- a/tests/pages/components/payments/funds-recipient/verification-document.js +++ b/tests/pages/components/payments/funds-recipient/verification-document.js @@ -1,8 +1,7 @@ -import Ember from 'ember'; +import $ from 'jquery'; +import { run } from '@ember/runloop'; import { clickable, isVisible } from 'ember-cli-page-object'; -const { $, run } = Ember; - export default { scope: '.verification-document', diff --git a/tests/pages/components/user-menu.js b/tests/pages/components/user-menu.js index 658727740..41729b2c8 100644 --- a/tests/pages/components/user-menu.js +++ b/tests/pages/components/user-menu.js @@ -1,4 +1,10 @@ -import { attribute, clickable, hasClass, isVisible, text } from 'ember-cli-page-object'; +import { + attribute, + clickable, + hasClass, + isVisible, + text +} from 'ember-cli-page-object'; export default { scope: '.user-menu', diff --git a/tests/pages/helpers/tooltip.js b/tests/pages/helpers/tooltip.js index 265af7ed2..9d5039d24 100644 --- a/tests/pages/helpers/tooltip.js +++ b/tests/pages/helpers/tooltip.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { $ } = Ember; +import $ from 'jquery'; /** * This helper is used to deal with DOM elements inserted by the diff --git a/tests/unit/abilities/project-test.js b/tests/unit/abilities/project-test.js index 4024f6bfe..9e2dec3da 100644 --- a/tests/unit/abilities/project-test.js +++ b/tests/unit/abilities/project-test.js @@ -1,10 +1,5 @@ +import { set, get } from '@ember/object'; import { moduleFor, test } from 'ember-qunit'; -import Ember from 'ember'; - -const { - get, - set -} = Ember; let owner = { id: 'owner' }; let other = { id: 'other' }; diff --git a/tests/unit/abilities/task-test.js b/tests/unit/abilities/task-test.js index d60622bff..a20f01a9e 100644 --- a/tests/unit/abilities/task-test.js +++ b/tests/unit/abilities/task-test.js @@ -1,8 +1,6 @@ -import Ember from 'ember'; +import { set, get } from '@ember/object'; import { moduleFor, test } from 'ember-qunit'; -const { get, set } = Ember; - moduleFor('ability:task', 'Unit | Ability | task', { needs: [ 'service:current-user', diff --git a/tests/unit/adapters/task-test.js b/tests/unit/adapters/task-test.js index e6e76b3ed..b44215af6 100644 --- a/tests/unit/adapters/task-test.js +++ b/tests/unit/adapters/task-test.js @@ -1,7 +1,5 @@ +import { set } from '@ember/object'; import { moduleFor, test } from 'ember-qunit'; -import Ember from 'ember'; - -const { set } = Ember; moduleFor('adapter:task', 'Unit | Adapter | task', { needs: [ diff --git a/tests/unit/components/power-select/before-task-options-test.js b/tests/unit/components/power-select/before-task-options-test.js index 1c24952d2..b76919b51 100644 --- a/tests/unit/components/power-select/before-task-options-test.js +++ b/tests/unit/components/power-select/before-task-options-test.js @@ -1,7 +1,6 @@ +import Controller from '@ember/controller'; +import { set } from '@ember/object'; import { moduleForComponent, test } from 'ember-qunit'; -import Ember from 'ember'; - -const { Controller, set } = Ember; moduleForComponent( 'power-select/before-task-options', diff --git a/tests/unit/controllers/start/hello-test.js b/tests/unit/controllers/start/hello-test.js index a7146062b..9758d9b9d 100644 --- a/tests/unit/controllers/start/hello-test.js +++ b/tests/unit/controllers/start/hello-test.js @@ -1,7 +1,5 @@ +import { set } from '@ember/object'; import { moduleFor, test } from 'ember-qunit'; -import Ember from 'ember'; - -const { set } = Ember; moduleFor('controller:start/hello', 'Unit | Controller | start/hello', { needs: [ diff --git a/tests/unit/mixins/can-animate-test.js b/tests/unit/mixins/can-animate-test.js index b9f4c9242..1d546e006 100644 --- a/tests/unit/mixins/can-animate-test.js +++ b/tests/unit/mixins/can-animate-test.js @@ -1,9 +1,7 @@ -import Ember from 'ember'; +import Object from '@ember/object'; import CanAnimateMixin from 'code-corps-ember/mixins/can-animate'; import { module, test } from 'qunit'; -const { Object } = Ember; - module('Unit | Mixin | can animate'); // Replace this with your real tests. diff --git a/tests/unit/mixins/contains-code-test.js b/tests/unit/mixins/contains-code-test.js index 74d17e8c3..7d2874cd5 100644 --- a/tests/unit/mixins/contains-code-test.js +++ b/tests/unit/mixins/contains-code-test.js @@ -1,14 +1,10 @@ -import Ember from 'ember'; +import { getOwner } from '@ember/application'; +import { run } from '@ember/runloop'; import Model from 'ember-data/model'; import attr from 'ember-data/attr'; import ContainsCodeMixin from 'code-corps-ember/mixins/contains-code'; import { moduleFor, test } from 'ember-qunit'; -const { - getOwner, - run -} = Ember; - moduleFor('mixin:contains-code', 'Unit | Mixin | contains code mixin', { subject(record) { let ContainsCodeMixinObject = Model.extend(ContainsCodeMixin, { diff --git a/tests/unit/mixins/onboarding-controller-test.js b/tests/unit/mixins/onboarding-controller-test.js index d0fb17a23..2cdf032c9 100644 --- a/tests/unit/mixins/onboarding-controller-test.js +++ b/tests/unit/mixins/onboarding-controller-test.js @@ -1,9 +1,7 @@ -import Ember from 'ember'; +import Object from '@ember/object'; import OnboardingControllerMixin from 'code-corps-ember/mixins/onboarding-controller'; import { module, test } from 'qunit'; -const { Object } = Ember; - module('Unit | Mixin | onboarding controller'); // Replace this with your real tests. diff --git a/tests/unit/models/project-test.js b/tests/unit/models/project-test.js index db7e4cc74..7e7529b58 100644 --- a/tests/unit/models/project-test.js +++ b/tests/unit/models/project-test.js @@ -1,11 +1,7 @@ +import { run } from '@ember/runloop'; import { moduleForModel, test } from 'ember-qunit'; import { testForAttributes } from 'code-corps-ember/tests/helpers/attributes'; import { testForBelongsTo, testForHasMany } from '../../helpers/relationship'; -import Ember from 'ember'; - -const { - run -} = Ember; moduleForModel('project', 'Unit | Model | project', { // Specify the other units that are required for this test. diff --git a/tests/unit/services/current-user-test.js b/tests/unit/services/current-user-test.js index 5539411a5..af3249001 100644 --- a/tests/unit/services/current-user-test.js +++ b/tests/unit/services/current-user-test.js @@ -1,10 +1,6 @@ +import { get } from '@ember/object'; +import RSVP from 'rsvp'; import { moduleFor, test } from 'ember-qunit'; -import Ember from 'ember'; - -const { - get, - RSVP -} = Ember; moduleFor('service:current-user', 'Unit | Service | current user', { // Specify the other units that are required for this test. diff --git a/tests/unit/services/onboarding-test.js b/tests/unit/services/onboarding-test.js index 4a77bf571..bbea7ade8 100644 --- a/tests/unit/services/onboarding-test.js +++ b/tests/unit/services/onboarding-test.js @@ -1,7 +1,6 @@ +import { get } from '@ember/object'; +import { isPresent } from '@ember/utils'; import { moduleFor, test } from 'ember-qunit'; -import Ember from 'ember'; - -const { get, isPresent } = Ember; moduleFor('service:onboarding', 'Unit | Service | onboarding', { // Specify the other units that are required for this test. diff --git a/tests/unit/services/task-assignment-test.js b/tests/unit/services/task-assignment-test.js index 46b3d6458..90d143d3a 100644 --- a/tests/unit/services/task-assignment-test.js +++ b/tests/unit/services/task-assignment-test.js @@ -1,12 +1,7 @@ -import Ember from 'ember'; +import RSVP from 'rsvp'; +import { set, get } from '@ember/object'; import { moduleFor, test } from 'ember-qunit'; -const { - get, - RSVP, - set -} = Ember; - let mockStore = { createRecord() { return { diff --git a/tests/unit/utils/error-utils-test.js b/tests/unit/utils/error-utils-test.js index d6f93361f..857394a10 100644 --- a/tests/unit/utils/error-utils-test.js +++ b/tests/unit/utils/error-utils-test.js @@ -1,4 +1,8 @@ -import { formatError, isValidationError, isNonValidationError } from 'code-corps-ember/utils/error-utils'; +import { + formatError, + isValidationError, + isNonValidationError +} from 'code-corps-ember/utils/error-utils'; import { module, test } from 'qunit'; import DS from 'ember-data'; diff --git a/tests/unit/utils/records-list-test.js b/tests/unit/utils/records-list-test.js index 2f0da453a..b4a0aa33f 100644 --- a/tests/unit/utils/records-list-test.js +++ b/tests/unit/utils/records-list-test.js @@ -1,9 +1,7 @@ -import Ember from 'ember'; +import { isEmpty } from '@ember/utils'; import recordsList from 'code-corps-ember/utils/records-list'; import { module, test } from 'qunit'; -const { isEmpty } = Ember; - module('Unit | Utility | records-list'); let projectSkill = {