From cbb4d8e9b48e40b925f5fda5d0f300f8bcdb3dc7 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Tue, 14 Nov 2023 16:50:26 +0000
Subject: [PATCH 1/4] Added Author setting to Broadcasts Importer

---
 ...s-convertkit-admin-settings-broadcasts.php | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/admin/section/class-convertkit-admin-settings-broadcasts.php b/admin/section/class-convertkit-admin-settings-broadcasts.php
index 9eb31ea49..01c1413b0 100644
--- a/admin/section/class-convertkit-admin-settings-broadcasts.php
+++ b/admin/section/class-convertkit-admin-settings-broadcasts.php
@@ -209,6 +209,19 @@ public function register_fields() {
 			)
 		);
 
+		add_settings_field(
+			'author_id',
+			__( 'Author', 'convertkit' ),
+			array( $this, 'author_id_callback' ),
+			$this->settings_key,
+			$this->name,
+			array(
+				'name'        => 'author_id',
+				'label_for'   => 'author_id',
+				'description' => __( 'The WordPress User to set as the author for WordPress Posts created from imported broadcasts.', 'convertkit' ),
+			)
+		);
+
 		add_settings_field(
 			'category_id',
 			__( 'Category', 'convertkit' ),
@@ -358,6 +371,32 @@ public function post_status_callback( $args ) {
 
 	}
 
+	/**
+	 * Renders the input for the author setting.
+	 *
+	 * @since   2.3.9
+	 *
+	 * @param   array $args   Setting field arguments (name,description).
+	 */
+	public function author_id_callback( $args ) {
+
+		// Build field.
+		$select_field = wp_dropdown_users(
+			array(
+				'echo'             => false,
+				'selected'         => $this->settings->author_id(),
+				'include_selected' => true,
+				'name'             => $this->settings_key . '[' . $args['name'] . ']',
+				'id'               => $args['name'],
+				'class'            => 'enabled convertkit-select2',
+			)
+		);
+
+		// Output field.
+		echo '<div class="convertkit-select2-container">' . $select_field . '</div>' . $this->get_description( $args['description'] ); // phpcs:ignore WordPress.Security.EscapeOutput
+
+	}
+
 	/**
 	 * Renders the input for the category setting.
 	 *

From 982e24b34f2d8aa9b6904dc57d182677785da3bf Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Wed, 15 Nov 2023 13:45:42 -0500
Subject: [PATCH 2/4] Started tests

---
 .../broadcasts/import/BroadcastsToPostsSettingsCest.php      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/acceptance/broadcasts/import/BroadcastsToPostsSettingsCest.php b/tests/acceptance/broadcasts/import/BroadcastsToPostsSettingsCest.php
index 9db84497f..8a514851f 100644
--- a/tests/acceptance/broadcasts/import/BroadcastsToPostsSettingsCest.php
+++ b/tests/acceptance/broadcasts/import/BroadcastsToPostsSettingsCest.php
@@ -38,6 +38,7 @@ public function testAccessibility(AcceptanceTester $I)
 		// Confirm that settings have label[for] attributes.
 		$I->seeInSource('<label for="enabled">');
 		$I->seeInSource('<label for="post_status">');
+		$I->seeInSource('<label for="author_id">');
 		$I->seeInSource('<label for="category_id">');
 		$I->seeInSource('<label for="published_at_min_date">');
 		$I->seeInSource('<label for="no_styles">');
@@ -75,6 +76,7 @@ public function testEnableDisableImport(AcceptanceTester $I)
 		$I->seeCheckboxIsChecked('#enabled');
 		$I->seeElement('table.form-table tbody tr td a.button');
 		$I->seeElement('span[aria-labelledby="select2-_wp_convertkit_settings_broadcasts_post_status-container"]');
+		$I->seeElement('span[aria-labelledby="select2-_wp_convertkit_settings_broadcasts_author_id-container"]');
 		$I->seeElement('span[aria-labelledby="select2-_wp_convertkit_settings_broadcasts_category_id-container"]');
 		$I->seeElement('div.convertkit-select2-container');
 		$I->seeElement('input#published_at_min_date');
@@ -98,6 +100,7 @@ public function testEnableDisableImport(AcceptanceTester $I)
 		$I->dontSeeCheckboxIsChecked('#enabled');
 		$I->dontSeeElement('table.form-table tbody tr td a.button');
 		$I->dontSeeElement('span[aria-labelledby="select2-_wp_convertkit_settings_broadcasts_post_status-container"]');
+		$I->dontSeeElement('span[aria-labelledby="select2-_wp_convertkit_settings_broadcasts_author_id-container"]');
 		$I->dontSeeElement('span[aria-labelledby="select2-_wp_convertkit_settings_broadcasts_category_id-container"]');
 		$I->dontSeeElement('input#published_at_min_date');
 
@@ -120,6 +123,7 @@ public function testSaveSettings(AcceptanceTester $I)
 		// Enable Broadcasts to Posts, and modify settings.
 		$I->checkOption('#enabled');
 		$I->fillSelect2Field($I, '#select2-_wp_convertkit_settings_broadcasts_post_status-container', 'Draft');
+		$I->fillSelect2Field($I, '#select2-_wp_convertkit_settings_broadcasts_author_id-container', 'admin');
 		$I->fillSelect2Field($I, '#select2-_wp_convertkit_settings_broadcasts_category_id-container', 'ConvertKit Broadcasts to Posts');
 		$I->fillField('_wp_convertkit_settings_broadcasts[published_at_min_date]', '01/01/2023');
 		$I->checkOption('#enabled_export');
@@ -134,6 +138,7 @@ public function testSaveSettings(AcceptanceTester $I)
 		// Confirm that settings saved.
 		$I->seeCheckboxIsChecked('#enabled');
 		$I->seeInField('_wp_convertkit_settings_broadcasts[post_status]', 'Draft');
+		$I->seeInField('_wp_convertkit_settings_broadcasts[author_id]', 'admin');
 		$I->seeInField('_wp_convertkit_settings_broadcasts[category_id]', 'ConvertKit Broadcasts to Posts');
 		$I->seeInField('_wp_convertkit_settings_broadcasts[published_at_min_date]', '2023-01-01');
 		$I->seeCheckboxIsChecked('#enabled_export');

From eddde477fe972fd6173fe2ea73f59ccf918b0f0c Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 16 Nov 2023 09:36:29 -0600
Subject: [PATCH 3/4] Stubbed new tests

---
 .../import/BroadcastsToPostsCest.php          | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/tests/acceptance/broadcasts/import/BroadcastsToPostsCest.php b/tests/acceptance/broadcasts/import/BroadcastsToPostsCest.php
index c13dac129..aef0f74fc 100644
--- a/tests/acceptance/broadcasts/import/BroadcastsToPostsCest.php
+++ b/tests/acceptance/broadcasts/import/BroadcastsToPostsCest.php
@@ -284,6 +284,65 @@ public function testBroadcastsImportWithPostStatusEnabled(AcceptanceTester $I)
 		}
 	}
 
+	/**
+	 * Tests that Broadcasts import when enabled in the Plugin's settings,
+	 * an Author is defined and the Author is assigned to the created
+	 * WordPress Posts.
+	 * 
+	 * @TODO Run this test. Register a new user so it's not the admin user.
+	 *
+	 * @since   2.3.8
+	 *
+	 * @param   AcceptanceTester $I  Tester.
+	 */
+	public function testBroadcastsImportWithAuthorIDEnabled(AcceptanceTester $I)
+	{
+		// Enable Broadcasts to Posts.
+		$I->setupConvertKitPluginBroadcasts(
+			$I,
+			[
+				'enabled'               => true,
+				'author_id'             => 'admin',
+				'category_id'           => $this->categoryName,
+				'published_at_min_date' => '01/01/2020',
+			]
+		);
+
+		// Run the WordPress Cron event to import Broadcasts to WordPress Posts.
+		$I->runCronEvent($I, $this->cronEventName);
+
+		// Wait a few seconds for the Cron event to complete importing Broadcasts.
+		$I->wait(7);
+
+		// Load the Posts screen.
+		$I->amOnAdminPage('edit.php');
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm expected Broadcasts exist as Posts.
+		$I->see($_ENV['CONVERTKIT_API_BROADCAST_FIRST_TITLE']);
+		$I->see($_ENV['CONVERTKIT_API_BROADCAST_SECOND_TITLE']);
+		$I->see($_ENV['CONVERTKIT_API_BROADCAST_THIRD_TITLE']);
+
+		// Get created Post IDs.
+		$postIDs = [
+			(int) str_replace('post-', '', $I->grabAttributeFrom('tbody#the-list > tr:nth-child(1)', 'id')),
+			(int) str_replace('post-', '', $I->grabAttributeFrom('tbody#the-list > tr:nth-child(2)', 'id')),
+			(int) str_replace('post-', '', $I->grabAttributeFrom('tbody#the-list > tr:nth-child(3)', 'id')),
+		];
+
+		// Confirm each Post's status is private.
+		foreach ($postIDs as $postID) {
+			$I->seePostInDatabase(
+				[
+					'ID'          => $postID,
+					'post_author' => '1',
+				]
+			);
+		}
+	}
+
 	/**
 	 * Tests that Broadcasts import when enabled in the Plugin's settings
 	 * a Category is defined and the Category is assigned to the created

From 880cba4209248caecbae0a45876d4471838c8248 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 16 Nov 2023 10:20:29 -0600
Subject: [PATCH 4/4] Completed tests

---
 .../class-convertkit-admin-settings-broadcasts.php       | 2 +-
 tests/_support/Helper/Acceptance/Plugin.php              | 1 +
 .../broadcasts/import/BroadcastsToPostsCest.php          | 9 +++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/admin/section/class-convertkit-admin-settings-broadcasts.php b/admin/section/class-convertkit-admin-settings-broadcasts.php
index 01c1413b0..99ef634f3 100644
--- a/admin/section/class-convertkit-admin-settings-broadcasts.php
+++ b/admin/section/class-convertkit-admin-settings-broadcasts.php
@@ -387,7 +387,7 @@ public function author_id_callback( $args ) {
 				'selected'         => $this->settings->author_id(),
 				'include_selected' => true,
 				'name'             => $this->settings_key . '[' . $args['name'] . ']',
-				'id'               => $args['name'],
+				'id'               => $this->settings_key . '_' . $args['name'],
 				'class'            => 'enabled convertkit-select2',
 			)
 		);
diff --git a/tests/_support/Helper/Acceptance/Plugin.php b/tests/_support/Helper/Acceptance/Plugin.php
index 17c85847b..8e52d7e2c 100644
--- a/tests/_support/Helper/Acceptance/Plugin.php
+++ b/tests/_support/Helper/Acceptance/Plugin.php
@@ -421,6 +421,7 @@ public function setupConvertKitPluginBroadcasts($I, $settings = false)
 
 					case 'post_status':
 					case 'category_id':
+					case 'author_id':
 						$I->fillSelect2Field($I, '#select2-_wp_convertkit_settings_broadcasts_' . $key . '-container', $value);
 
 						break;
diff --git a/tests/acceptance/broadcasts/import/BroadcastsToPostsCest.php b/tests/acceptance/broadcasts/import/BroadcastsToPostsCest.php
index aef0f74fc..f647f77e6 100644
--- a/tests/acceptance/broadcasts/import/BroadcastsToPostsCest.php
+++ b/tests/acceptance/broadcasts/import/BroadcastsToPostsCest.php
@@ -288,8 +288,6 @@ public function testBroadcastsImportWithPostStatusEnabled(AcceptanceTester $I)
 	 * Tests that Broadcasts import when enabled in the Plugin's settings,
 	 * an Author is defined and the Author is assigned to the created
 	 * WordPress Posts.
-	 * 
-	 * @TODO Run this test. Register a new user so it's not the admin user.
 	 *
 	 * @since   2.3.8
 	 *
@@ -297,12 +295,15 @@ public function testBroadcastsImportWithPostStatusEnabled(AcceptanceTester $I)
 	 */
 	public function testBroadcastsImportWithAuthorIDEnabled(AcceptanceTester $I)
 	{
+		// Add a WordPress User with an Editor role.
+		$I->haveUserInDatabase( 'editor', 'editor' );
+
 		// Enable Broadcasts to Posts.
 		$I->setupConvertKitPluginBroadcasts(
 			$I,
 			[
 				'enabled'               => true,
-				'author_id'             => 'admin',
+				'author_id'             => 'editor',
 				'category_id'           => $this->categoryName,
 				'published_at_min_date' => '01/01/2020',
 			]
@@ -337,7 +338,7 @@ public function testBroadcastsImportWithAuthorIDEnabled(AcceptanceTester $I)
 			$I->seePostInDatabase(
 				[
 					'ID'          => $postID,
-					'post_author' => '1',
+					'post_author' => '2',
 				]
 			);
 		}