FIX: Use new tag routes (#8683)

Commit 1fb7a62 added unambiguous routes for tags. This commit ensures
that the new routes are used.
This commit is contained in:
Dan Ungureanu
2020-01-21 19:23:08 +02:00
committed by GitHub
parent fe6ff1b5ab
commit 89bd7ba45f
25 changed files with 83 additions and 83 deletions

View File

@@ -50,7 +50,7 @@ QUnit.test("search for a tag", async assert => {
});
QUnit.test("search scope checkbox", async assert => {
await visit("/tags/important");
await visit("/tag/important");
await click("#search-button");
assert.ok(
exists(".search-context input:checked"),

View File

@@ -6,7 +6,7 @@ acceptance("Tag Hashtag", {
pretend(server, helper) {
server.get("/tags/check", () => {
return helper.response({
valid: [{ value: "monkey", url: "/tags/monkey" }]
valid: [{ value: "monkey", url: "/tag/monkey" }]
});
});
}
@@ -22,6 +22,6 @@ QUnit.test("tag is cooked properly", async assert => {
find(".d-editor-preview:visible")
.html()
.trim(),
'<p>this is a tag hashtag <a href="/tags/monkey" class="hashtag">#<span>monkey</span></a></p>'
'<p>this is a tag hashtag <a href="/tag/monkey" class="hashtag">#<span>monkey</span></a></p>'
);
});

View File

@@ -5,7 +5,7 @@ acceptance("Tags intersection", {
site: { can_tag_topics: true },
settings: { tagging_enabled: true },
pretend(server, helper) {
server.get("/tags/first/notifications", () => {
server.get("/tag/first/notifications", () => {
return helper.response({
tag_notification: { id: "first", notification_level: 1 }
});

View File

@@ -91,7 +91,7 @@ QUnit.test("list the tags in groups", async assert => {
.map(i => {
return $(i).attr("href");
}),
["/tags/focus", "/tags/escort"],
["/tag/focus", "/tag/escort"],
"always uses lowercase URLs for mixed case tags"
);
assert.equal(
@@ -103,13 +103,13 @@ QUnit.test("list the tags in groups", async assert => {
test("new topic button is not available for staff-only tags", async assert => {
/* global server */
server.get("/tags/regular-tag/notifications", () => [
server.get("/tag/regular-tag/notifications", () => [
200,
{ "Content-Type": "application/json" },
{ tag_notification: { id: "regular-tag", notification_level: 1 } }
]);
server.get("/tags/regular-tag/l/latest.json", () => [
server.get("/tag/regular-tag/l/latest.json", () => [
200,
{ "Content-Type": "application/json" },
{
@@ -133,13 +133,13 @@ test("new topic button is not available for staff-only tags", async assert => {
}
]);
server.get("/tags/staff-only-tag/notifications", () => [
server.get("/tag/staff-only-tag/notifications", () => [
200,
{ "Content-Type": "application/json" },
{ tag_notification: { id: "staff-only-tag", notification_level: 1 } }
]);
server.get("/tags/staff-only-tag/l/latest.json", () => [
server.get("/tag/staff-only-tag/l/latest.json", () => [
200,
{ "Content-Type": "application/json" },
{
@@ -166,18 +166,18 @@ test("new topic button is not available for staff-only tags", async assert => {
updateCurrentUser({ moderator: false, admin: false });
await visit("/tags/regular-tag");
await visit("/tag/regular-tag");
assert.ok(find("#create-topic:disabled").length === 0);
await visit("/tags/staff-only-tag");
await visit("/tag/staff-only-tag");
assert.ok(find("#create-topic:disabled").length === 1);
updateCurrentUser({ moderator: true });
await visit("/tags/regular-tag");
await visit("/tag/regular-tag");
assert.ok(find("#create-topic:disabled").length === 0);
await visit("/tags/staff-only-tag");
await visit("/tag/staff-only-tag");
assert.ok(find("#create-topic:disabled").length === 0);
});
@@ -187,13 +187,13 @@ acceptance("Tag info", {
tags_listed_by_group: true
},
pretend(server, helper) {
server.get("/tags/planters/notifications", () => {
server.get("/tag/planters/notifications", () => {
return helper.response({
tag_notification: { id: "planters", notification_level: 1 }
});
});
server.get("/tags/planters/l/latest.json", () => {
server.get("/tag/planters/l/latest.json", () => {
return helper.response({
users: [],
primary_groups: [],
@@ -215,7 +215,7 @@ acceptance("Tag info", {
});
});
server.get("/tags/planters/info", () => {
server.get("/tag/planters/info", () => {
return helper.response({
__rest_serializer: "1",
tag_info: {
@@ -261,7 +261,7 @@ acceptance("Tag info", {
test("tag info can show synonyms", async assert => {
updateCurrentUser({ moderator: false, admin: false });
await visit("/tags/planters");
await visit("/tag/planters");
assert.ok(find("#show-tag-info").length === 1);
await click("#show-tag-info");
@@ -286,7 +286,7 @@ test("tag info can show synonyms", async assert => {
});
test("admin can manage tags", async assert => {
server.delete("/tags/planters/synonyms/containers", () => [
server.delete("/tag/planters/synonyms/containers", () => [
200,
{ "Content-Type": "application/json" },
{ success: true }
@@ -294,7 +294,7 @@ test("admin can manage tags", async assert => {
updateCurrentUser({ moderator: false, admin: true });
await visit("/tags/planters");
await visit("/tag/planters");
assert.ok(find("#show-tag-info").length === 1);
await click("#show-tag-info");

View File

@@ -71,7 +71,7 @@ componentTest("default", {
await this.subject.fillInFilter("dav");
await this.subject.keyboard("enter");
assert.ok(
DiscourseURL.routeTo.calledWith("/tags/david"),
DiscourseURL.routeTo.calledWith("/tag/david"),
"it uses lowercase URLs for tags"
);
}
@@ -107,7 +107,7 @@ componentTest("synonym", {
await this.subject.fillInFilter("robin");
await this.subject.keyboard("enter");
assert.ok(
DiscourseURL.routeTo.calledWith("/tags/eviltrout"),
DiscourseURL.routeTo.calledWith("/tag/eviltrout"),
"it routes to the target tag"
);
}

View File

@@ -3756,7 +3756,7 @@ export default {
]
}
},
"/tags/important/l/latest.json": {
"/tag/important/l/latest.json": {
users: [{ id: 1, username: "sam", avatar_template: "/images/avatar.png" }],
primary_groups: [],
topic_list: {