REFACTOR: Import QUnit and related helpers rather than globals

We used many global functions to handle tests when they should be imported like other libraries in our application. This also gets us closer to the way Ember CLI prefers our tests to be laid out.
2020-10-06 12:54:05 -04:00
parent c0293339b8
commit 71d37953d5
238 changed files with 2384 additions and 2406 deletions
@@ -1,4 +1,5 @@
 import componentTest from "discourse/tests/helpers/component-test";
+import { moduleForComponent } from "ember-qunit";

 moduleForComponent("ace-editor", { integration: true });

@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import componentTest from "discourse/tests/helpers/component-test";
 import pretender from "discourse/tests/helpers/create-pretender";

@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import componentTest from "discourse/tests/helpers/component-test";
 import EmberObject from "@ember/object";
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import componentTest from "discourse/tests/helpers/component-test";
 import pretender from "discourse/tests/helpers/create-pretender";
 import { resetCache } from "pretty-text/upload-short-url";
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import I18n from "I18n";
 import componentTest from "discourse/tests/helpers/component-test";
 moduleForComponent("d-button", { integration: true });
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import I18n from "I18n";
 import { next } from "@ember/runloop";
 import { clearToolbarCallbacks } from "discourse/components/d-editor";
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import componentTest from "discourse/tests/helpers/component-test";

 moduleForComponent("d-icon", { integration: true });
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import componentTest from "discourse/tests/helpers/component-test";

 moduleForComponent("date-input", { integration: true });
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import componentTest from "discourse/tests/helpers/component-test";

 moduleForComponent("date-time-input-range", { integration: true });
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import componentTest from "discourse/tests/helpers/component-test";

 moduleForComponent("date-time-input", { integration: true });
@@ -1,6 +1,9 @@
+import { test } from "qunit";
+import { moduleFor } from "ember-qunit";
+
 moduleFor("component:group-membership-button");

-QUnit.test("canJoinGroup", function (assert) {
+test("canJoinGroup", function (assert) {
  this.subject().setProperties({
    model: { public_admission: false, is_group_user: true },
  });
@@ -28,7 +31,7 @@ QUnit.test("canJoinGroup", function (assert) {
  );
 });

-QUnit.test("canLeaveGroup", function (assert) {
+test("canLeaveGroup", function (assert) {
  this.subject().setProperties({
    model: { public_exit: false, is_group_user: false },
  });
@@ -56,7 +59,7 @@ QUnit.test("canLeaveGroup", function (assert) {
  );
 });

-QUnit.test("canRequestMembership", function (assert) {
+test("canRequestMembership", function (assert) {
  this.subject().setProperties({
    model: { allow_membership_requests: true, is_group_user: true },
  });
@@ -76,7 +79,7 @@ QUnit.test("canRequestMembership", function (assert) {
  );
 });

-QUnit.test("userIsGroupUser", function (assert) {
+test("userIsGroupUser", function (assert) {
  this.subject().setProperties({
    model: { is_group_user: true },
  });
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import componentTest from "discourse/tests/helpers/component-test";

 const LONG_CODE_BLOCK = "puts a\n".repeat(15000);
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import componentTest from "discourse/tests/helpers/component-test";
 moduleForComponent("html-safe-helper", { integration: true });

@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import componentTest from "discourse/tests/helpers/component-test";

 moduleForComponent("iframed-html", { integration: true });
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import componentTest from "discourse/tests/helpers/component-test";
 moduleForComponent("image-uploader", { integration: true });

@@ -1,9 +1,10 @@
+import { test, module } from "qunit";
 import DiscourseURL from "discourse/lib/url";

 var testMouseTrap;
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";

-QUnit.module("lib:keyboard-shortcuts", {
+module("lib:keyboard-shortcuts", {
  beforeEach() {
    var _bindings = {};

@@ -115,21 +116,21 @@ Object.keys(functionBindings).forEach((func) => {
  });
 });

-QUnit.test("selectDown calls _moveSelection with 1", (assert) => {
+test("selectDown calls _moveSelection with 1", (assert) => {
  var stub = sandbox.stub(KeyboardShortcuts, "_moveSelection");

  KeyboardShortcuts.selectDown();
  assert.ok(stub.calledWith(1), "_moveSelection is called with 1");
 });

-QUnit.test("selectUp calls _moveSelection with -1", (assert) => {
+test("selectUp calls _moveSelection with -1", (assert) => {
  var stub = sandbox.stub(KeyboardShortcuts, "_moveSelection");

  KeyboardShortcuts.selectUp();
  assert.ok(stub.calledWith(-1), "_moveSelection is called with -1");
 });

-QUnit.test("goBack calls history.back", (assert) => {
+test("goBack calls history.back", (assert) => {
  var called = false;
  sandbox.stub(history, "back").callsFake(function () {
    called = true;
@@ -139,14 +140,14 @@ QUnit.test("goBack calls history.back", (assert) => {
  assert.ok(called, "history.back is called");
 });

-QUnit.test("nextSection calls _changeSection with 1", (assert) => {
+test("nextSection calls _changeSection with 1", (assert) => {
  var spy = sandbox.spy(KeyboardShortcuts, "_changeSection");

  KeyboardShortcuts.nextSection();
  assert.ok(spy.calledWith(1), "_changeSection is called with 1");
 });

-QUnit.test("prevSection calls _changeSection with -1", (assert) => {
+test("prevSection calls _changeSection with -1", (assert) => {
  var spy = sandbox.spy(KeyboardShortcuts, "_changeSection");

  KeyboardShortcuts.prevSection();
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import { configureEyeline } from "discourse/lib/eyeline";
 import componentTest from "discourse/tests/helpers/component-test";

@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import I18n from "I18n";
 import componentTest from "discourse/tests/helpers/component-test";
 moduleForComponent("secret-value-list", { integration: true });
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import componentTest from "discourse/tests/helpers/component-test";

@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import componentTest from "discourse/tests/helpers/component-test";

@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import componentTest from "discourse/tests/helpers/component-test";
 import Topic from "discourse/models/topic";
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import I18n from "I18n";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import componentTest from "discourse/tests/helpers/component-test";
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import I18n from "I18n";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import componentTest from "discourse/tests/helpers/component-test";
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import componentTest from "discourse/tests/helpers/component-test";

 moduleForComponent("share-button", { integration: true });
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import componentTest from "discourse/tests/helpers/component-test";
 moduleForComponent("simple-list", { integration: true });

@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import I18n from "I18n";
 import componentTest from "discourse/tests/helpers/component-test";

@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import componentTest from "discourse/tests/helpers/component-test";

@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import componentTest from "discourse/tests/helpers/component-test";

 moduleForComponent("user-selector", { integration: true });
@@ -1,3 +1,4 @@
+import { moduleForComponent } from "ember-qunit";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import componentTest from "discourse/tests/helpers/component-test";
 moduleForComponent("value-list", { integration: true });