github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-26 05:11:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: clear topic timer text when manually closing/opening (#6123)

Browse Source 
* UX: clear topic timer text when manually closing/opening

* added test for clearing topic timer status text
This commit is contained in:
Kyle Zhao
2018-07-25 21:48:38 -04:00
committed by Sam
parent 9ccdc0da76
commit 1ed3a89ac9
3 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
test/javascripts/acceptance/topic-edit-timer-test.js.es6
View File

@ -1,6 +1,12 @@
import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
acceptance("Topic - Edit timer", { loggedIn: true });
const response = object => [
200,
{ "Content-Type": "application/json" },
object
];
QUnit.test("default", assert => {
const timerType = selectKit(".select-kit.timer-type");
const futureDateInputSelector = selectKit(".future-date-input-selector");
@ -253,3 +259,52 @@ QUnit.test("auto delete", assert => {
assert.ok(regex.test(html));
});
});
QUnit.test(
"Manually closing before the timer will clear the status text",
async assert => {
// prettier-ignore
server.post("/t/280/timer", () => // eslint-disable-line no-undef
response({
success: "OK",
execute_at: new Date(
new Date().getTime() + 1 * 60 * 60 * 1000
).toISOString(),
duration: 1,
based_on_last_post: false,
closed: false,
category_id: null
})
);
// prettier-ignore
server.put("/t/internationalization-localization/280/status", () => // eslint-disable-line no-undef
response({
success: "OK",
topic_status_update: null
})
);
const futureDateInputSelector = selectKit(".future-date-input-selector");
await visit("/t/internationalization-localization");
await click(".toggle-admin-menu");
await click(".topic-admin-status-update button");
await futureDateInputSelector.expand().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));
}
);