Skip to content

Commit

Permalink
breaking: set videoCompression to false by default
Browse files Browse the repository at this point in the history
Update system-tests/projects/ts-proj-5/cypress.config.ts

Co-authored-by: Emily Rohrbough <[email protected]>

Update system-tests/projects/vite-simple/cypress.config.js

Co-authored-by: Emily Rohrbough <[email protected]>

Update system-tests/projects/react-vite-ts-configured/cypress.config.ts

Co-authored-by: Emily Rohrbough <[email protected]>

Update system-tests/projects/svelte-vite/cypress.config.js

Co-authored-by: Emily Rohrbough <[email protected]>

Update system-tests/projects/ts-proj-4-5/cypress.config.ts

Co-authored-by: Emily Rohrbough <[email protected]>

Update system-tests/projects/webpack-dev-server-ts/cypress.config.ts

Co-authored-by: Emily Rohrbough <[email protected]>

Update system-tests/projects/vue3-vite-ts-configured/cypress.config.ts

Co-authored-by: Emily Rohrbough <[email protected]>

Update system-tests/projects/vue3-vite-ts-custom-index-html/cypress.config.ts

Co-authored-by: Emily Rohrbough <[email protected]>

Update cli/CHANGELOG.md

Co-authored-by: Emily Rohrbough <[email protected]>

Update cli/CHANGELOG.md

Co-authored-by: Emily Rohrbough <[email protected]>
  • Loading branch information
AtofStryker and emilyrohrbough committed Jun 20, 2023
1 parent 9580dc2 commit 1d57c26
Show file tree
Hide file tree
Showing 65 changed files with 19 additions and 92 deletions.
1 change: 1 addition & 0 deletions cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ _Released 08/1/2023 (PENDING)_

