Merge branch '10.0-release' into marktnoonan/backmerge-develop-3-8-22

cypress-io · Mar 9, 2022 · 3a63b92 · 3a63b92 · cypress-bot · Mar 9, 2022
2 parents 6d83e83 + e1a647b
commit 3a63b92
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 7 deletions.
diff --git a/packages/data-context/src/sources/VersionsDataSource.ts b/packages/data-context/src/sources/VersionsDataSource.ts
@@ -78,13 +78,28 @@ export class VersionsDataSource {
   }
 
   private async getVersionMetadata (): Promise<Record<string, string>> {
+    const DEFAULT_RESPONSE = {
+      [pkg.version]: new Date().toISOString(),
+    }
+
     if (this.ctx.isRunMode) {
-      return {
-        [pkg.version]: new Date().toISOString(),
-      }
+      return DEFAULT_RESPONSE
+    }
+
+    let response
+
+    try {
+      response = await this.ctx.util.fetch(NPM_CYPRESS_REGISTRY)
+    } catch (e) {
+      // ignore any error from this fetch, they are gracefully handled
+      // by showing the current version only
+      debug('Error fetching %o', NPM_CYPRESS_REGISTRY, e)
+    }
+
+    if (!response) {
+      return DEFAULT_RESPONSE
     }
 
-    const response = await this.ctx.util.fetch(NPM_CYPRESS_REGISTRY)
     const responseJson = await response.json() as { time: Record<string, string>}
 
     debug('NPM release dates %o', responseJson.time)
@@ -116,9 +131,21 @@ export class VersionsDataSource {
       manifestHeaders['x-machine-id'] = id
     }
 
-    const manifestResponse = await this.ctx.util.fetch(url, {
-      headers: manifestHeaders,
-    })
+    let manifestResponse
+
+    try {
+      manifestResponse = await this.ctx.util.fetch(url, {
+        headers: manifestHeaders,
+      })
+    } catch (e) {
+      // ignore any error from this fetch, they are gracefully handled
+      // by showing the current version only
+      debug('Error fetching %o', url, e)
+    }
+
+    if (!manifestResponse) {
+      return pkg.version
+    }
 
     debug('retrieving latest version information with headers: %o', manifestHeaders)
 

diff --git a/packages/data-context/test/unit/sources/VersionsDataSource.spec.ts b/packages/data-context/test/unit/sources/VersionsDataSource.spec.ts
@@ -120,5 +120,31 @@ describe('VersionsDataSource', () => {
 
       expect(latestVersion).to.eql('16.0.0')
     })
+
+    it('handles errors fetching version data', async () => {
+      nmiStub.resolves('abcd123')
+
+      fetchStub
+      .withArgs('https://download.cypress.io/desktop.json', {
+        headers: {
+          'Content-Type': 'application/json',
+          'x-cypress-version': currentCypressVersion,
+          'x-os-name': 'darwin',
+          'x-arch': 'x64',
+          'x-initial-launch': String(true),
+          'x-machine-id': 'abcd123',
+          'x-testing-type': 'e2e',
+        },
+      })
+      .rejects()
+      .withArgs('https://registry.npmjs.org/cypress')
+      .rejects()
+
+      versionsDataSource = new VersionsDataSource(ctx)
+
+      const versionInfo = await versionsDataSource.versionData()
+
+      expect(versionInfo.current).to.eql(versionInfo.latest)
+    })
   })
 })