Merge pull request #251 from Automattic/fix-various-tests

Fix PHPCS and support-level related tests
Automattic · Feb 23, 2022 · c6dd489 · c6dd489
2 parents 072e1ba + d3ea2fa
commit c6dd489
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 1 deletion.
diff --git a/tests/integration/PhpcsScanValidateSniffsInOptionAndReportTest.php b/tests/integration/PhpcsScanValidateSniffsInOptionAndReportTest.php
@@ -9,6 +9,9 @@ final class PhpcsScanValidateSniffsInOptionAndReportTest extends TestCase {
 		'phpcs-path'
 			=> null,
 
+		'phpcs-php-path'
+			=> null,
+
 		'phpcs-standard'
 			=> null,
 
@@ -66,6 +69,8 @@ protected function setUp(): void {
 
 		$this->options['branches-ignore'] = array();
 
+		$this->options['phpcs'] = true;
+
 		$this->options['phpcs-sniffs-include'] = array();
 		$this->options['phpcs-sniffs-exclude'] = array();
 

diff --git a/tests/integration/SupportLevelLabelMetaApiDataFetchTest.php b/tests/integration/SupportLevelLabelMetaApiDataFetchTest.php
@@ -25,6 +25,16 @@ protected function setUp(): void {
 		);
 
 		$this->options = $this->options_meta_api_secrets;
+
+		// This can be an empty string, set to empty if null.
+		if ( null === $this->options['repo-meta-api-user-id'] ) {
+			$this->options['repo-meta-api-user-id'] = '';
+		}
+
+		// This can be an empty string, set to empty if null.
+		if ( null === $this->options['repo-meta-api-access-token'] ) {
+			$this->options['repo-meta-api-access-token'] = '';
+		}
 	}
 
 	protected function tearDown(): void {

diff --git a/tests/integration/SupportLevelLabelRepoMetaApiDataMatchTest.php b/tests/integration/SupportLevelLabelRepoMetaApiDataMatchTest.php
@@ -58,6 +58,16 @@ protected function setUp(): void {
 		);
 
 		$this->options['branches-ignore'] = array();
+
+		// This can be an empty string, set to empty if null.
+		if ( null === $this->options['repo-meta-api-user-id'] ) {
+			$this->options['repo-meta-api-user-id'] = '';
+		}
+
+		// This can be an empty string, set to empty if null.
+		if ( null === $this->options['repo-meta-api-access-token'] ) {
+			$this->options['repo-meta-api-access-token'] = '';
+		}
 	}
 
 	protected function tearDown(): void {

diff --git a/tests/integration/SupportLevelLabelSetTest.php b/tests/integration/SupportLevelLabelSetTest.php
@@ -57,6 +57,16 @@ protected function setUp(): void {
 			'[MySupport Level]';
 
 		$this->options['skip-draft-prs'] = false;
+
+		// This can be an empty string, set to empty if null.
+		if ( null === $this->options['repo-meta-api-user-id'] ) {
+			$this->options['repo-meta-api-user-id'] = '';
+		}
+
+		// This can be an empty string, set to empty if null.
+		if ( null === $this->options['repo-meta-api-access-token'] ) {
+			$this->options['repo-meta-api-access-token'] = '';
+		}
 	}
 
 	protected function tearDown(): void {
@@ -186,7 +196,7 @@ public function testSupportLevelSet2() {
 			0,
 			$support_labels_cnt
 		);
-	
+
 		/*
 		 * Attempt to set support level label.
 		 */