Fixing tests so that they pass.

Author: msaari

tests/test-indexing.php

@@ -255,23 +255,14 @@ public function test_index_taxonomy_terms() {
 		wp_set_post_terms( $post_id, $cat_ids, 'category', true );
 		wp_set_post_terms( $post_id, array( 'foo', 'bar', 'baz' ), 'post_tag', true );
 		wp_set_post_terms( $post_id, array( 'scifi', 'fantasy', 'detective' ), 'genre', true );
-
 		$tag_array['tag'] = 1;
-		if ( RELEVANSSI_PREMIUM ) {
-			$tag_array['taxonomy_detail'] = '{"post_tag":1}';
-		}
+		$tag_array['taxonomy_detail'] = '{"post_tag":1}';
 		$cat_array['category'] = 1;
-		if ( RELEVANSSI_PREMIUM ) {
-			$cat_array['taxonomy_detail'] = '{"category":1}';
-		}
+		$cat_array['taxonomy_detail'] = '{"category":1}';
 		$genre_array_pre['taxonomy'] = 1;
-		if ( RELEVANSSI_PREMIUM ) {
-			$genre_array_pre['taxonomy_detail'] = '{"genre":1}';
-		}
+		$genre_array_pre['taxonomy_detail'] = '{"genre":1}';
 		$genre_array_post['taxonomy'] = 2;
-		if ( RELEVANSSI_PREMIUM ) {
-			$genre_array_post['taxonomy_detail'] = '{"genre":2}';
-		}
+		$genre_array_post['taxonomy_detail'] = '{"genre":2}';
 
 		$this->assertEquals(
 			array(

tests/test-searching.php

@@ -1958,34 +1958,36 @@ public function test_compile_search_args() {
 			'date_query is not interpreted correctly.'
 		);
 
-		$args = array(
-			's'        => 'content',
-			'operator' => 'or',
-		);
+		if ( RELEVANSSI_PREMIUM ) {
+			$args = array(
+				's'        => 'content',
+				'operator' => 'or',
+			);
 
-		$query->parse_query( $args );
-		$search_params = relevanssi_compile_search_args( $query, $args['s'] );
+			$query->parse_query( $args );
+			$search_params = relevanssi_compile_search_args( $query, $args['s'] );
 
-		$this->assertEquals(
-			'OR',
-			$search_params['operator'],
-			'operator is not interpreted correctly.'
-		);
+			$this->assertEquals(
+				'OR',
+				$search_params['operator'],
+				'operator is not interpreted correctly.'
+			);
 
-		update_option( 'relevanssi_implicit_operator', 'AND' );
-		$args = array(
-			's'        => 'content',
-			'operator' => 'smooth',
-		);
+			update_option( 'relevanssi_implicit_operator', 'AND' );
+			$args = array(
+				's'        => 'content',
+				'operator' => 'smooth',
+			);
 
-		$query->parse_query( $args );
-		$search_params = relevanssi_compile_search_args( $query, $args['s'] );
+			$query->parse_query( $args );
+			$search_params = relevanssi_compile_search_args( $query, $args['s'] );
 
-		$this->assertEquals(
-			'AND',
-			$search_params['operator'],
-			'operator is not interpreted correctly.'
-		);
+			$this->assertEquals(
+				'AND',
+				$search_params['operator'],
+				'operator is not interpreted correctly.'
+			);
+		}
 
 		$args = array(
 			's'                       => 'content',