Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: fix awesome-typescript-loader test and remove test-binary job #20131

Merged
merged 2 commits into from
Feb 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1913,13 +1913,6 @@ jobs:
repo: cypress-example-kitchensink
browser: "electron"

test-binary-against-awesome-typescript-loader:
<<: *defaults
steps:
- test-binary-against-repo:
repo: cypress-test-awesome-typescript-loader
browser: "electron"

test-binary-against-kitchensink-firefox:
<<: *defaults
resource_class: medium
Expand Down Expand Up @@ -2239,26 +2232,6 @@ linux-workflow: &linux-workflow
- test-binary-against-kitchensink:
requires:
- create-build-artifacts
# when working on a feature or a fix,
# you are probably working in a branch
# and you want to run a specific PR in the cypress-example-recipes
# against this branch. This workflow job includes
# the job but only when it runs on specific branch
# DO NOT DELETE THIS JOB BEFORE MERGING TO DEVELOP
# on "develop" this branch will be ignored anyway
# and someone else might use this job definition for another
# feature branch and would just update the branch filter
# - test-binary-against-recipe-pull-request:
# name: Test cypress run parsing
# filters:
# branches:
# only:
# - cli-to-module-api-7760
# requires:
# - create-build-artifacts
- test-binary-against-awesome-typescript-loader:
requires:
- create-build-artifacts
- test-binary-and-npm-against-other-projects:
context: test-runner:trigger-test-jobs
<<: *mainBuildFilters
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
// https://github.com/cypress-io/cypress/issues/18069
// This fixture project is copied to packages/server/.project and executed there.
// Because of that, the reference path is wrong here.
/// <reference path="../../../../../../cli/types/mocha/index.d.ts" />
/// <reference path="../../../../../../cli/types/jquery/index.d.ts" />
/// <reference types="cypress" />

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

context('validation errors', function () {
beforeEach(() => {
// @ts-ignore
window.top.__cySkipValidateConfig = true
// @ts-ignore
Cypress.config('isInteractive', true)
})
Expand All @@ -30,7 +28,7 @@ context('validation errors', function () {
})

verify(this, {
line: 29,
line: 27,
column: 8,
message: 'can only accept a string preset or',
stack: ['throwErrBadArgs', 'From Your Spec Code:'],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "@test-project/webpack-preprocessor-awesome-typescript-loader",
"version": "0.0.0-test",
"devDependencies": {
"@babel/core": "7.9.0",
"@babel/preset-env": "7.9.0",
"@cypress/webpack-preprocessor": "file:../../../npm/webpack-preprocessor",
"awesome-typescript-loader": "5.2.1",
"babel-loader": "8.1.0",
"cypress": "file:../../../cli/build",
"typescript": "3.9.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"sourceMap": false,
"inlineSourceMap": true,
"inlineSources": false,
"typeRoots": ["../../../../cli/types"],
// "types": ["cypress"]
"types": ["cypress"]
}
}
Loading