mirror/cypress
1
0
Fork 0
mirror of https://github.com/cypress-io/cypress.git synced 2026-01-26 00:49:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix system test

Browse Source
This commit is contained in:
Ryan Manuel
2022-03-24 23:22:45 -05:00
parent abf7d0a6dc
commit f6cc702aaa
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/data-context/src/data/ProjectLifecycleManager.ts
View File

@@ -15,7 +15,6 @@ import { getError, CypressError, ConfigValidationFailureInfo } from '@packages/e
import type { DataContext } from '..'
import assert from 'assert'
import type { AllModeOptions, FoundBrowser, FullConfig, TestingType } from '@packages/types'
import type { BreakingErrResult, BreakingOptionErrorKey } from '@packages/config'
import { autoBindDebug } from '../util/autoBindDebug'
import type { LegacyCypressConfigJson } from '../sources'
import { ProjectConfigManager } from './ProjectConfigManager'
@@ -31,8 +30,6 @@ export interface SetupFullConfigOptions {
options: Partial<AllModeOptions>
}
type BreakingValidationFn<T> = (type: BreakingOptionErrorKey, val: BreakingErrResult) => T
const POTENTIAL_CONFIG_FILES = [
'cypress.config.ts',
'cypress.config.mjs',
@@ -51,9 +48,6 @@ export interface InjectedConfigApi {
allowedConfig(config: Cypress.ConfigOptions): Cypress.ConfigOptions
updateWithPluginValues(config: FullConfig, modifiedConfig: Partial<Cypress.ConfigOptions>): FullConfig
setupFullConfigWithDefaults(config: SetupFullConfigOptions): Promise<FullConfig>
validateRootConfigBreakingChanges<T extends Cypress.ConfigOptions>(config: Partial<T>, onWarning: BreakingValidationFn<CypressError>, onErr: BreakingValidationFn<never>): void
validateLaunchpadConfigBreakingChanges<T extends Cypress.ConfigOptions>(config: Partial<T>, onWarning: BreakingValidationFn<CypressError>, onErr: BreakingValidationFn<never>): void
validateTestingTypeConfigBreakingChanges<T extends Cypress.ConfigOptions>(config: Partial<T>, testingType: Cypress.TestingType, onWarning: BreakingValidationFn<CypressError>, onErr: BreakingValidationFn<never>): void
}
export interface ProjectMetaState {
@@ -345,10 +339,8 @@ export class ProjectLifecycleManager {
const legacyConfigPath = path.join(projectRoot, this.legacyConfigFile)
if (needsCypressJsonMigration) {
if (!this.ctx.isRunMode && this.ctx.fs.existsSync(legacyConfigPath)) {
this.#legacyMigration(legacyConfigPath).catch(this.onLoadError)
}
if (needsCypressJsonMigration && !this.ctx.isRunMode && this.ctx.fs.existsSync(legacyConfigPath)) {
this.#legacyMigration(legacyConfigPath).catch(this.onLoadError)
return
}

3
packages/server/lib/makeDataContext.ts
View File

@@ -62,9 +62,6 @@ export function makeDataContext (options: MakeDataContextOptions): DataContext {
validateConfig: configUtils.validate,
updateWithPluginValues: config.updateWithPluginValues,
setupFullConfigWithDefaults: config.setupFullConfigWithDefaults,
validateRootConfigBreakingChanges: configUtils.validateNoBreakingConfigRoot,
validateLaunchpadConfigBreakingChanges: configUtils.validateNoBreakingConfigLaunchpad,
validateTestingTypeConfigBreakingChanges: configUtils.validateNoBreakingTestingTypeConfig,
},
appApi: {
appData,