Skip to content

Commit be4c78b

Browse files
authored
test: fix awesome-typescript-loader test and remove test-binary job (#20131)
1 parent 1db8992 commit be4c78b

File tree

6 files changed

+3208
-38
lines changed

6 files changed

+3208
-38
lines changed

circle.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1913,13 +1913,6 @@ jobs:
19131913
repo: cypress-example-kitchensink
19141914
browser: "electron"
19151915

1916-
test-binary-against-awesome-typescript-loader:
1917-
<<: *defaults
1918-
steps:
1919-
- test-binary-against-repo:
1920-
repo: cypress-test-awesome-typescript-loader
1921-
browser: "electron"
1922-
19231916
test-binary-against-kitchensink-firefox:
19241917
<<: *defaults
19251918
resource_class: medium
@@ -2239,26 +2232,6 @@ linux-workflow: &linux-workflow
22392232
- test-binary-against-kitchensink:
22402233
requires:
22412234
- create-build-artifacts
2242-
# when working on a feature or a fix,
2243-
# you are probably working in a branch
2244-
# and you want to run a specific PR in the cypress-example-recipes
2245-
# against this branch. This workflow job includes
2246-
# the job but only when it runs on specific branch
2247-
# DO NOT DELETE THIS JOB BEFORE MERGING TO DEVELOP
2248-
# on "develop" this branch will be ignored anyway
2249-
# and someone else might use this job definition for another
2250-
# feature branch and would just update the branch filter
2251-
# - test-binary-against-recipe-pull-request:
2252-
# name: Test cypress run parsing
2253-
# filters:
2254-
# branches:
2255-
# only:
2256-
# - cli-to-module-api-7760
2257-
# requires:
2258-
# - create-build-artifacts
2259-
- test-binary-against-awesome-typescript-loader:
2260-
requires:
2261-
- create-build-artifacts
22622235
- test-binary-and-npm-against-other-projects:
22632236
context: test-runner:trigger-test-jobs
22642237
<<: *mainBuildFilters

system-tests/projects/webpack-preprocessor-awesome-typescript-loader/cypress/integration/failing_spec.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
// https://github.com/cypress-io/cypress/issues/18069
2-
// This fixture project is copied to packages/server/.project and executed there.
3-
// Because of that, the reference path is wrong here.
4-
/// <reference path="../../../../../../cli/types/mocha/index.d.ts" />
5-
/// <reference path="../../../../../../cli/types/jquery/index.d.ts" />
1+
/// <reference types="cypress" />
62

73
/**
84
* This tests the error UI for a certain webpack preprocessor setup.
@@ -20,6 +16,8 @@ import { fail, verify } from '../../../e2e/cypress/support/util'
2016

2117
context('validation errors', function () {
2218
beforeEach(() => {
19+
// @ts-ignore
20+
window.top.__cySkipValidateConfig = true
2321
// @ts-ignore
2422
Cypress.config('isInteractive', true)
2523
})
@@ -30,7 +28,7 @@ context('validation errors', function () {
3028
})
3129

3230
verify(this, {
33-
line: 29,
31+
line: 27,
3432
column: 8,
3533
message: 'can only accept a string preset or',
3634
stack: ['throwErrBadArgs', 'From Your Spec Code:'],
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"name": "@test-project/webpack-preprocessor-awesome-typescript-loader",
3+
"version": "0.0.0-test",
4+
"devDependencies": {
5+
"@babel/core": "7.9.0",
6+
"@babel/preset-env": "7.9.0",
7+
"@cypress/webpack-preprocessor": "file:../../../npm/webpack-preprocessor",
8+
"awesome-typescript-loader": "5.2.1",
9+
"babel-loader": "8.1.0",
10+
"cypress": "file:../../../cli/build",
11+
"typescript": "3.9.2"
12+
}
13+
}

system-tests/projects/webpack-preprocessor-awesome-typescript-loader/tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"sourceMap": false,
77
"inlineSourceMap": true,
88
"inlineSources": false,
9-
"typeRoots": ["../../../../cli/types"],
10-
// "types": ["cypress"]
9+
"types": ["cypress"]
1110
}
1211
}

0 commit comments

Comments
 (0)