Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
jennifer-shehane authored Nov 15, 2023
2 parents 122a527 + bf3812a commit 8f3fc42
Show file tree
Hide file tree
Showing 308 changed files with 81,031 additions and 18,101 deletions.
732 changes: 154 additions & 578 deletions .circleci/config.yml

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,28 @@ assignees: ''
---

**Logs and screenshots**
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.
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.

**Versions**

- 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?
- 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.
- What is Cypress version?
- 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?
- 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.
- What is the Cypress version?
- What is your operating system?
- What is the shell?
- What is the Node version?
- What is the NPM version?
- 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.
- 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?
- 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?
- 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)
- 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.
- 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?
- 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?
- 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)?
- Do you run Cypress tests in a Docker container?

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

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

**Example**
See [#217](https://github.com/cypress-io/code-coverage/issues/217) that is an excellent bug report example
12 changes: 12 additions & 0 deletions .github/workflows/add-to-triage-board.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: 'Add issue/PR to Triage Board'
on:
issues:
types:
- opened
pull_request_target:
types:
- opened
jobs:
add-to-triage-project-board:
uses: cypress-io/cypress/.github/workflows/triage_add_to_project.yml@develop
secrets: inherit
31 changes: 31 additions & 0 deletions .github/workflows/snyk_sca_scan.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Snyk Software Composition Analysis Scan
# This git workflow leverages Snyk actions to perform a Software Composition
# Analysis scan on our Opensource libraries upon Pull Requests to Master &
# Develop branches. We use this as a control to prevent vulnerable packages
# from being introduced into the codebase.
on:
pull_request:
branches:
- master
- develop
jobs:
Snyk_SCA_Scan:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [20.x]
steps:
- uses: actions/checkout@v4
- name: Setting up Node
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Installing snyk-delta and dependencies
run: npm i -g snyk-delta
- uses: snyk/actions/setup@master
- name: Perform SCA Scan
continue-on-error: false
run: |
snyk test --all-projects --detection-depth=4 --exclude=docker,Dockerfile --severity-threshold=critical
env:
SNYK_TOKEN: ${{ secrets.SNYK_API_TOKEN }}
19 changes: 19 additions & 0 deletions .github/workflows/snyk_static_analysis_scan.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Snyk Static Analysis Scan
# This SAST (Static Application Security Testing) scan is used to scan
# our first-party code for security vulnerabilities
on:
pull_request:
branches:
- master
- develop
jobs:
Snyk_SAST_Scan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: snyk/actions/setup@master
- name: Perform Static Analysis Test
env:
SNYK_TOKEN: ${{ secrets.SNYK_API_TOKEN }}
continue-on-error: true
run: snyk code test --all-projects --strict-out-of-sync=false --detection-depth=6 --exclude=docker,Dockerfile --severity-threshold=high
9 changes: 9 additions & 0 deletions .github/workflows/triage_closed_issue_comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: 'Handle Comment Workflow'
on:
issue_comment:
types:
- created
jobs:
closed-issue-comment:
uses: cypress-io/cypress/.github/workflows/triage_handle_new_comments.yml@develop
secrets: inherit
7 changes: 3 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
node_modules/
cypress/videos
cypress/screenshots
**/cypress/videos
**/cypress/screenshots
coverage/
.nyc_output/
dist/
.cache/
.vscode/
cypress-coverage/
examples/*/cypress/videos
examples/*/cypress/screenshots
yarn.lock
.parcel-cache
2 changes: 1 addition & 1 deletion .nycrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"exclude": [
"support-utils.js",
"support.js",
"task-utils.js"
]
}
14 changes: 14 additions & 0 deletions .releaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"branches": [
"master",
"next",
{
"name": "besta",
"prerelease": true
},
{
"name": "dev",
"prerelease": true
}
]
}
Loading

0 comments on commit 8f3fc42

Please sign in to comment.