Discource-C
/
discourse-chat-integration
mirror of https://github.com/discourse/discourse-chat-integration.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid targetting "fa-" icon in test, prepare for FA5 in Discourse core

This commit is contained in:
Penar Musaraj 2018-11-01 18:03:39 -04:00
parent 5beaa359b7
commit 762300ab22
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/javascripts/discourse/templates/components/channel-details.hbs
View File

@ -2,7 +2,7 @@
<div class='pull-right'>
{{d-button action="edit" actionParam=channel icon="pencil" title="chat_integration.edit_channel" label="chat_integration.edit_channel"}}
{{d-button action="test" actionParam=channel icon="rocket" title="chat_integration.test_channel" label="chat_integration.test_channel"}}
{{d-button action="test" actionParam=channel icon="rocket" title="chat_integration.test_channel" label="chat_integration.test_channel" class="btn-chat-test"}}
{{d-button class='cancel' action="delete" actionParam=channel icon="trash" title="chat_integration.delete_channel" label="chat_integration.delete_channel"}}
</div>

2
plugin.rb
View File

@ -8,6 +8,8 @@ enabled_site_setting :chat_integration_enabled
register_asset "stylesheets/chat-integration-admin.scss"
register_svg_icon "rocket" if respond_to?(:register_svg_icon)
# Site setting validators must be loaded before initialize
require_relative "lib/discourse_chat/provider/slack/slack_enabled_setting_validator"

2
test/javascripts/acceptance/chat-integration-test.js.es6
View File

@ -266,7 +266,7 @@ test("Test channel works", assert => {
visit("/admin/plugins/chat");
andThen(() => {
click(".fa-rocket");
click(".btn-chat-test");
});
andThen(() => {