Set canonical link to original video/playlist url #3406
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The local URL was used instead of the original url Signed-off-by: Thomas Citharel <[email protected]>
Signed-off-by: Thomas Citharel <[email protected]>
tcitworld
added
the
Type: Bug 🐛
kontrollanten
suggested changes
Dec 6, 2020
| @@ -47,8 +51,19 @@ describe('Test a client controllers', function () { | |||
| before(async function () { | |||
| this.timeout(120000) | |||
|
|
|||
| server = await flushAndRunServer(1) | |||
| server.accessToken = await serverLogin(server) | |||
| servers = await flushAndRunMultipleServers(2) | |||
There was a problem hiding this comment.
A fancy way would be [server, secondServer] = await flushAndRunMultipleServers(2)
server/tests/client.ts
Outdated
| await setAccessTokensToServers(servers) | ||
|
|
||
| { | ||
| const res = await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'video' }) |
There was a problem hiding this comment.
Do we really need to upload a video here? According to line 78 there's already a video on the server.
If we need this line, then line 78 has to be updated (that's why tests are failing).
server/tests/client.ts
Outdated
|
|
||
| it('Should use the original video URL for the canonical tag', async function () { | ||
| const res = await makeHTMLRequest(servers[1].url, '/videos/watch/' + videoUUID) | ||
| expect(res.text).to.contain(`<link rel="canonical" href="${videoOriginalUrl}" />`) |
There was a problem hiding this comment.
By using server.video we could change the test to:
const res = await makeHTMLRequest(servers[1].url, '/videos/watch/' + server.video.uuid)
expect(res.text).to.contain(`<link rel="canonical" href="${server.video.url}" />`)
|
Thanks @tcitworld @kontrollanten |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The local URL was used instead of the original url
Description
The local URL was used instead of the original url
Related issues
Previously fixed in #1539
Added a test to check but didn't manage to run them, so they're all yours.