mirror/cypress
1
0
Fork 0
mirror of https://github.com/cypress-io/cypress.git synced 2026-05-04 14:00:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: use unique install cache folders for betas (#20296)

Browse Source
This commit is contained in:
Zach Bloomquist
2022-03-04 17:22:39 -05:00
committed by GitHub
parent 2e62bbb25f
commit 3c286177cc
28 changed files with 612 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/test/lib/build_spec.js
+12 -2
View File
@@ -10,7 +10,17 @@ const hasVersion = (json) => {
return la(is.semver(json.version), 'cannot find version', json)
}
const changeVersion = (o) => ({ ...o, version: 'x.y.z' })
const normalizePackageJson = (o) => {
expect(o.buildInfo).to.include({ stable: false })
expect(o.buildInfo.commitBranch).to.match(/.+/)
expect(o.buildInfo.commitSha).to.match(/[a-f0-9]+/)
return {
...o,
version: 'x.y.z',
buildInfo: 'replaced by normalizePackageJson',
}
}
describe('package.json build', () => {
beforeEach(function () {
@@ -32,7 +42,7 @@ describe('package.json build', () => {
it('outputs expected properties', () => {
return makeUserPackageFile()
.then(changeVersion)
.then(normalizePackageJson)
.then(snapshot)
})
})
cli/test/lib/cli_spec.js
+1
View File
@@ -28,6 +28,7 @@ describe('cli', () => {
os.platform.returns('darwin')
// sinon.stub(util, 'exit')
sinon.stub(util, 'logErrorExit1')
sinon.stub(util, 'pkgBuildInfo').returns({ stable: true })
this.exec = (args) => {
const cliArgs = `node test ${args}`.split(' ')
cli/test/lib/exec/info_spec.js
+21
View File
@@ -25,6 +25,10 @@ describe('exec info', function () {
.withArgs('browsers').returns('/user/app/data/path/to/browsers')
.withArgs().returns('/user/app/data/path')
sinon.stub(util, 'pkgBuildInfo').returns({
stable: true,
})
sinon.stub(state, 'getCacheDir').returns('/user/path/to/binary/cache')
})
@@ -68,4 +72,21 @@ describe('exec info', function () {
await startInfoAndSnapshot('cypress redacts sensitive vars')
})
it('logs additional info about pre-releases', async () => {
util.pkgBuildInfo.returns({
stable: false,
commitSha: 'abc123',
commitBranch: 'someBranchName',
commitDate: new Date('02-02-2022').toISOString(),
})
await startInfoAndSnapshot('logs additional info about pre-releases')
})
it('logs if unbuilt development', async () => {
util.pkgBuildInfo.returns(undefined)
await startInfoAndSnapshot('logs additional info about development')
})
})
cli/test/lib/exec/versions_spec.js
+17
View File
@@ -18,6 +18,7 @@ describe('lib/exec/versions', function () {
})
sinon.stub(util, 'pkgVersion').returns('4.5.6')
sinon.stub(util, 'pkgBuildInfo').returns({ stable: true })
})
describe('.getVersions', function () {
@@ -50,6 +51,22 @@ describe('lib/exec/versions', function () {
})
})
it('appends pre-release if not stable', async function () {
util.pkgBuildInfo.returns({ stable: false })
const v = await versions.getVersions()
expect(v.package).to.eql('4.5.6 (pre-release)')
})
it('appends development if missing buildInfo', async function () {
util.pkgBuildInfo.returns(undefined)
const v = await versions.getVersions()
expect(v.package).to.eql('4.5.6 (development)')
})
it('reports default versions if not found', function () {
// imagine package.json only has version there
state.getBinaryPkgAsync.withArgs(binaryDir).resolves({
cli/test/lib/tasks/install_spec.js
+35 -138
View File
@@ -1,11 +1,9 @@
require('../../spec_helper')
const _ = require('lodash')
const os = require('os')
const path = require('path')
const chalk = require('chalk')
const Promise = require('bluebird')
const mockfs = require('mock-fs')
const mockedEnv = require('mocked-env')
const snapshot = require('../../support/snapshot')
const stdout = require('../../support/stdout')
@@ -75,6 +73,32 @@ describe('/lib/tasks/install', function () {
})
})
describe('non-stable builds', () => {
function runInstall () {
return install.start({
buildInfo: {
stable: false,
commitSha: 'abc123',
commitBranch: 'aBranchName',
commitDate: new Date('11-27-1996').toISOString(),
},
})
}
it('install from a constructed CDN URL', async function () {
await runInstall()
expect(download.start).to.be.calledWithMatch({
version: 'https://cdn.cypress.io/beta/binary/0.0.0-development/darwin-x64/aBranchName-abc123/cypress.zip',
})
})
it('logs a warning about installing a pre-release', async function () {
await runInstall()
snapshot(normalize(this.stdout.toString()))
})
})
describe('override version', function () {
it('warns when specifying cypress version in env', function () {
const version = '0.12.1'
@@ -460,145 +484,18 @@ describe('/lib/tasks/install', function () {
})
})
context('._getBinaryUrlFromPrereleaseNpmUrl', function () {
beforeEach(() => {
context('._getBinaryUrlFromBuildInfo', function () {
const buildInfo = {
commitSha: 'abc123',
commitBranch: 'aBranchName',
}
it('generates the expected URL', () => {
os.platform.returns('linux')
sinon.stub(os, 'arch').returns('x64')
})
it('returns binary url for prerelease npm url', function () {
expect(install._getBinaryUrlFromPrereleaseNpmUrl('https://cdn.cypress.io/beta/npm/5.1.1/linux-x64/ciprovider-branchname-sha/cypress.tgz'))
.to.eq('https://cdn.cypress.io/beta/binary/5.1.1/linux-x64/ciprovider-branchname-sha/cypress.zip')
expect(install._getBinaryUrlFromPrereleaseNpmUrl('https://cdn.cypress.io/beta/npm/5.1.1/inux-x64/circle-develop-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.tgz'))
.to.eq('https://cdn.cypress.io/beta/binary/5.1.1/linux-x64/circle-develop-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.zip')
expect(install._getBinaryUrlFromPrereleaseNpmUrl('https://cdn.cypress.io/beta/npm/5.1.1/inux-x64/circle-develop/some/branch-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.tgz'))
.to.eq('https://cdn.cypress.io/beta/binary/5.1.1/linux-x64/circle-develop/some/branch-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.zip')
})
it('returns nothing for an invalid url', function () {
expect(install._getBinaryUrlFromPrereleaseNpmUrl('1.2.3')).to.be.undefined
expect(install._getBinaryUrlFromPrereleaseNpmUrl(null)).to.be.undefined
})
})
context('._getVersionSpecifier', function () {
let restoreEnv
beforeEach(function () {
sinon.stub(fs, 'readJSON').rejects()
restoreEnv && restoreEnv()
})
it('resolves undefined if no versionSpecifier found', async function () {
expect(await install._getVersionSpecifier('/foo/bar/baz')).to.be.undefined
})
it('resolves with cypress.tgz URL if specified in npm argv', async function () {
restoreEnv = mockedEnv({
npm_config_argv: JSON.stringify({
original: ['npm', 'i', 'https://foo.com/cypress.tgz'],
}),
})
expect(await install._getVersionSpecifier('/foo/bar/baz')).to.eq('https://foo.com/cypress.tgz')
})
it('resolves with cypress.tgz URL if specified in npm env npm_package_resolved', async function () {
restoreEnv = mockedEnv({
npm_package_resolved: 'https://foo.com/cypress.tgz',
})
expect(await install._getVersionSpecifier('/foo/bar/baz')).to.eq('https://foo.com/cypress.tgz')
})
it('resolves with versionSpecifier from parent pkg.json', async function () {
fs.readJSON.withArgs('/foo/bar/baz/package.json').resolves({
dependencies: {
'cypress': '1.2.3',
},
})
fs.readJSON.withArgs('/foo/bar/package.json').resolves({
dependencies: {
'cypress': 'wrong',
},
})
expect(await install._getVersionSpecifier('/foo/bar/baz')).to.eq('1.2.3')
})
it('resolves with devDependencies too', async function () {
fs.readJSON.withArgs('/foo/bar/baz/package.json').resolves({
devDependencies: {
'cypress': '4.5.6',
},
})
expect(await install._getVersionSpecifier('/foo/bar/baz')).to.eq('4.5.6')
})
it('resolves with optionalDependencies too', async function () {
fs.readJSON.withArgs('/foo/bar/baz/package.json').resolves({
optionalDependencies: {
'cypress': '6.7.8',
},
})
expect(await install._getVersionSpecifier('/foo/bar/baz')).to.eq('6.7.8')
})
context('with win32 path functions and paths', async function () {
const oldPath = _.clone(path)
beforeEach(() => {
_.assign(path, path.win32)
})
afterEach(() => {
_.assign(path, oldPath)
})
it('resolves undefined if no versionSpecifier found', async function () {
expect(await install._getVersionSpecifier('C:\\foo\\bar\\baz')).to.be.undefined
})
it('resolves with versionSpecifier from parent pkg.json', async function () {
fs.readJSON.withArgs('C:\\foo\\bar\\baz\\package.json').resolves({
dependencies: {
'cypress': '1.2.3',
},
})
fs.readJSON.withArgs('C:\\foo\\bar\\package.json').resolves({
dependencies: {
'cypress': 'wrong',
},
})
expect(await install._getVersionSpecifier('C:\\foo\\bar\\baz')).to.eq('1.2.3')
})
it('resolves with devDependencies too', async function () {
fs.readJSON.withArgs('C:\\foo\\bar\\baz\\package.json').resolves({
devDependencies: {
'cypress': '4.5.6',
},
})
expect(await install._getVersionSpecifier('C:\\foo\\bar\\baz')).to.eq('4.5.6')
})
it('resolves with optionalDependencies too', async function () {
fs.readJSON.withArgs('C:\\foo\\bar\\baz\\package.json').resolves({
optionalDependencies: {
'cypress': '6.7.8',
},
})
expect(await install._getVersionSpecifier('C:\\foo\\bar\\baz')).to.eq('6.7.8')
})
expect(install._getBinaryUrlFromBuildInfo(buildInfo))
.to.eq(`https://cdn.cypress.io/beta/binary/0.0.0-development/linux-x64/aBranchName-abc123/cypress.zip`)
})
})
})