Revert "Merge branch 'master' of https://github.com/discourse/discourse"

This reverts commit e62a85cf6f, reversing
changes made to 2660c2e21d.

test/javascripts/acceptance/category-chooser-test.js

@@ -29,19 +29,3 @@ QUnit.test("prefill category when category_id is set", async assert => {
     1
   );
 });
-
-QUnit.test("filter is case insensitive", async assert => {
-  const categoryChooser = selectKit(".category-chooser");
-
-  await visit("/");
-  await click("#create-topic");
-  await categoryChooser.expand();
-  await categoryChooser.fillInFilter("bug");
-
-  assert.ok(categoryChooser.rows().length, 1);
-
-  await categoryChooser.emptyFilter();
-  await categoryChooser.fillInFilter("Bug");
-
-  assert.ok(categoryChooser.rows().length, 1);
-});

test/javascripts/acceptance/emoji-picker-test.js

@@ -168,6 +168,19 @@ QUnit.test(
   }
 );
 
+QUnit.test("emoji picker lazy loads emojis", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click("#topic-footer-buttons .btn.create");
+
+  await click("button.emoji.btn");
+
+  assert.equal(
+    find('.emoji-picker button[title="massage_woman"]').css("background-image"),
+    "none",
+    "it doesn't load invisible emojis"
+  );
+});
+
 QUnit.test("emoji picker persists state", async assert => {
   await visit("/t/internationalization-localization/280");
   await click("#topic-footer-buttons .btn.create");

test/javascripts/acceptance/preferences-test.js

@@ -1,6 +1,7 @@
 import I18n from "I18n";
 import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
 import selectKit from "helpers/select-kit-helper";
+
 import User from "discourse/models/user";
 
 acceptance("User Preferences", {