From 44ade676e19c13e994f193cfe73d35bd5256f3bb Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 3 Oct 2017 18:11:58 +0800 Subject: [PATCH] Fix JS tests. --- .../admin-plugins-chat-edit-channel.js.es6 | 5 +++-- .../admin-plugins-chat-edit-rule.js.es6 | 5 +++-- .../modals/admin-plugins-chat-test.js.es6 | 11 ++++++----- .../modal/admin-plugins-chat-edit-rule.hbs | 9 +++------ .../modal/admin-plugins-chat-test.hbs | 19 +++++++++++++------ .../templates/admin/plugins-chat.hbs | 3 +-- .../acceptance/chat-integration-test.js.es6 | 6 +++--- 7 files changed, 32 insertions(+), 26 deletions(-) diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-channel.js.es6 b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-channel.js.es6 index 5e3822b..5bb4a5e 100644 --- a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-channel.js.es6 +++ b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-channel.js.es6 @@ -1,10 +1,11 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality'; import { popupAjaxError } from 'discourse/lib/ajax-error'; import InputValidation from 'discourse/models/input-validation'; -import { default as computed, observes } from 'ember-addons/ember-computed-decorators'; +import { default as computed, observes, on } from 'ember-addons/ember-computed-decorators'; export default Ember.Controller.extend(ModalFunctionality, { + @on('init') setupKeydown() { Ember.run.schedule('afterRender', () => { $('#chat_integration_edit_channel_modal').keydown(e => { @@ -13,7 +14,7 @@ export default Ember.Controller.extend(ModalFunctionality, { } }); }); - }.on('init'), + }, // The validation property must be defined at runtime since the possible parameters vary by provider @observes('model') diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-rule.js.es6 b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-rule.js.es6 index ea103a8..46a4c83 100644 --- a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-rule.js.es6 +++ b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-rule.js.es6 @@ -1,10 +1,11 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality'; import { popupAjaxError } from 'discourse/lib/ajax-error'; -import computed from "ember-addons/ember-computed-decorators"; +import { default as computed, on } from "ember-addons/ember-computed-decorators"; export default Ember.Controller.extend(ModalFunctionality, { saveDisabled: false, + @on('init') setupKeydown() { Ember.run.schedule('afterRender', () => { $('#chat_integration_edit_channel_modal').keydown(e => { @@ -13,7 +14,7 @@ export default Ember.Controller.extend(ModalFunctionality, { } }); }); - }.on('init'), + }, @computed('model.rule.type') showCategory(type) { diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6 b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6 index 6fcb3e8..b6395b1 100644 --- a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6 +++ b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6 @@ -1,8 +1,9 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality'; import { ajax } from 'discourse/lib/ajax'; -import computed from "ember-addons/ember-computed-decorators"; +import { default as computed, on } from "ember-addons/ember-computed-decorators"; export default Ember.Controller.extend(ModalFunctionality, { + @on('init') setupKeydown() { Ember.run.schedule('afterRender', () => { $('#chat_integration_test_modal').keydown(e => { @@ -11,7 +12,7 @@ export default Ember.Controller.extend(ModalFunctionality, { } }); }); - }.on('init'), + }, @computed('model.topic_id') sendDisabled(topicId) { @@ -21,8 +22,8 @@ export default Ember.Controller.extend(ModalFunctionality, { actions: { send() { if (this.get('sendDisabled')) return; - this.set('loading', true); + ajax("/admin/plugins/chat/test", { data: { channel_id: this.get('model.channel.id'), @@ -32,7 +33,7 @@ export default Ember.Controller.extend(ModalFunctionality, { }).then(() => { this.set('loading', false); this.flash(I18n.t('chat_integration.test_modal.success'), 'success'); - }.catch(popupAjaxError); + }).catch(popupAjaxError); } - + } }); diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-edit-rule.hbs b/assets/javascripts/admin/templates/modal/admin-plugins-chat-edit-rule.hbs index 30cee6a..24b5432 100644 --- a/assets/javascripts/admin/templates/modal/admin-plugins-chat-edit-rule.hbs +++ b/assets/javascripts/admin/templates/modal/admin-plugins-chat-edit-rule.hbs @@ -1,4 +1,4 @@ -{{#d-modal-body id="chat_integration_edit_rule_modal" title="chat_integration.edit_rule_modal.title"}} +{{!-- {{#d-modal-body id="chat_integration_edit_rule_modal" title="chat_integration.edit_rule_modal.title"}}
@@ -56,8 +56,7 @@ value=model.rule.category_id rootNoneLabel="chat_integration.all_categories" rootNone=true - overrideWidths=false - }} + overrideWidths=false}} @@ -77,8 +76,6 @@ {{/if}} - - {{#if siteSettings.tagging_enabled}} @@ -110,4 +107,4 @@ action="cancel" title="chat_integration.edit_rule_modal.cancel" label="chat_integration.edit_rule_modal.cancel"}} - + --}} diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-test.hbs b/assets/javascripts/admin/templates/modal/admin-plugins-chat-test.hbs index d0727f9..c936cf4 100644 --- a/assets/javascripts/admin/templates/modal/admin-plugins-chat-test.hbs +++ b/assets/javascripts/admin/templates/modal/admin-plugins-chat-test.hbs @@ -10,14 +10,21 @@
-
+ {{/d-modal-body}}
{{#conditional-loading-spinner condition=loading}} - {{d-button id="send_test" class='btn-primary btn-large' action="send" title="chat_integration.test_modal.send" label="chat_integration.test_modal.send" disabled=sendDisabled}} - - {{d-button class="btn-large" action="closeModal" title="chat_integration.test_modal.close" label="chat_integration.test_modal.close"}} - {{/conditional-loading-spinner}} + {{d-button id="send-test" + class='btn-primary btn-large' + action="send" + title="chat_integration.test_modal.send" + label="chat_integration.test_modal.send" + disabled=sendDisabled}} -
\ No newline at end of file + {{d-button class="btn-large" + action="closeModal" + title="chat_integration.test_modal.close" + label="chat_integration.test_modal.close"}} + {{/conditional-loading-spinner}} + diff --git a/assets/javascripts/discourse/templates/admin/plugins-chat.hbs b/assets/javascripts/discourse/templates/admin/plugins-chat.hbs index 14a8fab..7b0036a 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-chat.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-chat.hbs @@ -9,8 +9,7 @@
- {{#d-button - action="showSettings" + {{d-button action="showSettings" icon="gear" title="chat_integration.settings" label="chat_integration.settings"}} diff --git a/test/javascripts/acceptance/chat-integration-test.js.es6 b/test/javascripts/acceptance/chat-integration-test.js.es6 index e9ef089..084ecb8 100644 --- a/test/javascripts/acceptance/chat-integration-test.js.es6 +++ b/test/javascripts/acceptance/chat-integration-test.js.es6 @@ -200,7 +200,7 @@ test("Test channel works", assert => { andThen(() => { assert.ok(exists('#chat_integration_test_modal'), 'it displays the modal'); - assert.ok(find('#send_test').prop('disabled'), 'it disables the send button'); + assert.ok(find('#send-test').prop('disabled'), 'it disables the send button'); fillIn('#choose-topic-title', '9318'); }); @@ -209,11 +209,11 @@ test("Test channel works", assert => { }); andThen(() => { - assert.ok(find('#send_test').prop('disabled') === false, 'it enables the send button'); + assert.ok(find('#send-test').prop('disabled') === false, 'it enables the send button'); }); andThen(() => { - click('#send_test'); + click('#send-test'); }); andThen(() => {