From 762300ab226281951eaddda87d0d075ed5fdc280 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 1 Nov 2018 18:03:39 -0400
Subject: [PATCH] Avoid targetting "fa-" icon in test, prepare for FA5 in
 Discourse core

---
 .../discourse/templates/components/channel-details.hbs          | 2 +-
 plugin.rb                                                       | 2 ++
 test/javascripts/acceptance/chat-integration-test.js.es6        | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/assets/javascripts/discourse/templates/components/channel-details.hbs b/assets/javascripts/discourse/templates/components/channel-details.hbs
index 82e495e..5be29ae 100644
--- a/assets/javascripts/discourse/templates/components/channel-details.hbs
+++ b/assets/javascripts/discourse/templates/components/channel-details.hbs
@@ -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>
diff --git a/plugin.rb b/plugin.rb
index cf40829..53ba4a3 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -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"
 
diff --git a/test/javascripts/acceptance/chat-integration-test.js.es6 b/test/javascripts/acceptance/chat-integration-test.js.es6
index 6259bb6..a4ae81f 100755
--- a/test/javascripts/acceptance/chat-integration-test.js.es6
+++ b/test/javascripts/acceptance/chat-integration-test.js.es6
@@ -266,7 +266,7 @@ test("Test channel works", assert => {
   visit("/admin/plugins/chat");
 
   andThen(() => {
-    click(".fa-rocket");
+    click(".btn-chat-test");
   });
 
   andThen(() => {