Merge pull request #331 from lloc/refactoring-version-2-8

Tests added

Author: lloc

includes/MslsMetaBox.php

@@ -270,7 +270,7 @@ public function render_options( $type, $msls_id ): string {
 	 *
 	 * @return string
 	 */
-	public function render_option( str $post_id, $msls_id ) {
+	public function render_option( $post_id, $msls_id ) {
 		return sprintf(
 			'<option value="%s" %s>%s</option>',
 			$post_id,

tests/phpunit/TestMslsTaxonomy.php

@@ -3,6 +3,7 @@
 namespace lloc\MslsTests;
 
 use Brain\Monkey\Functions;
+use lloc\Msls\MslsFields;
 use lloc\Msls\MslsOptions;
 use lloc\Msls\MslsTaxonomy;
 
@@ -20,11 +21,8 @@ public function get_test( bool $exluded = false ): MslsTaxonomy {
 		$options->shouldReceive( 'is_excluded' )->andReturn( $exluded );
 
 		Functions\expect( 'msls_options' )->zeroOrMoreTimes()->andReturn( $options );
-
 		Functions\expect( 'apply_filters' )->atLeast()->once();
-
 		Functions\expect( 'get_taxonomies' )->atLeast()->once()->andReturn( array() );
-		Functions\expect( 'get_query_var' )->atLeast()->once()->with( 'taxonomy' )->andReturn( 'category' );
 
 		return new MslsTaxonomy();
 	}
@@ -37,27 +35,44 @@ public function test_acl_request_included(): void {
 
 		Functions\when( 'get_taxonomy' )->justReturn( $taxonomy );
 		Functions\when( 'current_user_can' )->justReturn( true );
+		Functions\expect( 'get_query_var' )->twice()->with( 'taxonomy' )->andReturn( 'category' );
 
 		$this->assertEquals( 'category', $this->get_test()->acl_request() );
 	}
 
 	public function test_acl_request_excluded(): void {
+		Functions\expect( 'get_query_var' )->once()->with( 'taxonomy' )->andReturn( 'category' );
 		$this->assertEquals( '', $this->get_test( true )->acl_request() );
 	}
 
 	public function test_get_post_type(): void {
+		Functions\expect( 'get_query_var' )->once()->with( 'taxonomy' )->andReturn( 'category' );
 		$this->assertEquals( '', $this->get_test()->get_post_type() );
 	}
 
 	public function test_is_post_type(): void {
+		Functions\expect( 'get_query_var' )->once()->with( 'taxonomy' )->andReturn( 'category' );
 		$this->assertFalse( $this->get_test()->is_post_type() );
 	}
 
 	public function test_is_taxonomy(): void {
+		Functions\expect( 'get_query_var' )->once()->with( 'taxonomy' )->andReturn( 'category' );
 		$this->assertTrue( $this->get_test()->is_taxonomy() );
 	}
 
-	public function test_get_request(): void {
+	public function test_get_request_empty(): void {
+		Functions\expect( 'get_query_var' )->twice()->with( 'taxonomy' )->andReturn( 'category' );
+		Functions\expect( 'filter_has_var' )->twice()->with( INPUT_GET, MslsFields::FIELD_TAXONOMY )->andReturn( false );
+
 		$this->assertEquals( 'category', $this->get_test()->get_request() );
 	}
+
+	public function test_get_request_not_empty(): void {
+		$taxonomy = 'a_random_taxonomy';
+
+		Functions\expect( 'filter_has_var' )->twice()->with( INPUT_GET, MslsFields::FIELD_TAXONOMY )->andReturn( true );
+		Functions\expect( 'filter_input' )->twice()->with( INPUT_GET, MslsFields::FIELD_TAXONOMY, FILTER_SANITIZE_FULL_SPECIAL_CHARS )->andReturn( $taxonomy );
+
+		$this->assertEquals( $taxonomy, $this->get_test()->get_request() );
+	}
 }