Skip to content

Commit

Permalink
Merge pull request #113 from liip/fix/update-dependencies
Browse files Browse the repository at this point in the history
fix(): Update dependencies
  • Loading branch information
tschortsch authored Aug 26, 2022
2 parents 412305c + 50756c7 commit 747bf2a
Show file tree
Hide file tree
Showing 38 changed files with 5,247 additions and 5,347 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ build
!.*.js
snapshots.js
cypress/index.d.ts
release/
6 changes: 0 additions & 6 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ module.exports = {
// Use cypress/recommended plugin for cypress tests.
files: [ 'cypress/**/*.js' ],
extends: [ 'plugin:cypress/recommended' ],
rules: {
'jest/expect-expect': [
'error',
{ assertFunctionNames: [ 'expect', 'cy' ] },
],
},
},
],
};
39 changes: 3 additions & 36 deletions .github/workflows/lint-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

strategy:
matrix:
wp: [ '5.7', '5.8', '5.9' ]
wp: [ '5.7', '5.8', '5.9', '6.0' ]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -66,46 +66,13 @@ jobs:
- name: Running PHP unit tests
run: npm run test:unit:php:ci

tests-wp-60:
name: Tests WordPress 6.0

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Use Node.js 16
uses: actions/setup-node@v3
with:
node-version: 16

- name: Install dependencies
run: |
npm ci
composer install
- name: "Configure environment with WP 6.0"
run: |
echo -e '{\n\t"core": "https://wordpress.org/wordpress-6.0-RC2.zip"\n}' > ./.wp-env.override.json
- name: Install WordPress
run: |
chmod -R 767 ./ # TODO: Possibly integrate in wp-env
npm run wp-env start
- name: Running JavaScript E2E tests
run: npm run test:e2e

- name: Running PHP unit tests
run: npm run test:unit:php:ci

deploy-dry-run:
name: '[DRY RUN] Deploy'

# only run on master but not tags
if: ${{ github.ref == 'refs/heads/master' && !startsWith(github.ref, 'refs/tags/') }}

needs: [ lint, tests, 'tests-wp-60' ]
needs: [ lint, tests ]

runs-on: ubuntu-latest

Expand All @@ -124,7 +91,7 @@ jobs:
# only run on tags
if: startsWith(github.ref, 'refs/tags/')

needs: [ lint, tests, 'tests-wp-60' ]
needs: [ lint, tests ]

runs-on: ubuntu-latest

Expand Down
2 changes: 1 addition & 1 deletion .wp-env.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"core": "https://wordpress.org/wordpress-6.0-RC2.zip",
"core": "WordPress/WordPress#6.0.1",
"plugins": [ "." ],
"themes": [
"./test-themes/bootstrap"
Expand Down
2 changes: 1 addition & 1 deletion build/index.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => '880a7b58237fe7651d7b3ff82836e11b');
<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => '0a2b1fb09f220caef635');
2 changes: 1 addition & 1 deletion build/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/settings.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array(), 'version' => 'f0104b60f4e97fe8fc9db16e1886cf55');
<?php return array('dependencies' => array(), 'version' => '4f343567074889394f03');
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
"email": "[email protected]"
},
"require-dev": {
"squizlabs/php_codesniffer": "^3.6",
"squizlabs/php_codesniffer": "^3.7",
"wp-coding-standards/wpcs": "dev-develop",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
"wp-phpunit/wp-phpunit": "^5.8",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
"wp-phpunit/wp-phpunit": "^6.0",
"yoast/phpunit-polyfills": "^1.0"
},
"minimum-stability": "dev",
Expand Down
43 changes: 24 additions & 19 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions cypress.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
const { defineConfig } = require( 'cypress' );

module.exports = defineConfig( {
video: false,
screenshotOnRunFailure: false,
retries: {
runMode: 2,
openMode: 0,
},
e2e: {
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents( on, config ) {
return require( './cypress/plugins/index.js' )( on, config );
},
baseUrl: 'http://localhost:8889',
},
} );
9 changes: 0 additions & 9 deletions cypress.json

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions cypress/support/commands/insert-button-block.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Cypress.Commands.add( 'insertButtonBlock', () => {
cy.searchForBlock( 'Bootstrap Button' );
cy.get(
'button.editor-block-list-item-wp-bootstrap-blocks-button'
).click( { force: true } );
cy.get( 'button.editor-block-list-item-wp-bootstrap-blocks-button' ).click(
{ force: true }
);
} );
File renamed without changes.
Loading

0 comments on commit 747bf2a

Please sign in to comment.