Skip to content

Commit

Permalink
Merge branch 'develop' into try/react-query-disputes
Browse files Browse the repository at this point in the history
  • Loading branch information
Jinksi authored Dec 18, 2023
2 parents 7a1ce9d + cc42940 commit 2acfe7f
Show file tree
Hide file tree
Showing 433 changed files with 11,212 additions and 12,074 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ env:
FORCE_E2E_DEPS_SETUP: true

jobs:
# [TODO] Enable WC beta tests after fixing failures caused by blocks checkout being default on newer versions
generate-matrix:
name: "Generate the matrix for subscriptions-tests dynamically"
runs-on: ubuntu-latest
Expand All @@ -38,7 +37,7 @@ jobs:
- name: "Generate matrix"
id: generate_matrix
run: |
WC_VERSIONS=$( echo "[\"7.7.0\", \"latest\"]" )
WC_VERSIONS=$( echo "[\"7.7.0\", \"latest\", \"beta\"]" )
echo "matrix={\"woocommerce\":$WC_VERSIONS,\"test_groups\":[\"wcpay\", \"subscriptions\"],\"test_branches\":[\"merchant\", \"shopper\"]}" >> $GITHUB_OUTPUT
# Run WCPay & subscriptions tests against specific WC versions
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,6 @@ tests/e2e/screenshots

# E2E Performance test results
tests/e2e/reports

# Slate docs
docs/rest-api/build/*
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ We currently support the following variables:

## Test account setup

For setting up a test account follow [these instructions](https://woocommerce.com/document/woopayments/testing-and-troubleshooting/dev-mode/).
For setting up a test account follow [these instructions](https://woo.com/document/woopayments/testing-and-troubleshooting/dev-mode/).

You will need a externally accessible URL to set up the plugin. You can use ngrok for this.

Expand Down
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ Full details of the Automattic Security Policy can be found on [automattic.com](

## Supported Versions

Generally, only the latest version of the extension has continued support. In some cases, we may opt to backport critical vulnerabilities fixes to previous versions.
Generally, only the latest version of the extension has continued support. In some cases, we may opt to backport critical vulnerabilities fixes to previous versions.

## Reporting a Vulnerability

[WooCommerce Payments](https://woocommerce.com/payments/) is an open-source plugin for WooCommerce. Our HackerOne program covers the plugin software.
[WooPayments](https://woo.com/payments/) is an open-source plugin for WooCommerce. Our HackerOne program covers the plugin software.

**For responsible disclosure of security issues and to be eligible for our bug bounty program, please submit your report via the [HackerOne](https://hackerone.com/automattic) portal.**

Expand Down
11 changes: 9 additions & 2 deletions assets/images/cards/amex.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2acfe7f

Please sign in to comment.