Skip to content

Commit

Permalink
Merge pull request #199 from ConvertKit/wp-6.7
Browse files Browse the repository at this point in the history 
Run tests against WordPress 6.7 RC4
  • Loading branch information
@n7studios
n7studios authored Nov 12, 2024
2 parents 00cbaf9 + dde5574 commit ad68073
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
# Defines the WordPress and PHP Versions matrix to run tests on.
strategy:
matrix:
wp-versions: [ 'latest' ] #[ '6.1.1', 'latest' ]
wp-versions: [ '6.7-RC4' ] #[ '6.1.1', 'latest' ]
php-versions: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ] #[ '7.3', '7.4', '8.0', '8.1' ]

# Steps to install, configure and run tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
strategy:
fail-fast: false
matrix:
wp-versions: [ 'latest' ] #[ '6.1.1', 'latest' ]
wp-versions: [ '6.7-RC4' ] #[ '6.1.1', 'latest' ]
php-versions: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] #[ '7.4', '8.0', '8.1' ]

# Folder names within the 'tests' folder to run tests in parallel.
Expand Down
4 changes: 2 additions & 2 deletions tests/_data/dump.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ INSERT INTO `wp_options` (`option_id`, `option_name`, `option_value`, `autoload`
(43, 'html_type', 'text/html', 'yes'),
(44, 'use_trackback', '0', 'yes'),
(45, 'default_role', 'subscriber', 'yes'),
(46, 'db_version', '57155', 'yes'),
(46, 'db_version', '58975', 'yes'),
(47, 'uploads_use_yearmonth_folders', '1', 'yes'),
(48, 'upload_path', '', 'yes'),
(49, 'blog_public', '1', 'yes'),
Expand Down Expand Up @@ -213,7 +213,7 @@ INSERT INTO `wp_options` (`option_id`, `option_name`, `option_value`, `autoload`
(96, 'auto_update_core_minor', 'enabled', 'yes'),
(97, 'auto_update_core_major', 'enabled', 'yes'),
(98, 'wp_force_deactivated_plugins', 'a:0:{}', 'yes'),
(99, 'initial_db_version', '57155', 'yes'),
(99, 'initial_db_version', '58975', 'yes'),
(100, 'wp_user_roles', 'a:5:{s:13:\"administrator\";a:2:{s:4:\"name\";s:13:\"Administrator\";s:12:\"capabilities\";a:61:{s:13:\"switch_themes\";b:1;s:11:\"edit_themes\";b:1;s:16:\"activate_plugins\";b:1;s:12:\"edit_plugins\";b:1;s:10:\"edit_users\";b:1;s:10:\"edit_files\";b:1;s:14:\"manage_options\";b:1;s:17:\"moderate_comments\";b:1;s:17:\"manage_categories\";b:1;s:12:\"manage_links\";b:1;s:12:\"upload_files\";b:1;s:6:\"import\";b:1;s:15:\"unfiltered_html\";b:1;s:10:\"edit_posts\";b:1;s:17:\"edit_others_posts\";b:1;s:20:\"edit_published_posts\";b:1;s:13:\"publish_posts\";b:1;s:10:\"edit_pages\";b:1;s:4:\"read\";b:1;s:8:\"level_10\";b:1;s:7:\"level_9\";b:1;s:7:\"level_8\";b:1;s:7:\"level_7\";b:1;s:7:\"level_6\";b:1;s:7:\"level_5\";b:1;s:7:\"level_4\";b:1;s:7:\"level_3\";b:1;s:7:\"level_2\";b:1;s:7:\"level_1\";b:1;s:7:\"level_0\";b:1;s:17:\"edit_others_pages\";b:1;s:20:\"edit_published_pages\";b:1;s:13:\"publish_pages\";b:1;s:12:\"delete_pages\";b:1;s:19:\"delete_others_pages\";b:1;s:22:\"delete_published_pages\";b:1;s:12:\"delete_posts\";b:1;s:19:\"delete_others_posts\";b:1;s:22:\"delete_published_posts\";b:1;s:20:\"delete_private_posts\";b:1;s:18:\"edit_private_posts\";b:1;s:18:\"read_private_posts\";b:1;s:20:\"delete_private_pages\";b:1;s:18:\"edit_private_pages\";b:1;s:18:\"read_private_pages\";b:1;s:12:\"delete_users\";b:1;s:12:\"create_users\";b:1;s:17:\"unfiltered_upload\";b:1;s:14:\"edit_dashboard\";b:1;s:14:\"update_plugins\";b:1;s:14:\"delete_plugins\";b:1;s:15:\"install_plugins\";b:1;s:13:\"update_themes\";b:1;s:14:\"install_themes\";b:1;s:11:\"update_core\";b:1;s:10:\"list_users\";b:1;s:12:\"remove_users\";b:1;s:13:\"promote_users\";b:1;s:18:\"edit_theme_options\";b:1;s:13:\"delete_themes\";b:1;s:6:\"export\";b:1;}}s:6:\"editor\";a:2:{s:4:\"name\";s:6:\"Editor\";s:12:\"capabilities\";a:34:{s:17:\"moderate_comments\";b:1;s:17:\"manage_categories\";b:1;s:12:\"manage_links\";b:1;s:12:\"upload_files\";b:1;s:15:\"unfiltered_html\";b:1;s:10:\"edit_posts\";b:1;s:17:\"edit_others_posts\";b:1;s:20:\"edit_published_posts\";b:1;s:13:\"publish_posts\";b:1;s:10:\"edit_pages\";b:1;s:4:\"read\";b:1;s:7:\"level_7\";b:1;s:7:\"level_6\";b:1;s:7:\"level_5\";b:1;s:7:\"level_4\";b:1;s:7:\"level_3\";b:1;s:7:\"level_2\";b:1;s:7:\"level_1\";b:1;s:7:\"level_0\";b:1;s:17:\"edit_others_pages\";b:1;s:20:\"edit_published_pages\";b:1;s:13:\"publish_pages\";b:1;s:12:\"delete_pages\";b:1;s:19:\"delete_others_pages\";b:1;s:22:\"delete_published_pages\";b:1;s:12:\"delete_posts\";b:1;s:19:\"delete_others_posts\";b:1;s:22:\"delete_published_posts\";b:1;s:20:\"delete_private_posts\";b:1;s:18:\"edit_private_posts\";b:1;s:18:\"read_private_posts\";b:1;s:20:\"delete_private_pages\";b:1;s:18:\"edit_private_pages\";b:1;s:18:\"read_private_pages\";b:1;}}s:6:\"author\";a:2:{s:4:\"name\";s:6:\"Author\";s:12:\"capabilities\";a:10:{s:12:\"upload_files\";b:1;s:10:\"edit_posts\";b:1;s:20:\"edit_published_posts\";b:1;s:13:\"publish_posts\";b:1;s:4:\"read\";b:1;s:7:\"level_2\";b:1;s:7:\"level_1\";b:1;s:7:\"level_0\";b:1;s:12:\"delete_posts\";b:1;s:22:\"delete_published_posts\";b:1;}}s:11:\"contributor\";a:2:{s:4:\"name\";s:11:\"Contributor\";s:12:\"capabilities\";a:5:{s:10:\"edit_posts\";b:1;s:4:\"read\";b:1;s:7:\"level_1\";b:1;s:7:\"level_0\";b:1;s:12:\"delete_posts\";b:1;}}s:10:\"subscriber\";a:2:{s:4:\"name\";s:10:\"Subscriber\";s:12:\"capabilities\";a:2:{s:4:\"read\";b:1;s:7:\"level_0\";b:1;}}}', 'yes'),
(101, 'fresh_site', '1', 'yes'),
(102, 'user_count', '1', 'no'),
Expand Down
6 changes: 3 additions & 3 deletions tests/_support/Helper/Acceptance/Plugin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Plugin extends \Codeception\Module
*/
public function activateConvertKitPlugin($I)
{
$I->activateThirdPartyPlugin($I, 'kit-formerly-convertkit-for-woocommerce');
$I->activateThirdPartyPlugin($I, 'convertkit-for-woocommerce');
}

/**
Expand All @@ -32,7 +32,7 @@ public function activateConvertKitPlugin($I)
*/
public function deactivateConvertKitPlugin($I)
{
$I->deactivateThirdPartyPlugin($I, 'kit-formerly-convertkit-for-woocommerce');
$I->deactivateThirdPartyPlugin($I, 'convertkit-for-woocommerce');
}

/**
Expand Down Expand Up @@ -73,7 +73,7 @@ public function activateWooCommerceAndConvertKitPlugins($I)
*/
public function deactivateWooCommerceAndConvertKitPlugins($I)
{
$I->deactivateThirdPartyPlugin($I, 'kit-formerly-convertkit-for-woocommerce');
$I->deactivateThirdPartyPlugin($I, 'convertkit-for-woocommerce');

// Deactivate WooCommerce Stripe Gateway before WooCommerce, to prevent WooCommerce throwing a fatal error.
$I->deactivateThirdPartyPlugin($I, 'woocommerce-gateway-stripe');
Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/integrations/WooCommerceSubscriptionsSubscribeEventCest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function _before(AcceptanceTester $I)
$I->activateWooCommerceAndConvertKitPlugins($I);

// Activate WooCommerce Subscriptions Plugin.
$I->activateThirdPartyPlugin($I, 'woo-subscriptions');
$I->activateThirdPartyPlugin($I, 'woocommerce-subscriptions');

// Setup WooCommerce Plugin.
$I->setupWooCommercePlugin($I);
Expand Down Expand Up @@ -133,8 +133,8 @@ public function testOptInWhenCheckedWithFormAndNonSubscriptionProduct(Acceptance
*/
public function _passed(AcceptanceTester $I)
{
$I->deactivateThirdPartyPlugin($I, 'woocommerce-subscriptions');
$I->deactivateWooCommerceAndConvertKitPlugins($I);
$I->deactivateThirdPartyPlugin($I, 'woo-subscriptions');
$I->resetConvertKitPlugin($I);
}
}
4 changes: 2 additions & 2 deletions tests/acceptance/integrations/WooCommerceSubscriptionsSubscribeEventCheckoutBlock.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function _before(AcceptanceTester $I)
$I->activateWooCommerceAndConvertKitPlugins($I);

// Activate WooCommerce Subscriptions Plugin.
$I->activateThirdPartyPlugin($I, 'woo-subscriptions');
$I->activateThirdPartyPlugin($I, 'woocommerce-subscriptions');

// Setup WooCommerce Plugin.
$I->setupWooCommercePlugin($I);
Expand Down Expand Up @@ -135,8 +135,8 @@ public function testOptInWhenCheckedWithFormAndNonSubscriptionProduct(Acceptance
*/
public function _passed(AcceptanceTester $I)
{
$I->deactivateThirdPartyPlugin($I, 'woocommerce-subscriptions');
$I->deactivateWooCommerceAndConvertKitPlugins($I);
$I->deactivateThirdPartyPlugin($I, 'woo-subscriptions');
$I->resetConvertKitPlugin($I);
}
}
2 changes: 1 addition & 1 deletion tests/acceptance/purchase-data/PurchaseDataCest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -975,8 +975,8 @@ public function testSendPurchaseDataNameFormatHonoredWhenSubscribed(AcceptanceTe
*/
public function _passed(AcceptanceTester $I)
{
$I->deactivateWooCommerceAndConvertKitPlugins($I);
$I->deactivateThirdPartyPlugin($I, 'custom-order-numbers-for-woocommerce');
$I->deactivateWooCommerceAndConvertKitPlugins($I);
$I->resetConvertKitPlugin($I);
}
}
2 changes: 1 addition & 1 deletion tests/acceptance/sync-past-orders/SyncPastOrdersCLICest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ public function testSyncPastOrdersWithLimitArgument(AcceptanceTester $I)
*/
public function _passed(AcceptanceTester $I)
{
$I->deactivateWooCommerceAndConvertKitPlugins($I);
$I->deactivateThirdPartyPlugin($I, 'custom-order-numbers-for-woocommerce');
$I->deactivateWooCommerceAndConvertKitPlugins($I);
$I->resetConvertKitPlugin($I);
}
}
2 changes: 1 addition & 1 deletion tests/acceptance/sync-past-orders/SyncPastOrdersCest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,8 @@ public function testSyncPastOrderWithInvalidAPICredentials(AcceptanceTester $I)
*/
public function _passed(AcceptanceTester $I)
{
$I->deactivateWooCommerceAndConvertKitPlugins($I);
$I->deactivateThirdPartyPlugin($I, 'custom-order-numbers-for-woocommerce');
$I->deactivateWooCommerceAndConvertKitPlugins($I);
$I->resetConvertKitPlugin($I);
}
}

0 comments on commit ad68073

Please sign in to comment.