REFACTOR: Use the new format for acceptance tests. (#126)

test/javascripts/acceptance/assign-disabled-test.js.es6

@@ -1,17 +1,14 @@
-import selectKit from "helpers/select-kit-helper";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
+import { acceptance, updateCurrentUser } from "discourse/tests/helpers/qunit-helpers";
 import { clearTopicFooterButtons } from "discourse/lib/register-topic-footer-button";
 
-acceptance("Assign disabled mobile", {
+acceptance("Assign disabled mobile", function (needs) {
-  loggedIn: true,
+  needs.user();
-  mobileView: true,
+  needs.mobileView();
-  settings: { assign_enabled: false },
+  needs.settings({ assign_enabled: false });
-  beforeEach() {
+  needs.hooks.beforeEach(() => clearTopicFooterButtons());
-    clearTopicFooterButtons();
-  },
-});
 
-QUnit.test("Footer dropdown does not contain button", async (assert) => {
+  test("Footer dropdown does not contain button", async (assert) => {
     updateCurrentUser({ can_assign: true });
     const menu = selectKit(".topic-footer-mobile-dropdown");
 
@@ -19,4 +16,5 @@ QUnit.test("Footer dropdown does not contain button", async (assert) => {
     await menu.expand();
 
     assert.notOk(menu.rowByValue("assign").exists());
+  });
 });

test/javascripts/acceptance/assign-enabled-test.js.es6

@@ -1,17 +1,14 @@
-import selectKit from "helpers/select-kit-helper";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
+import { acceptance, updateCurrentUser } from "discourse/tests/helpers/qunit-helpers";
 import { clearTopicFooterButtons } from "discourse/lib/register-topic-footer-button";
 
-acceptance("Assign mobile", {
+acceptance("Assign mobile", function (needs) {
-  loggedIn: true,
+  needs.user();
-  mobileView: true,
+  needs.mobileView();
-  settings: { assign_enabled: true },
+  needs.settings({ assign_enabled: true });
-  beforeEach() {
+  needs.hooks.beforeEach(() => clearTopicFooterButtons());
-    clearTopicFooterButtons();
-  },
-});
 
-QUnit.test("Footer dropdown contains button", async (assert) => {
+  test("Footer dropdown contains button", async (assert) => {
     updateCurrentUser({ can_assign: true });
     const menu = selectKit(".topic-footer-mobile-dropdown");
 
@@ -19,4 +16,5 @@ QUnit.test("Footer dropdown contains button", async (assert) => {
     await menu.expand();
 
     assert.ok(menu.rowByValue("assign").exists());
+  });
 });

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

@@ -1,11 +1,11 @@
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { default as AssignedTopics } from "../fixtures/assigned-group-assignments-fixtures";
 import { default as GroupMembers } from "../fixtures/group-members-fixtures";
 
-acceptance("GroupAssignments", {
+acceptance("GroupAssignments", function (needs) {
-  loggedIn: true,
+  needs.user();
-  settings: { assign_enabled: true, assigns_user_url_path: "/" },
+  needs.settings({ assign_enabled: true, assigns_user_url_path: "/" });
-  pretend(server, helper) {
+  needs.pretender((server, helper) => {
     const groupPath = "/topics/group-topics-assigned/discourse.json";
     const memberPath = "/topics/messages-assigned/ahmedgagan6.json";
     const getMembersPath = "/assign/members/discourse";
@@ -15,17 +15,17 @@ acceptance("GroupAssignments", {
     server.get(groupPath, () => helper.response(groupAssigns));
     server.get(memberPath, () => helper.response(memberAssigns));
     server.get(getMembersPath, () => helper.response(getMembers));
-  },
+  });
-});
 
-QUnit.test("Group Assignments Everyone", async (assert) => {
+  test("Group Assignments Everyone", async (assert) => {
     await visit("/g/discourse/assigned");
     assert.equal(currentPath(), "group.assigned.show");
     assert.ok(find(".topic-list-item").length === 1);
-});
+  });
 
-QUnit.test("Group Assignments Ahmedgagan", async (assert) => {
+  test("Group Assignments Ahmedgagan", async (assert) => {
     await visit("/g/discourse/assigned/ahmedgagan6");
     assert.equal(currentPath(), "group.assigned.show");
     assert.ok(find(".topic-list-item").length === 1);
+  });
 });

test/javascripts/acceptance/quick-access-assignments-test.js.es6

@@ -1,23 +1,20 @@
-import { acceptance, updateCurrentUser } from "helpers/qunit-helpers";
+import { acceptance, updateCurrentUser } from "discourse/tests/helpers/qunit-helpers";
 import { default as AssignedTopics } from "../fixtures/assigned-topics-fixtures";
 
 const USER_MENU = "#current-user.header-dropdown-toggle";
 const QUICK_ACCESS_ASSIGNMENTS_TAB = ".widget-link.assigned";
 
-acceptance("Quick access assignments panel", {
+acceptance("Quick access assignments panel", function (needs) {
-  loggedIn: true,
+  needs.user();
-  settings: {
+  needs.settings({ assign_enabled: true, assigns_user_url_path: "/"});
-    assign_enabled: true,
+  
-    assigns_user_url_path: "/",
+  needs.pretender((server, helper) => {
-  },
-  pretend(server, helper) {
     const messagesPath = "/topics/messages-assigned/eviltrout.json";
     const assigns = AssignedTopics[messagesPath];
     server.get(messagesPath, () => helper.response(assigns));
-  },
+  });
-});
 
-QUnit.test("Quick access assignments panel", async (assert) => {
+  test("Quick access assignments panel", async (assert) => {
     updateCurrentUser({ can_assign: true });
 
     await visit("/");
@@ -35,4 +32,5 @@ QUnit.test("Quick access assignments panel", async (assert) => {
       "user.userActivity.assigned",
       "a second click should redirect to the full assignments page"
     );
+  });
 });

test/javascripts/acceptance/search-full-test.js.es6

@@ -1,11 +1,11 @@
-import selectKit from "helpers/select-kit-helper";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { acceptance, waitFor, updateCurrentUser } from "helpers/qunit-helpers";
+import { acceptance, waitFor, updateCurrentUser } from "discourse/tests/helpers/qunit-helpers";
 
-acceptance("Search - Full Page", {
+acceptance("Search - Full Page", function (needs) {
-  settings: { assign_enabled: true },
+  needs.settings({ assign_enabled: true });
-  loggedIn: true,
+  needs.user();
-});
+
-QUnit.test(
+  test(
     "update in:assigned filter through advanced search ui",
     async (assert) => {
       updateCurrentUser({ can_assign: true });
@@ -27,9 +27,9 @@ QUnit.test(
         'has updated search term to "none in:assinged"'
       );
     }
-);
+  );
 
-QUnit.test(
+  test(
     "update in:unassigned filter through advanced search ui",
     async (assert) => {
       updateCurrentUser({ can_assign: true });
@@ -51,9 +51,9 @@ QUnit.test(
         'has updated search term to "none in:unassinged"'
       );
     }
-);
+  );
 
-QUnit.skip("update assigned to through advanced search ui", async (assert) => {
+  skip("update assigned to through advanced search ui", async (assert) => {
     updateCurrentUser({ can_assign: true });
     await visit("/search");
     await fillIn(".search-query", "none");
@@ -88,4 +88,5 @@ QUnit.skip("update assigned to through advanced search ui", async (assert) => {
         'has updated search term to "none assigned:admin"'
       );
     });
+  });
 });

test/javascripts/acceptance/un-assign-from-list-test.js.es6

@@ -1,21 +1,17 @@
-import selectKit from "helpers/select-kit-helper";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { default as AssignedTopics } from "../fixtures/assigned-topics-fixtures";
 
-acceptance("UnAssign/Re-assign from the topics list", {
+acceptance("UnAssign/Re-assign from the topics list", function (needs) {
-  loggedIn: true,
+  needs.user();
-  settings: {
+  needs.settings({ assign_enabled: true, assigns_user_url_path: "/"});
-    assign_enabled: true,
+  needs.pretender((server, helper) => {
-    assigns_user_url_path: "/",
-  },
-  pretend(server, helper) {
     const messagesPath = "/topics/messages-assigned/eviltrout.json";
     const assigns = AssignedTopics[messagesPath];
     server.get(messagesPath, () => helper.response(assigns));
-  },
+  });
-});
 
-QUnit.test("Unassing/Re-assign options are visible", async (assert) => {
+  test("Unassing/Re-assign options are visible", async (assert) => {
     const options = selectKit(".assign-actions-dropdown");
 
     await visit("/u/eviltrout/activity/assigned");
@@ -23,4 +19,5 @@ QUnit.test("Unassing/Re-assign options are visible", async (assert) => {
 
     assert.equal(find("li[data-value='unassign']").length, 1);
     assert.equal(find("li[data-value='reassign']").length, 1);
+  });
 });

test/javascripts/components/group-assigned-filter-test.js.es6

@@ -1,4 +1,4 @@
-import componentTest from "helpers/component-test";
+import componentTest from "discourse/tests/helpers/component-test";
 
 moduleForComponent("group-assigned-filter", { integration: true });