From 8ace7f1b534d416a3032093b7fc64a5143ea4615 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 28 Mar 2017 13:25:14 +0000 Subject: [PATCH] chore(package): update ember-concurrency to version 0.8.1 Closes #1198 https://greenkeeper.io/ --- app/components/signup-form.js | 32 ++++++++++--------- package.json | 2 +- .../integration/components/user-menu-test.js | 2 +- tests/pages/components/user-menu.js | 2 ++ yarn.lock | 14 ++++++-- 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/app/components/signup-form.js b/app/components/signup-form.js index cb1349eeb..10da7f95e 100644 --- a/app/components/signup-form.js +++ b/app/components/signup-form.js @@ -5,7 +5,9 @@ const { Component, computed, computed: { alias, and, gte }, - run: { later } + get, + run: { later }, + set } = Ember; export default Component.extend({ @@ -19,50 +21,50 @@ export default Component.extend({ passwordValid: gte('passwordLength', 6), password: computed('user.password', function() { - return this.get('user.password') || ''; + return get(this, 'user.password') || ''; }), actions: { emailValidated(result) { - this.set('emailValid', result); + set(this, 'emailValid', result); }, signUp() { - if (this.get('canSubmit')) { - this.get('_submit').perform(); + if (get(this, 'canSubmit')) { + get(this, '_submit').perform(); } else { this._shakeButton(); } }, usernameValidated(result) { - this.set('usernameValid', result); + set(this, 'usernameValid', result); } }, _setError() { - this.set('hasError', true); + set(this, 'hasError', true); }, _shakeButton() { - if (!this.get('hasError')) { - this.set('hasError', true); + if (!get(this, 'hasError')) { + set(this, 'hasError', true); later(this, function() { - this.set('hasError', false); + set(this, 'hasError', false); }, 1000); } }, _submit: task(function* () { let credentials = { - identification: this.get('user.email'), - password: this.get('user.password') + identification: get(this, 'user.email'), + password: get(this, 'user.password') }; - let promise = this.get('user').save().then(() => { - this.get('signIn')(credentials); + let promise = get(this, 'user').save().then(() => { + get(this, 'signIn')(credentials); }).catch((error) => { - this.get('handleErrors')(error); + get(this, 'handleErrors')(error); }); yield promise; diff --git a/package.json b/package.json index 235e59019..5de7b4b10 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "ember-cli-uglify": "^1.2.0", "ember-click-outside": "0.1.6", "ember-composable-helpers": "2.0.0", - "ember-concurrency": "^0.7.11", + "ember-concurrency": "^0.8.1", "ember-data": "^2.12.0", "ember-deferred-content": "0.2.0", "ember-disable-proxy-controllers": "^1.0.1", diff --git a/tests/integration/components/user-menu-test.js b/tests/integration/components/user-menu-test.js index 30985448a..1c8c6aa03 100644 --- a/tests/integration/components/user-menu-test.js +++ b/tests/integration/components/user-menu-test.js @@ -60,6 +60,6 @@ test('clicking the menu toggles the dropdown', function(assert) { assert.ok(page.dropdownIsHidden, 'The dropdown is initially hidden'); page.toggle(); assert.notOk(page.dropdownIsHidden, 'The dropdown is now visible'); - this.$('.user-menu .dropdown-menu').click(); + page.clickDropdownMenu(); assert.ok(page.dropdownIsHidden, 'The dropdown is now hidden'); }); diff --git a/tests/pages/components/user-menu.js b/tests/pages/components/user-menu.js index d3e80a5c6..658727740 100644 --- a/tests/pages/components/user-menu.js +++ b/tests/pages/components/user-menu.js @@ -3,6 +3,8 @@ import { attribute, clickable, hasClass, isVisible, text } from 'ember-cli-page- export default { scope: '.user-menu', + clickDropdownMenu: clickable('.dropdown-menu'), + dropdownIsHidden: hasClass('menu-hidden'), icon: { diff --git a/yarn.lock b/yarn.lock index 26699f437..4ed8844a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2313,7 +2313,7 @@ ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-c ember-cli-version-checker "^1.0.2" resolve "^1.1.2" -ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.0.0-beta.9: +ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.5, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.0.0-beta.9: version "6.0.0-beta.9" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.0.0-beta.9.tgz#b597d52f12d4429cd5716b55f749ebf6144b7b16" dependencies: @@ -2945,7 +2945,7 @@ ember-composable-helpers@2.0.0: broccoli-funnel "^1.0.1" ember-cli-babel "^5.1.7" -ember-concurrency@^0.7.11, ember-concurrency@^0.7.15: +ember-concurrency@^0.7.15: version "0.7.19" resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.7.19.tgz#095f2ede1b56ab068958cac5b55e77b9de67e1c6" dependencies: @@ -2953,6 +2953,14 @@ ember-concurrency@^0.7.11, ember-concurrency@^0.7.15: ember-getowner-polyfill "^1.1.0" ember-maybe-import-regenerator "^0.1.4" +ember-concurrency@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.8.1.tgz#28f4e05d1afe15f9d8611f37a87a59ce8c21a331" + dependencies: + ember-cli-babel "^6.0.0-beta.5" + ember-getowner-polyfill "^1.1.0" + ember-maybe-import-regenerator "^0.1.5" + ember-cookies@^0.0.12: version "0.0.12" resolved "https://registry.yarnpkg.com/ember-cookies/-/ember-cookies-0.0.12.tgz#aba3a4a2c36f856e0bba35a4ecf6a58f8950eb9c" @@ -3104,7 +3112,7 @@ ember-macro-helpers@^0.4.0: dependencies: ember-cli-babel "^5.1.7" -ember-maybe-import-regenerator@^0.1.4: +ember-maybe-import-regenerator@^0.1.4, ember-maybe-import-regenerator@^0.1.5: version "0.1.6" resolved "https://registry.yarnpkg.com/ember-maybe-import-regenerator/-/ember-maybe-import-regenerator-0.1.6.tgz#35d41828afa6d6a59bc0da3ce47f34c573d776ca" dependencies: