Update tests

tests/unit/builders/indexable-author-builder-test.php

@@ -15,8 +15,8 @@
 /**
  * Class Indexable_Author_Test.
  *
- * @group indexables
- * @group builders
+ * @group  indexables
+ * @group  builders
  *
  * @coversDefaultClass \Yoast\WP\SEO\Builders\Indexable_Author_Builder
  * @covers \Yoast\WP\SEO\Builders\Indexable_Author_Builder
@@ -54,7 +54,7 @@ class Indexable_Author_Builder_Test extends TestCase {
  /**
  * The wpdb instance
  *
- * @var wpdb|Mockery\MockInterface
+ * @var \wpdb|Mockery\MockInterface
  */
  protected $wpdb;
 
@@ -95,7 +95,6 @@ protected function set_up() {
  $this->indexable_mock->orm->expects( 'set' )->with( 'twitter_image_source', null );
 
  $this->indexable_mock->orm->expects( 'set' )->with( 'is_public', null );
- $this->indexable_mock->orm->expects( 'set' )->with( 'has_public_posts', true );
 
  $this->indexable_mock->orm->expects( 'get' )->with( 'is_robots_noindex' )->andReturn( 0 );
 
@@ -104,9 +103,8 @@ protected function set_up() {
 
  $this->author_archive = Mockery::mock( Author_Archive_Helper::class );
  $this->author_archive
- ->expects( 'author_has_public_posts' )
- ->with( 1 )
- ->andReturn( true );
+ ->expects( 'get_author_archive_post_types' )
+ ->andReturn( [ 'post', 'my-cpt' ] );
 
  $this->versions = Mockery::mock( Indexable_Builder_Versions::class );
  $this->versions
@@ -115,9 +113,35 @@ protected function set_up() {
  ->andReturn( 2 );
 
  $this->post_helper = Mockery::mock( Post_Helper::class );
+ $this->post_helper->expects( 'get_public_post_statuses' )->once()->andReturn( [ 'publish' ] );
+
  $this->wpdb = Mockery::mock( 'wpdb' );
  $this->wpdb->posts = 'wp_posts';
 
+ $this->wpdb->expects( 'prepare' )->with(
+ "
+ SELECT 
+ COUNT(p.ID) as number_of_public_posts,
+ MAX(p.post_modified_gmt) AS most_recent_last_modified,
+ MIN(p.post_date_gmt) AS first_published_at
+ FROM {$this->wpdb->posts} AS p
+ WHERE p.post_status IN (%s)
+ AND p.post_password = ''
+ AND p.post_author = %d
+ AND p.post_type IN (%s, %s)
+ ", ['publish', 1, 'post', 'my-cpt']
+ )->andReturn( 'PREPARED_QUERY' );
+ $this->wpdb->expects( 'get_row' )->with( 'PREPARED_QUERY' )->andReturn(
+ (object) [
+ 'number_of_public_posts' => '7',
+ 'most_recent_last_modified' => '1234-12-12 23:59:59',
+ 'first_published_at'=>'1234-12-12 00:00:00',
+ ]
+ );
+
+ Monkey\Functions\expect( '_deprecated_argument' );
+ Monkey\Functions\expect( 'esc_html' );
+
  $this->instance = new Indexable_Author_Builder( $this->author_archive, $this->versions, $this->post_helper, $this->wpdb );
  }
 
@@ -137,39 +161,22 @@ public function test_build() {
  $this->indexable_mock->orm->expects( 'set' )->with( 'is_robots_noindex', true );
  $this->indexable_mock->orm->expects( 'set' )->with( 'version', 2 );
 
+ $this->indexable_mock->orm->expects( 'get' )->twice()->with( 'object_id' )->andReturn( 1 );
  $this->indexable_mock->orm->expects( 'get' )->once()->with( 'open_graph_image' );
  $this->indexable_mock->orm->expects( 'get' )->twice()->with( 'open_graph_image_id' );
  $this->indexable_mock->orm->expects( 'get' )->twice()->with( 'open_graph_image_source' );
  $this->indexable_mock->orm->expects( 'get' )->twice()->with( 'twitter_image' );
  $this->indexable_mock->orm->expects( 'get' )->times( 3 )->with( 'twitter_image_id' );
- $this->indexable_mock->orm->expects( 'get' )->with( 'object_id' );
+ $this->indexable_mock->orm->expects( 'get' )->once()->with( 'object_last_modified' );
 
  $this->indexable_mock->orm->expects( 'set' )->with( 'open_graph_image', 'avatar_image.jpg' );
  $this->indexable_mock->orm->expects( 'set' )->with( 'open_graph_image_source', 'gravatar-image' );
  $this->indexable_mock->orm->expects( 'set' )->with( 'twitter_image', 'avatar_image.jpg' );
  $this->indexable_mock->orm->expects( 'set' )->with( 'twitter_image_source', 'gravatar-image' );
 
- $this->post_helper->expects( 'get_public_post_statuses' )->once()->andReturn( [ 'publish' ] );
-
- $this->wpdb->expects( 'prepare' )->once()->with(
- "
- SELECT MAX(p.post_modified_gmt) AS last_modified, MIN(p.post_date_gmt) AS published_at
- FROM {$this->wpdb->posts} AS p
- WHERE p.post_status IN (%s)
- AND p.post_password = ''
- AND p.post_author = %d
- ",
- [ 'publish', 1 ]
- )->andReturn( 'PREPARED_QUERY' );
- $this->wpdb->expects( 'get_row' )->once()->with( 'PREPARED_QUERY' )->andReturn(
- (object) [
- 'last_modified' => '1234-12-12 00:00:00',
- 'published_at' => '1234-12-12 00:00:00',
- ]
- );
-
  $this->indexable_mock->orm->expects( 'set' )->with( 'object_published_at', '1234-12-12 00:00:00' );
- $this->indexable_mock->orm->expects( 'set' )->with( 'object_last_modified', '1234-12-12 00:00:00' );
+ $this->indexable_mock->orm->expects( 'set' )->with( 'object_last_modified', '1234-12-12 23:59:59' );
+ $this->indexable_mock->orm->expects( 'set' )->with( 'number_of_publicly_viewable_posts', '7' );
 
  Monkey\Functions\expect( 'get_avatar_url' )
  ->once()
@@ -193,39 +200,22 @@ public function test_build_without_alternative_image() {
  $this->indexable_mock->orm->expects( 'set' )->with( 'is_robots_noindex', true );
  $this->indexable_mock->orm->expects( 'set' )->with( 'version', 2 );
 
+ $this->indexable_mock->orm->expects( 'get' )->twice()->with( 'object_id' )->andReturn( 1 );
  $this->indexable_mock->orm->expects( 'get' )->once()->with( 'open_graph_image' );
  $this->indexable_mock->orm->expects( 'get' )->once()->with( 'open_graph_image_id' );
  $this->indexable_mock->orm->expects( 'get' )->once()->with( 'open_graph_image_source' );
  $this->indexable_mock->orm->expects( 'get' )->once()->with( 'twitter_image' );
  $this->indexable_mock->orm->expects( 'get' )->twice()->with( 'twitter_image_id' );
- $this->indexable_mock->orm->expects( 'get' )->twice()->with( 'object_id' );
-
- $this->post_helper->expects( 'get_public_post_statuses' )->once()->andReturn( [ 'publish' ] );
-
- $this->wpdb->expects( 'prepare' )->once()->with(
- "
- SELECT MAX(p.post_modified_gmt) AS last_modified, MIN(p.post_date_gmt) AS published_at
- FROM {$this->wpdb->posts} AS p
- WHERE p.post_status IN (%s)
- AND p.post_password = ''
- AND p.post_author = %d
- ",
- [ 'publish', 1 ]
- )->andReturn( 'PREPARED_QUERY' );
- $this->wpdb->expects( 'get_row' )->once()->with( 'PREPARED_QUERY' )->andReturn(
- (object) [
- 'last_modified' => '1234-12-12 00:00:00',
- 'published_at' => '1234-12-12 00:00:00',
- ]
- );
+ $this->indexable_mock->orm->expects( 'get' )->once()->with( 'object_last_modified' );
 
  $this->indexable_mock->orm->expects( 'set' )->with( 'object_published_at', '1234-12-12 00:00:00' );
- $this->indexable_mock->orm->expects( 'set' )->with( 'object_last_modified', '1234-12-12 00:00:00' );
+ $this->indexable_mock->orm->expects( 'set' )->with( 'object_last_modified', '1234-12-12 23:59:59' );
+ $this->indexable_mock->orm->expects( 'set' )->with( 'number_of_publicly_viewable_posts', '7' );
 
  Monkey\Functions\expect( 'get_avatar_url' )
  ->once()
  ->with(
- $this->indexable_mock->object_id,
+ 1,
  [
  'size' => 500,
  'scheme' => 'https',
@@ -252,39 +242,22 @@ public function test_build_with_undefined_author_meta() {
  $this->indexable_mock->orm->expects( 'set' )->with( 'is_robots_noindex', false );
  $this->indexable_mock->orm->expects( 'set' )->with( 'version', 2 );
 
+ $this->indexable_mock->orm->expects( 'get' )->twice()->with( 'object_id' )->andReturn( 1 );
  $this->indexable_mock->orm->expects( 'get' )->once()->with( 'open_graph_image' );
  $this->indexable_mock->orm->expects( 'get' )->twice()->with( 'open_graph_image_id' );
  $this->indexable_mock->orm->expects( 'get' )->twice()->with( 'open_graph_image_source' );
  $this->indexable_mock->orm->expects( 'get' )->twice()->with( 'twitter_image' );
  $this->indexable_mock->orm->expects( 'get' )->times( 3 )->with( 'twitter_image_id' );
- $this->indexable_mock->orm->expects( 'get' )->with( 'object_id' );
+ $this->indexable_mock->orm->expects( 'get' )->once()->with( 'object_last_modified' );
 
  $this->indexable_mock->orm->expects( 'set' )->with( 'open_graph_image', 'avatar_image.jpg' );
  $this->indexable_mock->orm->expects( 'set' )->with( 'open_graph_image_source', 'gravatar-image' );
  $this->indexable_mock->orm->expects( 'set' )->with( 'twitter_image', 'avatar_image.jpg' );
  $this->indexable_mock->orm->expects( 'set' )->with( 'twitter_image_source', 'gravatar-image' );
 
- $this->post_helper->expects( 'get_public_post_statuses' )->once()->andReturn( [ 'publish' ] );
-
- $this->wpdb->expects( 'prepare' )->once()->with(
- "
- SELECT MAX(p.post_modified_gmt) AS last_modified, MIN(p.post_date_gmt) AS published_at
- FROM {$this->wpdb->posts} AS p
- WHERE p.post_status IN (%s)
- AND p.post_password = ''
- AND p.post_author = %d
- ",
- [ 'publish', 1 ]
- )->andReturn( 'PREPARED_QUERY' );
- $this->wpdb->expects( 'get_row' )->once()->with( 'PREPARED_QUERY' )->andReturn(
- (object) [
- 'last_modified' => '1234-12-12 00:00:00',
- 'published_at' => '1234-12-12 00:00:00',
- ]
- );
-
  $this->indexable_mock->orm->expects( 'set' )->with( 'object_published_at', '1234-12-12 00:00:00' );
- $this->indexable_mock->orm->expects( 'set' )->with( 'object_last_modified', '1234-12-12 00:00:00' );
+ $this->indexable_mock->orm->expects( 'set' )->with( 'object_last_modified', '1234-12-12 23:59:59' );
+ $this->indexable_mock->orm->expects( 'set' )->with( 'number_of_publicly_viewable_posts', '7' );
 
  Monkey\Functions\expect( 'get_avatar_url' )
  ->once()

tests/unit/builders/indexable-date-archive-builder-test.php

@@ -34,6 +34,7 @@ public function test_build() {
  $options_mock->expects( 'get' )->with( 'title-archive-wpseo' )->andReturn( 'date_archive_title' );
  $options_mock->expects( 'get' )->with( 'metadesc-archive-wpseo' )->andReturn( 'date_archive_meta_description' );
  $options_mock->expects( 'get' )->with( 'noindex-archive-wpseo' )->andReturn( false );
+ $options_mock->expects( 'get' )->with( 'disable-date' )->andReturn( false );
 
  $indexable_mock = Mockery::mock( Indexable::class );
  $indexable_mock->orm = Mockery::mock( ORM::class );
@@ -48,6 +49,10 @@ public function test_build() {
  $indexable_mock->orm->expects( 'set' )->with( 'blog_id', 1 );
  $indexable_mock->orm->expects( 'set' )->with( 'permalink', null );
  $indexable_mock->orm->expects( 'set' )->with( 'version', 1 );
+ $indexable_mock->orm->expects( 'set' )->with( 'is_publicly_viewable', 1 );
+
+ Functions\expect( '_deprecated_argument' );
+ Functions\expect( 'esc_html' );
 
  $builder = new Indexable_Date_Archive_Builder( $options_mock, new Indexable_Builder_Versions() );
  $builder->build( $indexable_mock );

tests/unit/builders/indexable-home-page-builder-test.php

@@ -4,6 +4,7 @@
 
 use Brain\Monkey;
 use Mockery;
+use wpdb;
 use WPSEO_Utils;
 use Yoast\WP\Lib\ORM;
 use Yoast\WP\SEO\Builders\Indexable_Home_Page_Builder;
@@ -20,13 +21,13 @@
 /**
  * Class Indexable_Author_Test.
  *
- * @group indexables
- * @group builders
+ * @group  indexables
+ * @group  builders
  *
  * @coversDefaultClass \Yoast\WP\SEO\Builders\Indexable_Author_Builder
  * @covers \Yoast\WP\SEO\Builders\Indexable_Home_Page_Builder
  *
- * @phpcs:disable Yoast.NamingConventions.ObjectNameDepth.MaxExceeded -- 5 words is fine.
+ * @phpcs :disable Yoast.NamingConventions.ObjectNameDepth.MaxExceeded -- 5 words is fine.
  */
 class Indexable_Home_Page_Builder_Test extends TestCase {
 
@@ -142,13 +143,13 @@ protected function set_up() {
  $this->indexable_mock->orm->expects( 'set' )->with( 'open_graph_description', 'home_og_description' );
  $this->indexable_mock->orm->expects( 'set' )->with( 'open_graph_image_source', null );
  $this->indexable_mock->orm->expects( 'set' )->with( 'open_graph_image_meta', null );
+ $this->indexable_mock->orm->expects( 'set' )->with( 'is_publicly_viewable', 1 );
  $this->indexable_mock->orm->expects( 'set' )->with( 'version', 2 );
 
  // Mock offsetExists.
  $this->indexable_mock->orm->expects( 'offsetExists' )->with( 'description' )->andReturn( true );
 
  // Mock Indexable ORM getters.
- $this->indexable_mock->orm->expects( 'get' )->with( 'description' )->andReturn( 'home_meta_description' );
  $this->indexable_mock->orm->expects( 'get' )->with( 'open_graph_image' )->andReturn( 'home_og_image' );
  $this->indexable_mock->orm->expects( 'get' )->with( 'open_graph_image_id' )->andReturn( 1337 )->twice();
 
@@ -200,6 +201,7 @@ public function test_build() {
  $this->options_mock->expects( 'get' )->with( 'metadesc-home-wpseo' )->andReturn( 'home_meta_description' );
 
  $this->indexable_mock->orm->expects( 'set' )->with( 'description', 'home_meta_description' );
+ $this->indexable_mock->orm->expects( 'get' )->with( 'description' )->andReturn( 'home_meta_description' );
 
  Monkey\Functions\expect( 'get_current_blog_id' )->once()->andReturn( 1 );
  $this->indexable_mock->orm->expects( 'set' )->with( 'blog_id', 1 );
@@ -208,7 +210,10 @@ public function test_build() {
 
  $this->wpdb->expects( 'prepare' )->once()->with(
  "
- SELECT MAX(p.post_modified_gmt) AS last_modified, MIN(p.post_date_gmt) AS published_at
+ SELECT 
+ COUNT(p.ID) as number_of_public_posts, 
+ MAX(p.post_modified_gmt) AS most_recent_last_modified, 
+ MIN(p.post_date_gmt) AS first_published_at 
  FROM {$this->wpdb->posts} AS p
  WHERE p.post_status IN (%s)
  AND p.post_password = ''
@@ -218,13 +223,15 @@ public function test_build() {
  )->andReturn( 'PREPARED_QUERY' );
  $this->wpdb->expects( 'get_row' )->once()->with( 'PREPARED_QUERY' )->andReturn(
  (object) [
- 'last_modified' => '1234-12-12 00:00:00',
- 'published_at' => '1234-12-12 00:00:00',
+ 'number_of_public_posts' => 20,
+ 'most_recent_last_modified' => '1234-12-12 23:59:59',
+ 'first_published_at' => '1234-12-12 00:00:00',
  ]
  );
 
  $this->indexable_mock->orm->expects( 'set' )->with( 'object_published_at', '1234-12-12 00:00:00' );
- $this->indexable_mock->orm->expects( 'set' )->with( 'object_last_modified', '1234-12-12 00:00:00' );
+ $this->indexable_mock->orm->expects( 'set' )->with( 'object_last_modified', '1234-12-12 23:59:59' );
+ $this->indexable_mock->orm->expects( 'set' )->with( 'number_of_publicly_viewable_posts', 20 );
 
  $this->instance->build( $this->indexable_mock );
  }
@@ -242,8 +249,12 @@ public function test_build_with_fallback_description() {
 
  // When no meta description is stored in the WP_Options...
  $this->options_mock->expects( 'get' )->with( 'metadesc-home-wpseo' )->andReturn( false );
+
  // We expect the description to be `false` in the ORM layer.
- $this->indexable_mock->orm->expects( 'set' )->with( 'description', false );
+ $this->indexable_mock->orm->expects( 'set' )->once()->with( 'description', false );
+ $this->indexable_mock->orm->expects( 'get' )->with( 'description' )->andReturn( false );
+ // Brainmonkey makes get_bloginfo( 'description' ) return 'description'.
+ $this->indexable_mock->orm->expects( 'set' )->once()->with( 'description', 'description' );
 
  Monkey\Functions\expect( 'get_current_blog_id' )->once()->andReturn( 1 );
  $this->indexable_mock->orm->expects( 'set' )->with( 'blog_id', 1 );
@@ -252,7 +263,10 @@ public function test_build_with_fallback_description() {
 
  $this->wpdb->expects( 'prepare' )->once()->with(
  "
- SELECT MAX(p.post_modified_gmt) AS last_modified, MIN(p.post_date_gmt) AS published_at
+ SELECT 
+ COUNT(p.ID) as number_of_public_posts, 
+ MAX(p.post_modified_gmt) AS most_recent_last_modified, 
+ MIN(p.post_date_gmt) AS first_published_at 
  FROM {$this->wpdb->posts} AS p
  WHERE p.post_status IN (%s)
  AND p.post_password = ''
@@ -262,13 +276,15 @@ public function test_build_with_fallback_description() {
  )->andReturn( 'PREPARED_QUERY' );
  $this->wpdb->expects( 'get_row' )->once()->with( 'PREPARED_QUERY' )->andReturn(
  (object) [
- 'last_modified' => '1234-12-12 00:00:00',
- 'published_at' => '1234-12-12 00:00:00',
+ 'number_of_public_posts' => 20,
+ 'most_recent_last_modified' => '1234-12-12 23:59:59',
+ 'first_published_at' => '1234-12-12 00:00:00',
  ]
  );
 
  $this->indexable_mock->orm->expects( 'set' )->with( 'object_published_at', '1234-12-12 00:00:00' );
- $this->indexable_mock->orm->expects( 'set' )->with( 'object_last_modified', '1234-12-12 00:00:00' );
+ $this->indexable_mock->orm->expects( 'set' )->with( 'object_last_modified', '1234-12-12 23:59:59' );
+ $this->indexable_mock->orm->expects( 'set' )->with( 'number_of_publicly_viewable_posts', 20 );
 
  $this->instance->build( $this->indexable_mock );
  }
@@ -280,6 +296,7 @@ public function test_build_open_graph_image_meta_data() {
  $this->options_mock->expects( 'get' )->with( 'metadesc-home-wpseo' )->andReturn( 'home_meta_description' );
 
  $this->indexable_mock->orm->expects( 'set' )->with( 'description', 'home_meta_description' );
+ $this->indexable_mock->orm->expects( 'get' )->with( 'description' )->andReturn( 'home_meta_description' );
 
  // Transform the image meta mock to JSON, since we expect that to be stored in the DB.
  $image_meta_mock_json = WPSEO_Utils::format_json_encode( $this->image_meta_mock );
@@ -295,7 +312,10 @@ public function test_build_open_graph_image_meta_data() {
 
  $this->wpdb->expects( 'prepare' )->once()->with(
  "
- SELECT MAX(p.post_modified_gmt) AS last_modified, MIN(p.post_date_gmt) AS published_at
+ SELECT 
+ COUNT(p.ID) as number_of_public_posts, 
+ MAX(p.post_modified_gmt) AS most_recent_last_modified, 
+ MIN(p.post_date_gmt) AS first_published_at 
  FROM {$this->wpdb->posts} AS p
  WHERE p.post_status IN (%s)
  AND p.post_password = ''
@@ -305,13 +325,15 @@ public function test_build_open_graph_image_meta_data() {
  )->andReturn( 'PREPARED_QUERY' );
  $this->wpdb->expects( 'get_row' )->once()->with( 'PREPARED_QUERY' )->andReturn(
  (object) [
- 'last_modified' => '1234-12-12 00:00:00',
- 'published_at' => '1234-12-12 00:00:00',
+ 'number_of_public_posts' => 20,
+ 'most_recent_last_modified' => '1234-12-12 23:59:59',
+ 'first_published_at' => '1234-12-12 00:00:00',
  ]
  );
 
  $this->indexable_mock->orm->expects( 'set' )->with( 'object_published_at', '1234-12-12 00:00:00' );
- $this->indexable_mock->orm->expects( 'set' )->with( 'object_last_modified', '1234-12-12 00:00:00' );
+ $this->indexable_mock->orm->expects( 'set' )->with( 'object_last_modified', '1234-12-12 23:59:59' );
+ $this->indexable_mock->orm->expects( 'set' )->with( 'number_of_publicly_viewable_posts', 20 );
 
  $this->instance->build( $this->indexable_mock );
  }