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

Fix conditional to determine if we are using a WP version >= WP 6.1 in the tests #2437

Merged
merged 1 commit into from Oct 26, 2022

Conversation

olafleur-godaddy
Copy link
Member

Description

The old version was looking for the first class only, the correct looks for the presence of the class in the list of classes. It is better, because we cannot guarantee that the branch-6-1 (for example) is the first class named.

@olafleur-godaddy olafleur-godaddy changed the title Fix conditional to determine if we are using a version >= WP 6.1 in the tests Fix conditional to determine if we are using a WP version >= WP 6.1 in the tests Oct 26, 2022
@olafleur-godaddy olafleur-godaddy merged commit 1a00eac into master Oct 26, 2022
@olafleur-godaddy olafleur-godaddy deleted the WPEX-2363-fix-conditional-WP61 branch October 26, 2022 13:57
@olafleur-godaddy olafleur-godaddy added this to the Next Release milestone Nov 3, 2022
EvanHerman added a commit that referenced this pull request Nov 7, 2022
* fix #2431: re-register key bindings on subsequent lightbox opens (#2432)

* fix #2431: lightbox key bindings

* tweak logic and spacing

Co-authored-by: AnthonyLedesma <anthonymledesma@gmail.com>

* [skip ci] Update coblocks.pot/coblocks.json files

* Updates

* update .sql file

* Updates

* Update aria labels

* Updates to slider

* Update unit tests

* Add ignore element

* Add wait beore running pa11y

* Update .sql file

* updates

* Remove alert

* Try pa11y-ci

* Test new config

* update

* Wait for element

* Update actions

* Test screenshot before pa11y

* Fix path

* Fix artifact path

* Increase timeout

* Move images to uploads directory

* Tweak media path

* Rename coblocks-testing

* Try pa11y

* Update pa11y.js

* Fix test url

* Remove pa11y-ci

* Update pa11y sql test file

* Update site title and tagline of a11y test site

* Install go theme before performance tests run

* Install go theme before performance tests run

* remove go theme before performance tests run

* Update form cypress test

* Update form cypress test

* Update service block test

* Remove checkbox from color test

* Fix form legend style attributes

* Add test for form legend color

* Update eslint errors/warnings

* Update color label test

* Update collage and carousel snapshots

* Update form tests

* Update

* Update

* Fix form tests

* Test

* Update color

* Update pricing table test

* Update service cypress test

* Revert

* Update helpers add custom class, update service cypress test.

* Uncomment test

* Fix js errors

