Skip to content

Commit 50d0594

Browse files
author
Barthélémy Ledoux
authored
Merge branch '10.0-release' into elevatebart/fix/build-mjs-in-the-cli
2 parents eeef5b5 + 3f32ffd commit 50d0594

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

packages/app/cypress/e2e/top-nav.cy.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ describe('App Top Nav Workflows', () => {
139139

140140
cy.findByTestId('app-header-bar').validateExternalLink({
141141
name: 'v10.0.0',
142-
href: 'https://github.com/cypress-io/cypress/releases/tag/v10.0.0',
142+
href: 'https://on.cypress.io/changelog#10-0-0',
143143
})
144144
})
145145
})
@@ -174,14 +174,14 @@ describe('App Top Nav Workflows', () => {
174174
cy.findByTestId('top-nav-version-list').contains('v10.0.0 • Upgrade').click()
175175

176176
cy.findByTestId('update-hint').within(() => {
177-
cy.validateExternalLink({ name: '10.1.0', href: 'https://github.com/cypress-io/cypress/releases/tag/v10.1.0' })
177+
cy.validateExternalLink({ name: '10.1.0', href: 'https://on.cypress.io/changelog#10-1-0' })
178178
cy.findByText('Latest').should('be.visible')
179179
})
180180

181181
cy.findByTestId('cypress-update-popover').findByRole('button', { name: 'Update to 10.1.0' })
182182

183183
cy.findByTestId('current-hint').within(() => {
184-
cy.validateExternalLink({ name: '10.0.0', href: 'https://github.com/cypress-io/cypress/releases/tag/v10.0.0' })
184+
cy.validateExternalLink({ name: '10.0.0', href: 'https://on.cypress.io/changelog#10-0-0' })
185185
cy.findByText('Installed').should('be.visible')
186186
})
187187

@@ -239,7 +239,7 @@ describe('App Top Nav Workflows', () => {
239239

240240
cy.findByTestId('app-header-bar').validateExternalLink({
241241
name: `v${pkg.version}`,
242-
href: `https://github.com/cypress-io/cypress/releases/tag/v${pkg.version}`,
242+
href: `https://on.cypress.io/changelog#${pkg.version.replaceAll('.', '-')}`,
243243
})
244244
})
245245
})

packages/frontend-shared/src/gql-components/HeaderBarContent.cy.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ describe('<HeaderBarContent />', { viewportWidth: 1000, viewportHeight: 750 }, (
120120
),
121121
})
122122

123-
cy.contains('a', '8.7.0').should('be.visible').and('have.attr', 'href', 'https://github.com/cypress-io/cypress/releases/tag/v8.7.0')
123+
cy.contains('a', '8.7.0').should('be.visible').and('have.attr', 'href', 'https://on.cypress.io/changelog#8-7-0')
124124
cy.percySnapshot()
125125
})
126126

packages/frontend-shared/src/gql-components/topnav/TopNav.vue

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
>
2323
<div class="font-medium">
2424
<ExternalLink
25-
:href="`${releasesUrl}/tag/v${versions.latest.version}`"
25+
:href="changelogLink(versions.latest.version)"
2626
class="text-indigo-500"
2727
data-cy="latest-version"
2828
>
@@ -58,7 +58,7 @@
5858
>
5959
<div class="whitespace-nowrap">
6060
<ExternalLink
61-
:href="`${releasesUrl}/tag/v${versions.current.version}`"
61+
:href="changelogLink(versions.current.version)"
6262
class="font-medium text-amber-800"
6363
data-cy="current-version"
6464
>
@@ -88,7 +88,7 @@
8888

8989
<ExternalLink
9090
v-else-if="versions"
91-
:href="`${releasesUrl}/tag/v${versions.latest.version}`"
91+
:href="changelogLink(versions.current.version)"
9292
class="flex font-medium outline-transparent text-gray-600 gap-8px items-center group hocus:text-indigo-500 hocus:outline-0"
9393
:use-default-hocus="false"
9494
data-cy="top-nav-cypress-version-current-link"
@@ -97,7 +97,7 @@
9797
class="h-16px w-16px group-hocus:icon-dark-indigo-500 group-hocus:icon-light-indigo-50 icon-dark-gray-500 icon-light-gray-100"
9898
/>
9999
<span>
100-
v{{ versions.latest.version }}
100+
v{{ versions.current.version }}
101101
</span>
102102
</ExternalLink>
103103

@@ -211,8 +211,6 @@ import VerticalBrowserListItems from './VerticalBrowserListItems.vue'
211211
212212
const { t } = useI18n()
213213
214-
const releasesUrl = 'https://github.com/cypress-io/cypress/releases'
215-
216214
gql`
217215
fragment TopNav on Query {
218216
versions {
@@ -352,4 +350,8 @@ onKeyStroke(['Enter', ' ', 'Escape'], (event) => {
352350
resetPrompt(event)
353351
})
354352
353+
const changelogLink = (version) => {
354+
return `https://on.cypress.io/changelog#${version.replaceAll('.', '-')}`
355+
}
356+
355357
</script>

0 commit comments

Comments
 (0)