From 2b7fb43d841ca5ace4193c614e73a1c110e4b595 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 19 Mar 2018 18:47:17 +0800 Subject: [PATCH] Fix the build. --- .../components/group-membership-button.js.es6 | 6 +----- .../group-membership-button-test.js.es6 | 17 +---------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/app/assets/javascripts/discourse/components/group-membership-button.js.es6 b/app/assets/javascripts/discourse/components/group-membership-button.js.es6 index df22b7e429c..167eade276c 100644 --- a/app/assets/javascripts/discourse/components/group-membership-button.js.es6 +++ b/app/assets/javascripts/discourse/components/group-membership-button.js.es6 @@ -15,11 +15,7 @@ export default Ember.Component.extend({ @computed("model.is_group_user") userIsGroupUser(isGroupUser) { - if (isGroupUser !== undefined) { - return isGroupUser; - } else { - return false; - } + return !!isGroupUser; }, _showLoginModal() { diff --git a/test/javascripts/components/group-membership-button-test.js.es6 b/test/javascripts/components/group-membership-button-test.js.es6 index 1937d380886..a321d7ed4f8 100644 --- a/test/javascripts/components/group-membership-button-test.js.es6 +++ b/test/javascripts/components/group-membership-button-test.js.es6 @@ -61,22 +61,7 @@ QUnit.test('userIsGroupUser', function(assert) { assert.equal(this.subject().get('userIsGroupUser'), false); - this.subject().setProperties({ model: { id: 1 }, groupUserIds: [1] }); - - assert.equal(this.subject().get('userIsGroupUser'), true); - - this.subject().set('groupUserIds', [3]); - - assert.equal(this.subject().get('userIsGroupUser'), false); - - this.subject().set('groupUserIds', undefined); - - assert.equal(this.subject().get('userIsGroupUser'), false); - - this.subject().setProperties({ - groupUserIds: [1, 3], - model: { id: 1, is_group_user: false } - }); + this.subject().set('model.is_group_user', null); assert.equal(this.subject().get('userIsGroupUser'), false); });