Revert font awesome 5 changes

We are still pushing ahead on this 100% just need a bit longer to prepare
all plugins

test/javascripts/acceptance/composer-actions-test.js.es6

@@ -88,7 +88,11 @@ QUnit.test("replying to post - toggle_whisper", async assert => {
   await composerActions.expand();
   await composerActions.selectRowByValue("toggle_whisper");
 
-  assert.ok(find(".composer-fields .whisper .d-icon-eye-slash").length === 1);
+  assert.ok(
+    find(".composer-fields .whisper")
+      .text()
+      .indexOf(I18n.t("composer.whisper")) > 0
+  );
 });
 
 QUnit.test("replying to post - reply_as_new_topic", async assert => {

test/javascripts/acceptance/composer-test.js.es6

@@ -375,7 +375,9 @@ QUnit.test("Composer can toggle whispers", async assert => {
   );
 
   assert.ok(
-    find(".composer-fields .whisper .d-icon-eye-slash").length === 1,
+    find(".composer-fields .whisper")
+      .text()
+      .indexOf(I18n.t("composer.whisper")) > 0,
     "it sets the post type to whisper"
   );
 
@@ -385,7 +387,9 @@ QUnit.test("Composer can toggle whispers", async assert => {
   );
 
   assert.ok(
-    find(".composer-fields .whisper .d-icon-eye-slash").length === 0,
+    find(".composer-fields .whisper")
+      .text()
+      .indexOf(I18n.t("composer.whisper")) <= 0,
     "it removes the whisper mode"
   );
 });
@@ -402,7 +406,9 @@ QUnit.test(
     );
 
     assert.ok(
-      find(".composer-fields .whisper .d-icon-eye-slash").length === 1,
+      find(".composer-fields .whisper")
+        .text()
+        .indexOf(I18n.t("composer.whisper")) > 0,
       "it sets the post type to whisper"
     );
 
@@ -411,7 +417,9 @@ QUnit.test(
 
     await click("#create-topic");
     assert.ok(
-      find(".composer-fields .whisper .d-icon-eye-slash").length === 0,
+      find(".composer-fields .whisper")
+        .text()
+        .indexOf(I18n.t("composer.whisper")) === -1,
       "it should reset the state of the composer's model"
     );
 

test/javascripts/acceptance/group-index-test.js.es6

@@ -6,7 +6,7 @@ QUnit.test("Viewing Members as anon user", async assert => {
   await visit("/groups/discourse");
 
   assert.ok(
-    count(".avatar-flair .d-icon-adjust") === 1,
+    count(".avatar-flair .fa-adjust") === 1,
     "it displays the group's avatar flair"
   );
   assert.ok(count(".group-members tr") > 0, "it lists group members");

test/javascripts/admin/components/themes-list-item-test.js.es6

@@ -11,7 +11,7 @@ componentTest("default theme", {
 
   test(assert) {
     assert.expect(1);
-    assert.equal(this.$(".d-icon-check").length, 1, "shows default theme icon");
+    assert.equal(this.$(".fa-check").length, 1, "shows default theme icon");
   }
 });
 
@@ -26,15 +26,11 @@ componentTest("pending updates", {
 
   test(assert) {
     assert.expect(1);
-    assert.equal(
-      this.$(".d-icon-refresh").length,
-      1,
-      "shows pending update icon"
-    );
+    assert.equal(this.$(".fa-refresh").length, 1, "shows pending update icon");
   }
 });
 
-componentTest("broken theme", {
+componentTest("borken theme", {
   template: "{{themes-list-item theme=theme}}",
   beforeEach() {
     this.set(
@@ -49,7 +45,7 @@ componentTest("broken theme", {
   test(assert) {
     assert.expect(1);
     assert.equal(
-      this.$(".d-icon-exclamation-circle").length,
+      this.$(".fa-exclamation-circle").length,
       1,
       "shows broken theme icon"
     );

test/javascripts/components/d-icon-test.js.es6

@@ -9,10 +9,7 @@ componentTest("default", {
     const html = this.$()
       .html()
       .trim();
-    assert.equal(
-      html,
-      '<svg class="fa d-icon d-icon-bars svg-icon svg-string" xmlns="http://www.w3.org/2000/svg"><use xlink:href="#bars"></use></svg>'
-    );
+    assert.equal(html, '<i class="fa fa-bars d-icon d-icon-bars"></i>');
   }
 });
 
@@ -25,7 +22,7 @@ componentTest("with replacement", {
       .trim();
     assert.equal(
       html,
-      '<svg class="fa d-icon d-icon-d-watching svg-icon svg-string" xmlns="http://www.w3.org/2000/svg"><use xlink:href="#exclamation-circle"></use></svg>'
+      '<i class="fa fa-exclamation-circle d-icon d-icon-d-watching"></i>'
     );
   }
 });

test/javascripts/widgets/avatar-flair-test.js.es6

@@ -1,36 +0,0 @@
-import { moduleForWidget, widgetTest } from "helpers/widget-test";
-
-moduleForWidget("avatar-flair");
-
-widgetTest("avatar flair with an icon", {
-  template: '{{mount-widget widget="avatar-flair" args=args}}',
-  beforeEach() {
-    this.set("args", {
-      primary_group_flair_url: "fa-bars",
-      primary_group_flair_bg_color: "CC0000",
-      primary_group_flair_color: "FFFFFF"
-    });
-  },
-  test(assert) {
-    assert.ok(this.$(".avatar-flair").length, "it has the tag");
-    assert.ok(this.$("svg.d-icon-bars").length, "it has the svg icon");
-    assert.equal(
-      this.$(".avatar-flair").attr("style"),
-      "background-color: #CC0000; color: #FFFFFF; ",
-      "it has styles"
-    );
-  }
-});
-
-widgetTest("avatar flair with an image", {
-  template: '{{mount-widget widget="avatar-flair" args=args}}',
-  beforeEach() {
-    this.set("args", {
-      primary_group_flair_url: "/images/avatar.png"
-    });
-  },
-  test(assert) {
-    assert.ok(this.$(".avatar-flair").length, "it has the tag");
-    assert.ok(this.$("svg").length === 0, "it does not have an svg icon");
-  }
-});

test/javascripts/widgets/widget-test.js.es6

@@ -217,7 +217,7 @@ widgetTest("handlebars d-icon", {
   },
 
   test(assert) {
-    assert.equal(this.$(".d-icon-arrow-down").length, 1);
+    assert.equal(this.$("i.fa.fa-arrow-down").length, 1);
   }
 });