From abdfac9cb5acb8b0de8f71533194a240cfca7930 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 6 Nov 2017 10:30:58 +0800 Subject: [PATCH] FIX: Allow group members to freely exit group option incorrectly disabled. https://meta.discourse.org/t/cannot-check-allow-members-to-leave-group-freely-when-group-is-configured-to-allow-users-to-send-membership-requests-to-group-owners/73400 --- app/assets/javascripts/discourse/templates/group-edit.hbs | 3 +-- test/javascripts/acceptance/group-edit-test.js.es6 | 5 +++++ test/javascripts/fixtures/group-fixtures.js.es6 | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/group-edit.hbs b/app/assets/javascripts/discourse/templates/group-edit.hbs index 9f8624f13a..b149a4ad7f 100644 --- a/app/assets/javascripts/discourse/templates/group-edit.hbs +++ b/app/assets/javascripts/discourse/templates/group-edit.hbs @@ -33,8 +33,7 @@ diff --git a/test/javascripts/acceptance/group-edit-test.js.es6 b/test/javascripts/acceptance/group-edit-test.js.es6 index 47fe847cf5..4b1f3f987e 100644 --- a/test/javascripts/acceptance/group-edit-test.js.es6 +++ b/test/javascripts/acceptance/group-edit-test.js.es6 @@ -43,6 +43,11 @@ QUnit.test("Editing group", assert => { 'it should disable group public admission input' ); + assert.ok( + find('.group-edit-public-exit[disabled]').length === 0, + 'it should not disable group public exit input' + ); + assert.equal( find('.group-edit-membership-request-template').length, 1, 'it should display the membership request template field' diff --git a/test/javascripts/fixtures/group-fixtures.js.es6 b/test/javascripts/fixtures/group-fixtures.js.es6 index 78aab0abf8..07cb5ef9f5 100644 --- a/test/javascripts/fixtures/group-fixtures.js.es6 +++ b/test/javascripts/fixtures/group-fixtures.js.es6 @@ -9,7 +9,7 @@ export default { "alias_level":99, "visible":true, "public_admission":true, - "public_exit":true, + "public_exit":false, "flair_url": 'fa-adjust', "is_group_owner":true, "mentionable":true,