* Fix broken tests with WP 6.1 RC1 (#2435)

* Fix broken tests in Accordion block in WP 6.1 RC1

* Other fixes

* Fix condition

* Permalink is not at the same place in WP 6.1

* Type caption in Gallery Collage

* Fix Pricing Table Item test

* Fix padding-controls test

* Fix Food & Drink block tests

* Do not execute Form tests that need a CI setup when in local

* Fix Form block test

* Fix Food Item block tests

* Fix Icon block test

* Fix Gallery Masonry block test

* Code review fixes

* [skip ci] Update coblocks.pot/coblocks.json files

* Fix collage replace image caption save bug

* Add WCAG2A badge to readme.md

* Fix conditional to determine if we are using a WP version >= WP 6.1 in the tests (#2437)

Fix conditional

* [skip ci] Update coblocks.pot/coblocks.json files

* Drop support for PHP 5.6 (#2408)

* Drop PHP 5.6

* Update wp-phpunit

* Drop --1

* composer update

* Revert skip coverage for PHP 8.1

* Fix spacing

* Rollback --1

* Put back newPhpUnit flag

* Augment PHP version to 7.4+ in phpcs.xml

* [skip ci] Update coblocks.pot/coblocks.json files

* Disable color controls for WordPress 6.1+ (#2440)

* disable color settings controls in 6.1+ WP

* Skip Cypress tests for Color Controls for WP 6.1+

Co-authored-by: Anthony M Ledesma <aledesma@LM-H7V42D79VD.lan>
Co-authored-by: Olivier Lafleur <olafleur@godaddy.com>

* [skip ci] Update coblocks.pot/coblocks.json files

* Bump 'Tested up to' to WP 6.1 (#2439)

* [skip ci] Update coblocks.pot/coblocks.json files

* Make sure that the Welcome Guide does not show in the Cypress tests (#2441)

* It should work

* Code Review changes

* [skip ci] Update coblocks.pot/coblocks.json files

* Fix aria label for email field. Remove migrate heading level from food and drink item.

* Remove ID attributes from next and prev buttons

* Update GoDaddy Styles to 1.0.5 (#2438)

* [skip ci] Update coblocks.pot/coblocks.json files

* Changelog for 2.25.0

* 2.25.0

* [skip ci] Update coblocks.pot/coblocks.json files

* Add @gracemarsh to the contributors

* [skip ci] Update coblocks.pot/coblocks.json files

* Fix extra }

* Update email field aria label capitalization

Co-authored-by: Grace <62684655+gracemarsh@users.noreply.github.com>
Co-authored-by: AnthonyLedesma <anthonymledesma@gmail.com>
Co-authored-by: GoDaddy Translator Bot <plugins@godaddy.com>
Co-authored-by: Olivier Lafleur <85255688+olafleur-godaddy@users.noreply.github.com>
Co-authored-by: Anthony Ledesma <30462574+AnthonyLedesma@users.noreply.github.com>
Co-authored-by: Anthony M Ledesma <aledesma@LM-H7V42D79VD.lan>
Co-authored-by: Olivier Lafleur <olafleur@godaddy.com>
EvanHerman added a commit that referenced this pull request Nov 10, 2022
* Enable a11y testing on CircleCI.

* pa11y Updates (#2434)

* fix #2431: re-register key bindings on subsequent lightbox opens (#2432)

* fix #2431: lightbox key bindings

* tweak logic and spacing

Co-authored-by: AnthonyLedesma <anthonymledesma@gmail.com>

* [skip ci] Update coblocks.pot/coblocks.json files

* Updates

* update .sql file

* Updates

* Update aria labels

* Updates to slider

* Update unit tests

* Add ignore element

* Add wait beore running pa11y

* Update .sql file

* updates

* Remove alert

* Try pa11y-ci

* Test new config

* update

* Wait for element

* Update actions

* Test screenshot before pa11y

* Fix path

* Fix artifact path

* Increase timeout

* Move images to uploads directory

* Tweak media path

* Rename coblocks-testing

* Try pa11y

* Update pa11y.js

* Fix test url

* Remove pa11y-ci

* Update pa11y sql test file

* Update site title and tagline of a11y test site

* Install go theme before performance tests run

* Install go theme before performance tests run

* remove go theme before performance tests run

* Update form cypress test

* Update form cypress test

* Update service block test

* Remove checkbox from color test

* Fix form legend style attributes

* Add test for form legend color

* Update eslint errors/warnings

* Update color label test

* Update collage and carousel snapshots

* Update form tests

* Update

* Update

* Fix form tests

* Test

* Update color

* Update pricing table test

* Update service cypress test

* Revert

* Update helpers add custom class, update service cypress test.

* Uncomment test

* Fix js errors

* Fix broken tests with WP 6.1 RC1 (#2435)

* Fix broken tests in Accordion block in WP 6.1 RC1

* Other fixes

* Fix condition

* Permalink is not at the same place in WP 6.1

* Type caption in Gallery Collage

* Fix Pricing Table Item test

* Fix padding-controls test

* Fix Food & Drink block tests

* Do not execute Form tests that need a CI setup when in local

* Fix Form block test

* Fix Food Item block tests

* Fix Icon block test

* Fix Gallery Masonry block test

* Code review fixes

* [skip ci] Update coblocks.pot/coblocks.json files

* Fix collage replace image caption save bug

* Add WCAG2A badge to readme.md

* Fix conditional to determine if we are using a WP version >= WP 6.1 in the tests (#2437)

Fix conditional

* [skip ci] Update coblocks.pot/coblocks.json files

* Drop support for PHP 5.6 (#2408)

* Drop PHP 5.6

* Update wp-phpunit

* Drop --1

* composer update

* Revert skip coverage for PHP 8.1

* Fix spacing

* Rollback --1

* Put back newPhpUnit flag

* Augment PHP version to 7.4+ in phpcs.xml

* [skip ci] Update coblocks.pot/coblocks.json files

* Disable color controls for WordPress 6.1+ (#2440)

* disable color settings controls in 6.1+ WP

* Skip Cypress tests for Color Controls for WP 6.1+

Co-authored-by: Anthony M Ledesma <aledesma@LM-H7V42D79VD.lan>
Co-authored-by: Olivier Lafleur <olafleur@godaddy.com>

* [skip ci] Update coblocks.pot/coblocks.json files

* Bump 'Tested up to' to WP 6.1 (#2439)

* [skip ci] Update coblocks.pot/coblocks.json files

* Make sure that the Welcome Guide does not show in the Cypress tests (#2441)

* It should work

* Code Review changes

* [skip ci] Update coblocks.pot/coblocks.json files

* Fix aria label for email field. Remove migrate heading level from food and drink item.

* Remove ID attributes from next and prev buttons

* Update GoDaddy Styles to 1.0.5 (#2438)

* [skip ci] Update coblocks.pot/coblocks.json files

* Changelog for 2.25.0

* 2.25.0

* [skip ci] Update coblocks.pot/coblocks.json files

* Add @gracemarsh to the contributors

* [skip ci] Update coblocks.pot/coblocks.json files

* Fix extra }

* Update email field aria label capitalization

Co-authored-by: Grace <62684655+gracemarsh@users.noreply.github.com>
Co-authored-by: AnthonyLedesma <anthonymledesma@gmail.com>
Co-authored-by: GoDaddy Translator Bot <plugins@godaddy.com>
Co-authored-by: Olivier Lafleur <85255688+olafleur-godaddy@users.noreply.github.com>
Co-authored-by: Anthony Ledesma <30462574+AnthonyLedesma@users.noreply.github.com>
Co-authored-by: Anthony M Ledesma <aledesma@LM-H7V42D79VD.lan>
Co-authored-by: Olivier Lafleur <olafleur@godaddy.com>

* Reinstall composer dependencies

* Remove composer install step from a11y

Co-authored-by: Justin Kopepasah <justin@kopepasah.com>
Co-authored-by: Evan Herman <evan.m.herman@gmail.com>
Co-authored-by: Grace <62684655+gracemarsh@users.noreply.github.com>
Co-authored-by: AnthonyLedesma <anthonymledesma@gmail.com>
Co-authored-by: GoDaddy Translator Bot <plugins@godaddy.com>
Co-authored-by: Olivier Lafleur <85255688+olafleur-godaddy@users.noreply.github.com>
Co-authored-by: Anthony Ledesma <30462574+AnthonyLedesma@users.noreply.github.com>
Co-authored-by: Anthony M Ledesma <aledesma@LM-H7V42D79VD.lan>
Co-authored-by: Olivier Lafleur <olafleur@godaddy.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants