discourse
/
discourse-solved
mirror of https://github.com/discourse/discourse-solved.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Fix a linting error and work around a test issue (#107) 

Issue introduced in https://github.com/discourse/discourse-solved/pull/105/files#diff-a2b6a1622bdc1ddf5f4fd546319bbe4c0216528d6e9a0648d105a65a9933d2eeR10

Includes:
* Fix a linting error
* Fix deprecations
* Don't rely on a prototype extension
* Don't modify the global `/search.json` fixture
* Workaround the test issue
This commit is contained in:
Jarek Radosz 2020-12-23 19:41:07 +01:00 committed by GitHub
parent 160faf9f6c
commit 5cfb0b4590
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
test/javascripts/acceptance/discourse-solved-test.js.es6
View File

@ -1,8 +1,5 @@
import { acceptance, queryAll } from "helpers/qunit-helpers"; import { acceptance, queryAll } from "helpers/qunit-helpers";
import { import { fixturesByUrl } from "discourse/tests/helpers/create-pretender";
fixturesByUrl,
response,
} from "discourse/tests/helpers/create-pretender";
acceptance("Discourse Solved Plugin", function (needs) { acceptance("Discourse Solved Plugin", function (needs) {
needs.user(); needs.user();
@ -219,35 +216,31 @@ acceptance("Discourse Solved Plugin", function (needs) {
}; };
server.get("/t/11.json", () => { server.get("/t/11.json", () => {
return response( return helper.response(
postStreamWithAcceptedAnswerExcerpt("this is an excerpt") postStreamWithAcceptedAnswerExcerpt("this is an excerpt")
); );
}); });
server.get("/t/12.json", () => { server.get("/t/12.json", () => {
return response(postStreamWithAcceptedAnswerExcerpt(null)); return helper.response(postStreamWithAcceptedAnswerExcerpt(null));
}); });
server.get("/search", () => { server.get("/search", () => {
const fixtures = fixturesByUrl["/search.json"]; const fixtures = Object.assign({}, fixturesByUrl["/search.json"]);
fixtures.topics.firstObject.has_accepted_answer = true; fixtures.topics[0].has_accepted_answer = true;
return response(fixtures); return helper.response(fixtures);
}); });
}); });
test("A topic with an accepted answer shows an excerpt of the answer, if provided", (assert) => { test("A topic with an accepted answer shows an excerpt of the answer, if provided", async function (assert) {
visit("/t/with-excerpt/11"); await visit("/t/with-excerpt/11");
andThen(() => { assert.ok(queryAll('.quote blockquote:contains("this is an excerpt")').length === 1);
assert.ok(exists('.quote blockquote:contains("this is an excerpt")'));
});
visit("/t/without-excerpt/12"); await visit("/t/without-excerpt/12");
andThen(() => { assert.notOk(queryAll(".quote blockquote").length === 1);
assert.notOk(exists(".quote blockquote")); assert.ok(queryAll(".quote .title.title-only").length === 1);
assert.ok(exists(".quote .title.title-only"));
});
}); });
test("Full page search displays solved status", async function (assert) { test("Full page search displays solved status", async function (assert) {
@ -259,7 +252,7 @@ acceptance("Discourse Solved Plugin", function (needs) {
assert.ok(queryAll(".fps-topic").length === 1, "has one post"); assert.ok(queryAll(".fps-topic").length === 1, "has one post");
assert.ok( assert.ok(
queryAll(".topic-status .solved").length === 1, queryAll(".topic-status .solved").length,
"shows the right icon" "shows the right icon"
); );
}); });