From 3bfc254c4e0f00f639193cc99effecd9b7ed9ba7 Mon Sep 17 00:00:00 2001 From: Krzysztof Kotlarek Date: Tue, 26 Jul 2022 12:09:05 +1000 Subject: [PATCH] FIX: correct mention paths in fixtures (#17660) Our mention path are `/u/:username` and not `/users/:username`. Test fixtures should have those values correct as well. --- .../discourse/tests/fixtures/topic.js | 4 +- .../discourse/tests/fixtures/user-fixtures.js | 50 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/app/assets/javascripts/discourse/tests/fixtures/topic.js b/app/assets/javascripts/discourse/tests/fixtures/topic.js index d02b62f20d6..5a5d220be20 100644 --- a/app/assets/javascripts/discourse/tests/fixtures/topic.js +++ b/app/assets/javascripts/discourse/tests/fixtures/topic.js @@ -668,7 +668,7 @@ export default { uploaded_avatar_id: 5253, created_at: "2013-02-07T14:02:07.869Z", cooked: - '

\n\n

The problem I see here is that this file is likely two grow and change massively over the next couple months, and tracking these changes in order to keep a localized file up to date is going to be a bitch.

\n\n

I wonder where there is a tool that can compare two yml structures and point out which nodes are missing? That would help keep track of new strings.

\n\n

Re keeping track of changed strings, @eviltrout I found this very interesting: http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders if plain English placeholders were used, any change in strings would lead to a new node in the yml file, making keeping the translation up to date easier. Maybe worth thinking about in the future.

', + '

\n\n

The problem I see here is that this file is likely two grow and change massively over the next couple months, and tracking these changes in order to keep a localized file up to date is going to be a bitch.

\n\n

I wonder where there is a tool that can compare two yml structures and point out which nodes are missing? That would help keep track of new strings.

\n\n

Re keeping track of changed strings, @eviltrout I found this very interesting: http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders if plain English placeholders were used, any change in strings would lead to a new node in the yml file, making keeping the translation up to date easier. Maybe worth thinking about in the future.

', post_number: 5, post_type: 1, updated_at: "2013-02-07T14:05:42.328Z", @@ -3612,7 +3612,7 @@ export default { uploaded_avatar_id: 5297, created_at: "2015-05-14T21:15:41.612Z", cooked: - '

Yeah maybe another Ember 1.10 regression for @eviltrout ?

', + '

Yeah maybe another Ember 1.10 regression for @eviltrout ?

', post_number: 4, post_type: 1, updated_at: "2015-05-14T21:15:41.612Z", diff --git a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js index 9eda72715e9..4ed74958a7d 100644 --- a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js +++ b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js @@ -600,7 +600,7 @@ export default { action_type: 7, created_at: "2014-01-15T11:16:36Z", excerpt: - "@eviltrout recently added support for multiple API keys [wink] \n\n[]", + "@eviltrout recently added support for multiple API keys [wink] \n\n[]", avatar_template: "//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -628,7 +628,7 @@ export default { action_type: 7, created_at: "2014-01-15T10:58:46Z", excerpt: - "@eviltrout added a tooltip when you click on the user's avatar which allows you to show the posts made by that user \n\n[image]", + "@eviltrout added a tooltip when you click on the user's avatar which allows you to show the posts made by that user \n\n[image]", avatar_template: "//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -656,7 +656,7 @@ export default { action_type: 7, created_at: "2014-01-15T10:36:15Z", excerpt: - "@eviltrout implemented per-user API key a while ago [wink] \n\n [image]\nTopics_-_Discourse_Meta-5.png884x339 29.6 KB\n", + "@eviltrout implemented per-user API key a while ago [wink] \n\n [image]\nTopics_-_Discourse_Meta-5.png884x339 29.6 KB\n", avatar_template: "//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -684,7 +684,7 @@ export default { action_type: 7, created_at: "2014-01-15T09:55:17Z", excerpt: - "@eviltrout has recently introduced this feature and has even blogged about it: \n\n \n \n \n \n eviltrout.com\n \n \n \n \n \n Hiding Offscreen Content in Ember.js - Evil Trout's Blog", + "@eviltrout has recently introduced this feature and has even blogged about it: \n\n \n \n \n \n eviltrout.com\n \n \n \n \n \n Hiding Offscreen Content in Ember.js - Evil Trout's Blog", avatar_template: "//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -768,7 +768,7 @@ export default { action_type: 2, created_at: "2014-01-14T21:46:50Z", excerpt: - "Okay I've fixed the https [point_right] http links on the server side and in the Javascript click tracking as @BhaelOchon pointed out. \n\nLet me know if you find anything else broken.", + "Okay I've fixed the https [point_right] http links on the server side and in the Javascript click tracking as @BhaelOchon pointed out. \n\nLet me know if you find anything else broken.", avatar_template: "//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -796,7 +796,7 @@ export default { action_type: 6, created_at: "2014-01-14T21:43:28Z", excerpt: - "Thanks for your help @eviltrout! I will consider making that change and sending a pull request. I may not get to it for a while. \n\nI am embedding Discourse on another site and it is mostly going well. I have indeed been using your blog for inspiration.", + "Thanks for your help @eviltrout! I will consider making that change and sending a pull request. I may not get to it for a while. \n\nI am embedding Discourse on another site and it is mostly going well. I have indeed been using your blog for inspiration.", avatar_template: "//www.gravatar.com/avatar/9cfd2536afac32d209335b092094c12c.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -824,7 +824,7 @@ export default { action_type: 2, created_at: "2014-01-14T21:21:52Z", excerpt: - "Okay I've fixed the https [point_right] http links on the server side and in the Javascript click tracking as @BhaelOchon pointed out. \n\nLet me know if you find anything else broken.", + "Okay I've fixed the https [point_right] http links on the server side and in the Javascript click tracking as @BhaelOchon pointed out. \n\nLet me know if you find anything else broken.", avatar_template: "//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -852,7 +852,7 @@ export default { action_type: 5, created_at: "2014-01-14T21:03:07Z", excerpt: - "Okay I've fixed the https [point_right] http links on the server side and in the Javascript click tracking as @BhaelOchon pointed out. \n\nLet me know if you find anything else broken.", + "Okay I've fixed the https [point_right] http links on the server side and in the Javascript click tracking as @BhaelOchon pointed out. \n\nLet me know if you find anything else broken.", avatar_template: "//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -1020,7 +1020,7 @@ export default { action_type: 6, created_at: "2014-01-14T16:04:28Z", excerpt: - "Thanks @eviltrout , the code in the 'bottom of pages' now reads: \n\n<script type="text/javascript">\nDiscourse.PageTracker.current().on('change', function() {\n console.log('tracked!')\n _paq.push(['trackPageView']);\n});\n</script>\n\nThe console is logging 'tracked!' and piwik is logging for each page c…", + "Thanks @eviltrout , the code in the 'bottom of pages' now reads: \n\n<script type="text/javascript">\nDiscourse.PageTracker.current().on('change', function() {\n console.log('tracked!')\n _paq.push(['trackPageView']);\n});\n</script>\n\nThe console is logging 'tracked!' and piwik is logging for each page c…", avatar_template: "/images/avatar.png", acting_avatar_template: "/images/avatar.png", slug: "support-for-piwik-analytics-as-an-alternative-to-google-analytics", @@ -1132,7 +1132,7 @@ export default { action_type: 7, created_at: "2014-01-14T00:21:26Z", excerpt: - "In pull request 1821, @eviltrout asked: \n\n "About rails s: I wouldn't be against adding it but at what point do we stop holding their hand and expect them to know how rails works? I'm sure rails documentation could do a better job than us. Actually maybe we should just link to that? \n\nWhat point to …", + "In pull request 1821, @eviltrout asked: \n\n "About rails s: I wouldn't be against adding it but at what point do we stop holding their hand and expect them to know how rails works? I'm sure rails documentation could do a better job than us. Actually maybe we should just link to that? \n\nWhat point to …", avatar_template: "//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -1332,7 +1332,7 @@ export default { action_type: 2, created_at: "2014-01-13T19:52:04Z", excerpt: - "@Sam do you have any idea why only some people are getting this issue? I dont' mind the proposed fix but I'd prefer to know why it happens in the first place.", + "@Sam do you have any idea why only some people are getting this issue? I dont' mind the proposed fix but I'd prefer to know why it happens in the first place.", avatar_template: "//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -1418,7 +1418,7 @@ export default { action_type: 5, created_at: "2014-01-13T18:47:33Z", excerpt: - "I am pretty sure that the denizens of SO are correct and the variable is unneeded. @sam can confirm but it seems like it was once needed for something that has since been removed and the variable declaration was left intact.", + "I am pretty sure that the denizens of SO are correct and the variable is unneeded. @sam can confirm but it seems like it was once needed for something that has since been removed and the variable declaration was left intact.", avatar_template: "//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -1476,7 +1476,7 @@ export default { action_type: 2, created_at: "2014-01-13T17:19:08Z", excerpt: - "@Sam do you have any idea why only some people are getting this issue? I dont' mind the proposed fix but I'd prefer to know why it happens in the first place.", + "@Sam do you have any idea why only some people are getting this issue? I dont' mind the proposed fix but I'd prefer to know why it happens in the first place.", avatar_template: "//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -1504,7 +1504,7 @@ export default { action_type: 7, created_at: "2014-01-13T16:41:31Z", excerpt: - "I'd love to see API support. @sam and @eviltrout, I can facilitate an intro to the piwik guys if you want—I've written about them before and they're typically super-responsive. Because I know you guys are totally hunting for new stuff to do [wink]", + "I'd love to see API support. @sam and @eviltrout, I can facilitate an intro to the piwik guys if you want—I've written about them before and they're typically super-responsive. Because I know you guys are totally hunting for new stuff to do [wink]", avatar_template: "/images/avatar.png", acting_avatar_template: "/images/avatar.png", slug: "support-for-piwik-analytics-as-an-alternative-to-google-analytics", @@ -1618,7 +1618,7 @@ export default { action_type: 5, created_at: "2014-01-13T14:53:13Z", excerpt: - "@Sam do you have any idea why only some people are getting this issue? I dont' mind the proposed fix but I'd prefer to know why it happens in the first place.", + "@Sam do you have any idea why only some people are getting this issue? I dont' mind the proposed fix but I'd prefer to know why it happens in the first place.", avatar_template: "//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -1646,7 +1646,7 @@ export default { action_type: 7, created_at: "2014-01-13T06:27:26Z", excerpt: - "Can this be archived @eviltrout?", + "Can this be archived @eviltrout?", avatar_template: "//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -1674,7 +1674,7 @@ export default { action_type: 7, created_at: "2014-01-13T05:32:46Z", excerpt: - "When you navigate to another topic using the "suggested topics" area we are not registering a page view with Google. \n\n@eviltrout perhaps we should do this from discourse location instead of application controller?", + "When you navigate to another topic using the "suggested topics" area we are not registering a page view with Google. \n\n@eviltrout perhaps we should do this from discourse location instead of application controller?", avatar_template: "//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -1702,7 +1702,7 @@ export default { action_type: 7, created_at: "2014-01-13T02:50:25Z", excerpt: - "@eviltrout any ideas here, the code seems correct", + "@eviltrout any ideas here, the code seems correct", avatar_template: "//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -1731,7 +1731,7 @@ export default { action_type: 7, created_at: "2014-01-12T22:31:35Z", excerpt: - "This is an interesting approach an an interesting feature. @eviltrout your thoughts. Essentially allows us to have notifications cross tabs.", + "This is an interesting approach an an interesting feature. @eviltrout your thoughts. Essentially allows us to have notifications cross tabs.", avatar_template: "//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -1760,7 +1760,7 @@ export default { action_type: 7, created_at: "2014-01-12T18:01:04Z", excerpt: - "This was the link \n\nmetric_fu \n\n[metric_fu](https://github.com/metricfu/metric_fu/blob/b1bf8feb921916fc265f041efa3157a6a6530a9b/lib/metric_fu/logging/mf_debugger.rb#L24)\n\nSeems to work fine now that @eviltrout worked so hard to get us MDTest 1.1 compliant.", + "This was the link \n\nmetric_fu \n\n[metric_fu](https://github.com/metricfu/metric_fu/blob/b1bf8feb921916fc265f041efa3157a6a6530a9b/lib/metric_fu/logging/mf_debugger.rb#L24)\n\nSeems to work fine now that @eviltrout worked so hard to get us MDTest 1.1 compliant.", avatar_template: "//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -1814,7 +1814,7 @@ export default { action_type: 7, created_at: "2014-01-11T23:36:11Z", excerpt: - "A few things, \n\n@eviltrout myself and many others have discourse_docker hosted on DigitalOcean, my user cpu is usually around 2% I have plenty of capacity. \n\nI know that stonehearth and other larger scale discourse work on DigitalOcean fine. Officially we strongly recommend a 2GB instance, thoug…", + "A few things, \n\n@eviltrout myself and many others have discourse_docker hosted on DigitalOcean, my user cpu is usually around 2% I have plenty of capacity. \n\nI know that stonehearth and other larger scale discourse work on DigitalOcean fine. Officially we strongly recommend a 2GB instance, thoug…", avatar_template: "//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -1842,7 +1842,7 @@ export default { action_type: 7, created_at: "2014-01-11T00:58:23Z", excerpt: - "Confirmed on try.discourse.org, this is still an issue. \n\n@eviltrout can you add that to your list -- unless you are a staff member you should not be able to delete (your own) posts from an archived topic.", + "Confirmed on try.discourse.org, this is still an issue. \n\n@eviltrout can you add that to your list -- unless you are a staff member you should not be able to delete (your own) posts from an archived topic.", avatar_template: "//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -1870,7 +1870,7 @@ export default { action_type: 7, created_at: "2014-01-11T00:35:38Z", excerpt: - "Agree, @eviltrout can you make sure the usercard is using the same logic as the user page in displaying profile info?", + "Agree, @eviltrout can you make sure the usercard is using the same logic as the user page in displaying profile info?", avatar_template: "//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -1898,7 +1898,7 @@ export default { action_type: 7, created_at: "2014-01-11T00:34:06Z", excerpt: - "@eviltrout can you make sure the "import post" button is suppressed on the user page when editing "about me"? \n\n(I agree it is like a "lose all my work" button on that page if you happen to press it..) \n\nThen I can archive this.", + "@eviltrout can you make sure the "import post" button is suppressed on the user page when editing "about me"? \n\n(I agree it is like a "lose all my work" button on that page if you happen to press it..) \n\nThen I can archive this.", avatar_template: "//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon", acting_avatar_template: @@ -1927,7 +1927,7 @@ export default { action_type: 7, created_at: "2014-01-10T21:00:11Z", excerpt: - ">\n\nLooks good now. Thanks for these fixes @eviltrout, we (and markdown-js) are now MDTest 1.1 compliant!", + ">\n\nLooks good now. Thanks for these fixes @eviltrout, we (and markdown-js) are now MDTest 1.1 compliant!", avatar_template: "//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon", acting_avatar_template: