IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Fix a leaky test (#13559)

Browse Source 
The error was:

```
↪ Unit | Model | topic::recover [✔]
↪ Unit | Utility | emoji::emojiUnescape [✔]
↪ Unit | Utility | pretty-text::quoting a quote [✔]
↪ Unit | Utility | click-track::routes to internal urlsUnhandled request in test environment: /forum/t/1234/recover (PUT)
Error: Unhandled request in test environment: /forum/t/1234/recover (PUT)
    at Pretender.server.unhandledRequest (discourse/tests/setup-tests:173:15)
    at Pretender.handleRequest (pretender:400:14)
    at FakeRequest.send (pretender:169:21)
    at Object.send (jquery:10100:10)
    at Function.ajax (jquery:9683:15)
    at performAjax (discourse/app/lib/ajax:174:19)
    at eval (discourse/app/lib/ajax:183:11)
    at invokeCallback (ember:63104:17)
    at publish (ember:63087:9)
    at eval (ember:57463:16)
 [✘]
```

* DEV: Don't duplicate a function
This commit is contained in:
Jarek Radosz 2021-06-29 02:40:29 +02:00 committed by GitHub
parent d098f51ad3
commit 5af0636d83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/app/controllers/topic.js
View File

@ -6,7 +6,7 @@ import { isEmpty, isPresent } from "@ember/utils";
import { later, next, schedule } from "@ember/runloop"; import { later, next, schedule } from "@ember/runloop";
import { AUTO_DELETE_PREFERENCES } from "discourse/models/bookmark"; import { AUTO_DELETE_PREFERENCES } from "discourse/models/bookmark";
import Composer from "discourse/models/composer"; import Composer from "discourse/models/composer";
import EmberObject from "@ember/object"; import EmberObject, { action } from "@ember/object";
import I18n from "I18n"; import I18n from "I18n";
import Post from "discourse/models/post"; import Post from "discourse/models/post";
import { Promise } from "rsvp"; import { Promise } from "rsvp";
@ -949,10 +949,6 @@ export default Controller.extend(bufferedProperty("model"), {
}); });
}, },
recoverTopic() {
this.model.recover();
},
makeBanner() { makeBanner() {
this.model.makeBanner(); this.model.makeBanner();
}, },
@ -1424,6 +1420,7 @@ export default Controller.extend(bufferedProperty("model"), {
return spinnerHTML; return spinnerHTML;
}, },
@action
recoverTopic() { recoverTopic() {
this.model.recover(); this.model.recover();
}, },

5
app/assets/javascripts/discourse/tests/unit/models/topic-test.js
View File

@ -109,7 +109,7 @@ discourseModule("Unit | Model | topic", function () {
assert.equal(topic.get("category"), category); assert.equal(topic.get("category"), category);
}); });
test("recover", function (assert) { test("recover", async function (assert) {
const user = User.create({ username: "eviltrout" }); const user = User.create({ username: "eviltrout" });
const topic = Topic.create({ const topic = Topic.create({
id: 1234, id: 1234,
@ -117,7 +117,8 @@ discourseModule("Unit | Model | topic", function () {
deleted_by: user, deleted_by: user,
}); });
topic.recover(); await topic.recover();
assert.blank(topic.get("deleted_at"), "it clears deleted_at"); assert.blank(topic.get("deleted_at"), "it clears deleted_at");
assert.blank(topic.get("deleted_by"), "it clears deleted_by"); assert.blank(topic.get("deleted_by"), "it clears deleted_by");
}); });