Merge pull request #453 from ConvertKit/wp-6.2

Run tests against ‘latest’ (WordPress 6.2)

.github/workflows/coding-standards.yml

@@ -35,7 +35,7 @@ jobs:
     # Defines the WordPress and PHP Versions matrix to run tests on.
     strategy:
       matrix:
-        wp-versions: [ '6.2-RC2' ] #[ '6.1.1', 'latest' ]
+        wp-versions: [ 'latest' ] #[ '6.1.1', 'latest' ]
         php-versions: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ] #[ '7.3', '7.4', '8.0', '8.1' ]
 
     # Steps to install, configure and run tests

.github/workflows/tests.yml

@@ -44,7 +44,7 @@ jobs:
     # For PHP, make sure that an nginx configuration file exists for the required PHP version in this repository at tests/nginx/php-x.x.conf
     strategy:
       matrix:
-        wp-versions: [ '6.2-RC4' ] #[ '6.1.1', 'latest' ]
+        wp-versions: [ 'latest' ] #[ '6.1.1', 'latest' ]
         php-versions: [ '7.4', '8.0', '8.1', '8.2' ] #[ '7.4', '8.0', '8.1' ]
 
         # Folder names within the 'tests' folder to run tests in parallel.

readme.txt

@@ -3,7 +3,7 @@ Contributors: nathanbarry, growdev, travisnorthcutt, ggwicz
 Donate link: https://convertkit.com
 Tags: email marketing, email newsletter, newsletter, subscribers, convertkit
 Requires at least: 5.0
-Tested up to: 6.1.1
+Tested up to: 6.2
 Requires PHP: 5.6.20
 Stable tag: 2.1.1
 License: GPLv2 or later

tests/_support/Helper/Acceptance/Plugin.php

@@ -282,6 +282,11 @@ public function setupConvertKitPluginResources($I)
 					'name'       => 'gravityforms-tag-1',
 					'created_at' => '2022-02-02T14:06:32.000Z',
 				],
+				3748541 => [
+					'id'         => 3748541,
+					'name'       => 'wpforms',
+					'created_at' => '2023-03-29T12:32:38.000Z',
+				],
 				2907193 => [
 					'id'         => 2907193,
 					'name'       => 'gravityforms-tag-2',
@@ -577,7 +582,7 @@ public function checkSelectTagOptionOrder($I, $selectElement, $prependOptions =
 		// Define options.
 		$options = [
 			'gravityforms-tag-1', // First item.
-			'wordpress', // Last item.
+			'wpforms', // Last item.
 		];
 
 		// Prepend options, such as 'Default' and 'None' to the options, if required.

tests/wpunit/ResourceTagsTest.php

@@ -136,7 +136,7 @@ public function testGet()
 
 		// Assert order of data is in ascending alphabetical order.
 		$this->assertEquals('gravityforms-tag-1', reset($result)[ $this->resource->order_by ]);
-		$this->assertEquals('wordpress', end($result)[ $this->resource->order_by ]);
+		$this->assertEquals('wpforms', end($result)[ $this->resource->order_by ]);
 	}
 
 	/**
@@ -166,7 +166,7 @@ public function testGetWithValidOrderByAndOrder()
 		$this->assertArrayHasKey('name', reset($result));
 
 		// Assert order of data is in ascending alphabetical order.
-		$this->assertEquals('wordpress', reset($result)[ $this->resource->order_by ]);
+		$this->assertEquals('wpforms', reset($result)[ $this->resource->order_by ]);
 		$this->assertEquals('gravityforms-tag-1', end($result)[ $this->resource->order_by ]);
 	}
 
@@ -197,7 +197,7 @@ public function testGetWithInvalidOrderBy()
 
 		// Assert order of data has not changed.
 		$this->assertEquals('wordpress', reset($result)['name']);
-		$this->assertEquals('gravityforms-tag-2', end($result)['name']);
+		$this->assertEquals('wpforms', end($result)['name']);
 	}
 
 	/**