- The [`cy.readFile()`](/api/commands/readfile) command is now retry-able as a [query command](https://on.cypress.io/retry-ability). This should not affect any tests using it; the functionality is unchanged. However, it can no longer be overwritten using [`Cypress.Commands.overwrite()`](/api/cypress-api/custom-commands#Overwrite-Existing-Commands). Addressed in [#25595](https://github.com/cypress-io/cypress/pull/25595).
- The [`video`](https://docs.cypress.io/guides/references/configuration#Videos) configuration option now defaults to `false`. Addresses [#26157](https://github.com/cypress-io/cypress/issues/26157).
- The [`videoCompression`](https://docs.cypress.io/guides/references/configuration#Videos) configuration option now defaults to `false`. Addresses [#26160](https://github.com/cypress-io/cypress/issues/26160).

- The deprecated configuration option, `nodeVersion` has been removed. Addresses [#27016](https://github.com/cypress-io/cypress/issues/27016).

Expand Down
1 change: 0 additions & 1 deletion packages/app/cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export default defineConfig({
runMode: 2,
openMode: 0,
},
videoCompression: false, // turn off video compression for CI
reporter: '../../node_modules/cypress-multi-reporters/index.js',
reporterOptions: {
configFile: '../../mocha-reporter-config.json',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
"field": "video"
},
{
"value": 32,
"value": false,
"from": "default",
"field": "videoCompression"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
"field": "video"
},
{
"value": 32,
"value": false,
"from": "default",
"field": "videoCompression"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@
"field": "video"
},
{
"value": 32,
"value": false,
"from": "default",
"field": "videoCompression"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
"field": "video"
},
{
"value": 32,
"value": false,
"from": "default",
"field": "videoCompression"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
"field": "video"
},
{
"value": 32,
"value": false,
"from": "default",
"field": "videoCompression"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1661,7 +1661,7 @@
"field": "video"
},
{
"value": 32,
"value": false,
"from": "default",
"field": "videoCompression"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/config/__snapshots__/index.spec.ts.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ exports['config/src/index .getDefaultValues returns list of public config keys 1
'trashAssetsBeforeRuns': true,
'userAgent': null,
'video': false,
'videoCompression': 32,
'videoCompression': false,
'videosFolder': 'cypress/videos',
'videoUploadOnPasses': true,
'viewportHeight': 660,
Expand Down Expand Up @@ -163,7 +163,7 @@ exports['config/src/index .getDefaultValues returns list of public config keys f
'trashAssetsBeforeRuns': true,
'userAgent': null,
'video': false,
'videoCompression': 32,
'videoCompression': false,
'videosFolder': 'cypress/videos',
'videoUploadOnPasses': true,
'viewportHeight': 660,
Expand Down
2 changes: 1 addition & 1 deletion packages/config/src/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ const driverConfigOptions: Array<DriverConfigOption> = [
validation: validate.isBoolean,
}, {
name: 'videoCompression',
defaultValue: 32,
defaultValue: false,
validation: validate.isValidCrfOrBoolean,
}, {
name: 'videosFolder',
Expand Down
8 changes: 4 additions & 4 deletions packages/config/test/project/utils.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -766,8 +766,8 @@ describe('config/src/project/utils', () => {
return this.defaults('video', false)
})

it('videoCompression=32', function () {
return this.defaults('videoCompression', 32)
it('videoCompression=false', function () {
return this.defaults('videoCompression', false)
})

it('videoUploadOnPasses=true', function () {
Expand Down Expand Up @@ -1077,7 +1077,7 @@ describe('config/src/project/utils', () => {
trashAssetsBeforeRuns: { value: true, from: 'default' },
userAgent: { value: null, from: 'default' },
video: { value: false, from: 'default' },
videoCompression: { value: 32, from: 'default' },
videoCompression: { value: false, from: 'default' },
videosFolder: { value: 'cypress/videos', from: 'default' },
videoUploadOnPasses: { value: true, from: 'default' },
viewportHeight: { value: 660, from: 'default' },
Expand Down Expand Up @@ -1195,7 +1195,7 @@ describe('config/src/project/utils', () => {
trashAssetsBeforeRuns: { value: true, from: 'default' },
userAgent: { value: null, from: 'default' },
video: { value: false, from: 'default' },
videoCompression: { value: 32, from: 'default' },
videoCompression: { value: false, from: 'default' },
videosFolder: { value: 'cypress/videos', from: 'default' },
videoUploadOnPasses: { value: true, from: 'default' },
viewportHeight: { value: 660, from: 'default' },
Expand Down
1 change: 0 additions & 1 deletion packages/driver/cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export default defineConfig({
reporterOptions: {
configFile: '../../mocha-reporter-config.json',
},
videoCompression: false, // turn off video compression for CI
e2e: {
experimentalOriginDependencies: true,
experimentalModifyObstructiveThirdPartyCode: true,
Expand Down
1 change: 0 additions & 1 deletion packages/frontend-shared/cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export default defineConfig({
reporterOptions: {
configFile: '../../mocha-reporter-config.json',
},
videoCompression: false, // turn off video compression for CI
component: {
experimentalSingleTabRunMode: true,
devServer: {
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend-shared/cypress/fixtures/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
"field": "video"
},
{
"value": 32,
"value": false,
"from": "default",
"field": "videoCompression"
},
Expand Down
1 change: 0 additions & 1 deletion packages/launchpad/cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export default defineConfig({
reporterOptions: {
configFile: '../../mocha-reporter-config.json',
},
videoCompression: false, // turn off video compression for CI
component: {
experimentalSingleTabRunMode: true,
supportFile: 'cypress/component/support/index.ts',
Expand Down
2 changes: 0 additions & 2 deletions packages/reporter/cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ export default defineConfig({
openMode: 0,
},

videoCompression: false, // turn off video compression for CI

e2e: {
experimentalStudio: true,
baseUrl: 'http://localhost:5006',
Expand Down
8 changes: 4 additions & 4 deletions packages/server/test/integration/cypress_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -922,15 +922,15 @@ describe('lib/cypress', () => {
})

it('can override default values', function () {
return cypress.start([`--run-project=${this.todosPath}`, '--config=requestTimeout=1234,videoCompression=false'])
return cypress.start([`--run-project=${this.todosPath}`, '--config=requestTimeout=1234,videoCompression=true'])
.then(() => {
const { cfg } = openProject.getProject()

expect(cfg.videoCompression).to.be.false
expect(cfg.videoCompression).to.be.true
expect(cfg.requestTimeout).to.eq(1234)

expect(cfg.resolved.videoCompression).to.deep.eq({
value: false,
value: true,
from: 'cli',
})

Expand All @@ -945,7 +945,7 @@ describe('lib/cypress', () => {

it('can override values in plugins', function () {
return cypress.start([
`--run-project=${this.pluginConfig}`, '--config=requestTimeout=1234,videoCompression=false',
`--run-project=${this.pluginConfig}`, '--config=requestTimeout=1234,videoCompression=true',
'--env=foo=foo,bar=bar',
])
.then(() => {
Expand Down
9 changes: 0 additions & 9 deletions system-tests/lib/system-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -803,15 +803,6 @@ const systemTests = {
debug('systemTests.exec options %o', options)
options = this.options(ctx, options)

// Force the default to have compression off
if (!options.config) {
options.config = {
videoCompression: false,
}
} else if (!options.config.videoCompression) {
options.config.videoCompression = false
}

debug('processed options %o', options)
const args = options.args || this.args(options)

Expand Down
1 change: 0 additions & 1 deletion system-tests/project-fixtures/angular/cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { defineConfig } from 'cypress'
export default defineConfig({
component: {
experimentalSingleTabRunMode: true,
videoCompression: false, // turn off video compression for CI
devServer: {
framework: 'angular',
bundler: 'webpack',
Expand Down
1 change: 0 additions & 1 deletion system-tests/project-fixtures/cra/cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { defineConfig } from 'cypress'
export default defineConfig({
component: {
experimentalSingleTabRunMode: true,
videoCompression: false, // turn off video compression for CI
devServer: {
framework: 'create-react-app',
bundler: 'webpack',
Expand Down
1 change: 0 additions & 1 deletion system-tests/project-fixtures/nuxtjs2/cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { defineConfig } from 'cypress'
export default defineConfig({
component: {
experimentalSingleTabRunMode: true,
videoCompression: false, // turn off video compression for CI
devServer: {
framework: 'nuxt',
bundler: 'webpack',
Expand Down
1 change: 0 additions & 1 deletion system-tests/project-fixtures/react/cypress-vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ declare global {
}

export default defineConfig({
videoCompression: false, // turn off video compression for CI
component: {
devServer: {
framework: 'react',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import * as path from 'path'
import * as fs from 'fs'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
component: {
devServer: {
framework: 'react',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ declare global {
}

export default defineConfig({
videoCompression: false, // turn off video compression for CI
component: {
devServer: {
framework: 'react',
Expand Down
1 change: 0 additions & 1 deletion system-tests/project-fixtures/vue-cli/cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { defineConfig } from 'cypress'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
component: {
experimentalSingleTabRunMode: true,
devServer: {
Expand Down
1 change: 0 additions & 1 deletion system-tests/project-fixtures/vue/cypress.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { defineConfig } from 'cypress'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
component: {
experimentalSingleTabRunMode: true,
devServer: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { defineConfig } from 'cypress'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
component: {
experimentalSingleTabRunMode: true,
devServer: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { defineConfig } from 'cypress'
const { projects } = require('./angular.json')

export default defineConfig({
videoCompression: false, // turn off video compression for CI
component: {
experimentalSingleTabRunMode: true,
devServer: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { defineConfig } from 'cypress'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
component: {
experimentalSingleTabRunMode: true,
devServer: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { defineConfig } from 'cypress'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
e2e: {
supportFile: false,
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { defineConfig } from 'cypress'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
e2e: { supportFile: false },
})
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { defineConfig } from 'cypress'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
e2e: {
supportFile: false,
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { defineConfig } from 'cypress'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
e2e: { supportFile: false },
})
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { defineConfig } from 'cypress'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
e2e: { supportFile: false },
})
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { defineConfig } from 'cypress'
import { devServer } from '@cypress/vite-dev-server'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
component: {
experimentalSingleTabRunMode: true,
specPattern: 'src/**/*.ts',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { defineConfig } from 'vite'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
server: {
fs: {
// this is needed to run on CI since we
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { defineConfig } from 'cypress'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
e2e: {
supportFile: false,
setupNodeEvents: async (_, config) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { defineConfig } from 'cypress'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
e2e: {
supportFile: false,
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module.exports = {
'projectId': 'pid123',
'videoUploadOnPasses': true,
videoCompression: false,
'e2e': {
setupNodeEvents (on, config) {
const plugin = require('./cypress/plugins')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { defineConfig } from 'cypress'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
component: {
fixturesFolder: false,
supportFile: false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { defineConfig } from 'cypress'

export default defineConfig({
videoCompression: false, // turn off video compression for CI
component: {
experimentalSingleTabRunMode: true,
supportFile: false,
Expand Down
Loading

0 comments on commit 1d57c26

Please sign in to comment.