Skip to content

Commit 8f3fc42

Browse files
jennifer-shehanejennifer-shehane
authored
Merge branch 'master' into master
2 parents 122a527 + bf3812a commit 8f3fc42

File tree

308 files changed

+81031
-18101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

308 files changed

+81031
-18101
lines changed

‎.circleci/config.yml

+154-578
Large diffs are not rendered by default.

‎.github/ISSUE_TEMPLATE/bug_report.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,28 @@ assignees: ''
77
---
88

99
**Logs and screenshots**
10-
Please provide debug logs by running Cypress from the terminal with `DEBUG=code-coverage` environment variable set, see the [Debugging](https://github.com/cypress-io/code-coverage#debugging) section of the README file.
10+
Please provide debug logs by running Cypress from the terminal with `DEBUG=code-coverage` environment variable set. See the [Debugging](https://github.com/cypress-io/code-coverage#debugging) section of the README file.
1111

1212
**Versions**
1313

14-
- What is this plugin's version? If this is NOT the latest [released version](https://github.com/cypress-io/code-coverage/releases) can you try the latest version, please?
15-
- If the plugin worked before in version X, but stopped after upgrading to version Y, please try the [released versions](https://github.com/cypress-io/code-coverage/releases) between X and Y to see where the breaking change was.
16-
- What is Cypress version?
14+
- What is this plugin's version? If this is NOT the latest [released version](https://github.com/cypress-io/code-coverage/releases), can you try the latest version, please?
15+
- If the plugin worked before in version X but stopped after upgrading to version Y, please try the [released versions](https://github.com/cypress-io/code-coverage/releases) between X and Y to see where the breaking change was.
16+
- What is the Cypress version?
1717
- What is your operating system?
1818
- What is the shell?
1919
- What is the Node version?
2020
- What is the NPM version?
21-
- How do you instrument your application? Cypress [does not instrument web application code](https://github.com/cypress-io/code-coverage#instrument-your-application), so you need to do it yourself.
22-
- When running tests, if you open the web application in regular browser, and open DevTools, do you see `window.__coverage__` object? Can you paste a screenshot?
23-
- Is there `.nyc_output` folder? Is there `.nyc_output/out.json` file. Is it empty? Can you paste at least part of it so we can see the keys and file paths?
24-
- Do you have any custom NYC settings in `package.json` (`nyc` object) or in other [NYC config files](https://github.com/istanbuljs/nyc#configuration-files)
21+
- How do you instrument your application? Cypress [does not instrument web application code](https://github.com/cypress-io/code-coverage#instrument-your-application), so you must do it yourself.
22+
- When running tests, if you open the web application in a regular browser and open DevTools, do you see `window.__coverage__` object? Can you paste a screenshot?
23+
- Is there a `.nyc_output` folder? Is there a `.nyc_output/out.json` file? Is it empty? Can you paste at least part of it so we can see the keys and file paths?
24+
- Do you have any custom NYC settings in `package.json` (`nyc` object) or in other [NYC config files](https://github.com/istanbuljs/nyc#configuration-files)?
2525
- Do you run Cypress tests in a Docker container?
2626

2727
**Describe the bug**
2828
A clear and concise description of what the bug is.
2929

3030
**Link to the repo**
31-
Bugs with a reproducible example, like an open source repo showing the bug, are the most likely to be resolved.
31+
Bugs with a reproducible example, like an open-source repo showing the bug, are the most likely to be resolved.
3232

3333
**Example**
3434
See [#217](https://github.com/cypress-io/code-coverage/issues/217) that is an excellent bug report example

‎.github/workflows/add-to-triage-board.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: 'Add issue/PR to Triage Board'
2+
on:
3+
issues:
4+
types:
5+
- opened
6+
pull_request_target:
7+
types:
8+
- opened
9+
jobs:
10+
add-to-triage-project-board:
11+
uses: cypress-io/cypress/.github/workflows/triage_add_to_project.yml@develop
12+
secrets: inherit

‎.github/workflows/snyk_sca_scan.yaml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Snyk Software Composition Analysis Scan
2+
# This git workflow leverages Snyk actions to perform a Software Composition
3+
# Analysis scan on our Opensource libraries upon Pull Requests to Master &
4+
# Develop branches. We use this as a control to prevent vulnerable packages
5+
# from being introduced into the codebase.
6+
on:
7+
pull_request:
8+
branches:
9+
- master
10+
- develop
11+
jobs:
12+
Snyk_SCA_Scan:
13+
runs-on: ubuntu-latest
14+
strategy:
15+
matrix:
16+
node-version: [20.x]
17+
steps:
18+
- uses: actions/checkout@v4
19+
- name: Setting up Node
20+
uses: actions/setup-node@v3
21+
with:
22+
node-version: ${{ matrix.node-version }}
23+
- name: Installing snyk-delta and dependencies
24+
run: npm i -g snyk-delta
25+
- uses: snyk/actions/setup@master
26+
- name: Perform SCA Scan
27+
continue-on-error: false
28+
run: |
29+
snyk test --all-projects --detection-depth=4 --exclude=docker,Dockerfile --severity-threshold=critical
30+
env:
31+
SNYK_TOKEN: ${{ secrets.SNYK_API_TOKEN }}

‎.github/workflows/snyk_static_analysis_scan.yaml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Snyk Static Analysis Scan
2+
# This SAST (Static Application Security Testing) scan is used to scan
3+
# our first-party code for security vulnerabilities
4+
on:
5+
pull_request:
6+
branches:
7+
- master
8+
- develop
9+
jobs:
10+
Snyk_SAST_Scan:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: snyk/actions/setup@master
15+
- name: Perform Static Analysis Test
16+
env:
17+
SNYK_TOKEN: ${{ secrets.SNYK_API_TOKEN }}
18+
continue-on-error: true
19+
run: snyk code test --all-projects --strict-out-of-sync=false --detection-depth=6 --exclude=docker,Dockerfile --severity-threshold=high

‎.github/workflows/triage_closed_issue_comment.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: 'Handle Comment Workflow'
2+
on:
3+
issue_comment:
4+
types:
5+
- created
6+
jobs:
7+
closed-issue-comment:
8+
uses: cypress-io/cypress/.github/workflows/triage_handle_new_comments.yml@develop
9+
secrets: inherit

‎.gitignore

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
node_modules/
2-
cypress/videos
3-
cypress/screenshots
2+
**/cypress/videos
3+
**/cypress/screenshots
44
coverage/
55
.nyc_output/
66
dist/
77
.cache/
88
.vscode/
99
cypress-coverage/
10-
examples/*/cypress/videos
11-
examples/*/cypress/screenshots
1210
yarn.lock
11+
.parcel-cache

‎.nycrc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"exclude": [
3-
"support-utils.js",
3+
"support.js",
44
"task-utils.js"
55
]
66
}

‎.releaserc

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"branches": [
3+
"master",
4+
"next",
5+
{
6+
"name": "besta",
7+
"prerelease": true
8+
},
9+
{
10+
"name": "dev",
11+
"prerelease": true
12+
}
13+
]
14+
}

0 commit comments

Comments
 (0)