From b5735f98e934ff207db3f3ce0fd5332f8c114b41 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 16 Jul 2020 16:06:27 -0400
Subject: [PATCH] FIX: Remove more computed properties being set

Note: This also removes a test. The test had not properly stubbed its
request and was erroring in dev mode, and the test was relying on the
erronous result.
---
 .../acceptance/topic-edit-timer-test.js       | 43 +++----------------
 1 file changed, 7 insertions(+), 36 deletions(-)

diff --git a/test/javascripts/acceptance/topic-edit-timer-test.js b/test/javascripts/acceptance/topic-edit-timer-test.js
index 2074262cfe3..262b9191160 100644
--- a/test/javascripts/acceptance/topic-edit-timer-test.js
+++ b/test/javascripts/acceptance/topic-edit-timer-test.js
@@ -20,7 +20,7 @@ acceptance("Topic - Edit timer", {
 });
 
 QUnit.test("default", async assert => {
-  updateCurrentUser({ moderator: true, canManageTopic: true });
+  updateCurrentUser({ moderator: true });
   const timerType = selectKit(".select-kit.timer-type");
   const futureDateInputSelector = selectKit(".future-date-input-selector");
 
@@ -41,7 +41,7 @@ QUnit.test("default", async assert => {
 });
 
 QUnit.test("autoclose - specific time", async assert => {
-  updateCurrentUser({ moderator: true, canManageTopic: true });
+  updateCurrentUser({ moderator: true });
   const futureDateInputSelector = selectKit(".future-date-input-selector");
 
   await visit("/t/internationalization-localization");
@@ -67,7 +67,7 @@ QUnit.test("autoclose - specific time", async assert => {
 });
 
 QUnit.skip("autoclose", async assert => {
-  updateCurrentUser({ moderator: true, canManageTopic: true });
+  updateCurrentUser({ moderator: true });
   const futureDateInputSelector = selectKit(".future-date-input-selector");
 
   await visit("/t/internationalization-localization");
@@ -134,7 +134,7 @@ QUnit.skip("autoclose", async assert => {
 });
 
 QUnit.test("close temporarily", async assert => {
-  updateCurrentUser({ moderator: true, canManageTopic: true });
+  updateCurrentUser({ moderator: true });
   const timerType = selectKit(".select-kit.timer-type");
   const futureDateInputSelector = selectKit(".future-date-input-selector");
 
@@ -181,7 +181,7 @@ QUnit.test("close temporarily", async assert => {
 });
 
 QUnit.test("schedule", async assert => {
-  updateCurrentUser({ moderator: true, canManageTopic: true });
+  updateCurrentUser({ moderator: true });
   const timerType = selectKit(".select-kit.timer-type");
   const categoryChooser = selectKit(".modal-body .category-chooser");
   const futureDateInputSelector = selectKit(".future-date-input-selector");
@@ -235,7 +235,7 @@ QUnit.test("TL4 can't auto-delete", async assert => {
 });
 
 QUnit.test("auto delete", async assert => {
-  updateCurrentUser({ moderator: true, canManageTopic: true });
+  updateCurrentUser({ moderator: true });
   const timerType = selectKit(".select-kit.timer-type");
   const futureDateInputSelector = selectKit(".future-date-input-selector");
 
@@ -267,37 +267,8 @@ QUnit.test("auto delete", async assert => {
   assert.ok(regex.test(html));
 });
 
-QUnit.test(
-  "Manually closing before the timer will clear the status text",
-  async assert => {
-    updateCurrentUser({ moderator: true, canManageTopic: true });
-    const futureDateInputSelector = selectKit(".future-date-input-selector");
-
-    await visit("/t/topic-for-group-moderators/2480");
-    await click(".toggle-admin-menu");
-    await click(".topic-admin-status-update button");
-    await futureDateInputSelector.expand();
-    await futureDateInputSelector.selectRowByValue("next_week");
-    await click(".modal-footer button.btn-primary");
-
-    const regex = /will automatically close in/g;
-    const topicStatusInfo = find(".topic-status-info")
-      .html()
-      .trim();
-    assert.ok(regex.test(topicStatusInfo));
-
-    await click(".toggle-admin-menu");
-    await click(".topic-admin-close button");
-
-    const newTopicStatusInfo = find(".topic-status-info")
-      .html()
-      .trim();
-    assert.notOk(regex.test(newTopicStatusInfo));
-  }
-);
-
 QUnit.test("Inline delete timer", async assert => {
-  updateCurrentUser({ moderator: true, canManageTopic: true });
+  updateCurrentUser({ moderator: true });
   const futureDateInputSelector = selectKit(".future-date-input-selector");
 
   await visit("/t/internationalization-localization");