Ensure no errors on CPTs without Yoast SEO metabox

inc/class-ac-yoast-acf-content-analysis.php

@@ -14,6 +14,10 @@ class AC_Yoast_SEO_ACF_Content_Analysis {
 	 */
 	public function init() {
 		add_action( 'admin_init', array( $this, 'admin_init' ) );
+
+		if ( $this->is_dev_environment() ) {
+			add_action( 'init', array( $this, 'add_cpt_for_tests' ) );
+		}
 	}
 
 	/**
@@ -30,7 +34,7 @@ public function admin_init() {
 
 		$this->boot();
 
-		if ( defined( 'AC_YOAST_ACF_ANALYSIS_ENVIRONMENT' ) && 'development' === AC_YOAST_ACF_ANALYSIS_ENVIRONMENT ) {
+		if ( $this->is_dev_environment() ) {
 			$this->boot_dev();
 		}
 
@@ -92,7 +96,7 @@ public function boot_dev() {
 	protected function register_config_filters() {
 		add_filter(
 			Yoast_ACF_Analysis_Facade::get_filter_name( 'scraper_config' ),
-			array( $this, 'filter_scraper_config')
+			array( $this, 'filter_scraper_config' )
 		);
 	}
 
@@ -223,4 +227,20 @@ protected function get_blacklist_type() {
 	protected function get_blacklist_name() {
 		return new Yoast_ACF_Analysis_String_Store();
 	}
+
+	/**
+	 * Adds a CPT for tests
+	 */
+	public function add_cpt_for_tests() {
+		require_once AC_SEO_ACF_ANALYSIS_PLUGIN_PATH . '/tests/js/system/data/cpt-non-public.php';
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	protected function is_dev_environment() {
+		return ( defined( 'AC_YOAST_ACF_ANALYSIS_ENVIRONMENT' ) && 'development' === AC_YOAST_ACF_ANALYSIS_ENVIRONMENT );
+	}
+
 }

tests/js/system/data/acf4.php

@@ -100,4 +100,42 @@
 		),
 		'menu_order' => 0,
 	));
+
+	register_field_group(array (
+		'id' => 'acf_non-public-cpt',
+		'title' => 'Non Public CPT',
+		'fields' => array (
+			array (
+				'key' => 'field_59e897a8755dc',
+				'label' => 'Text',
+				'name' => 'yoast_acf_analysis_text',
+				'type' => 'text',
+				'default_value' => '',
+				'placeholder' => '',
+				'prepend' => '',
+				'append' => '',
+				'formatting' => 'html',
+				'maxlength' => '',
+			),
+		),
+		'location' => array (
+			array (
+				array (
+					'param' => 'post_type',
+					'operator' => '==',
+					'value' => 'test_non_public_cpt',
+					'order_no' => 0,
+					'group_no' => 0,
+				),
+			),
+		),
+		'options' => array (
+			'position' => 'normal',
+			'layout' => 'no_box',
+			'hide_on_screen' => array (
+			),
+		),
+		'menu_order' => 0,
+	));
+
 }

tests/js/system/data/acf5.php

@@ -336,4 +336,50 @@
 		'description' => '',
 	));
 
+	acf_add_local_field_group(array (
+		'key' => 'group_59e89863c6498',
+		'title' => 'Non Public CPT',
+		'fields' => array (
+			array (
+				'key' => 'field_59e897a8755dc',
+				'label' => 'Text',
+				'name' => 'yoast_acf_analysis_text',
+				'type' => 'text',
+				'value' => NULL,
+				'instructions' => '',
+				'required' => 0,
+				'conditional_logic' => 0,
+				'wrapper' => array (
+					'width' => '',
+					'class' => '',
+					'id' => '',
+				),
+				'default_value' => '',
+				'placeholder' => '',
+				'prepend' => '',
+				'append' => '',
+				'formatting' => 'html',
+				'maxlength' => '',
+			),
+		),
+		'location' => array (
+			array (
+				array (
+					'param' => 'post_type',
+					'operator' => '==',
+					'value' => 'test_non_public_cpt',
+				),
+			),
+		),
+		'menu_order' => 0,
+		'position' => 'normal',
+		'style' => 'seamless',
+		'label_placement' => 'top',
+		'instruction_placement' => 'label',
+		'hide_on_screen' => array (
+		),
+		'active' => 1,
+		'description' => '',
+	));
+
 endif;

tests/js/system/data/cpt-non-public.php

@@ -0,0 +1,9 @@
+<?php
+$args = array(
+	'public' => false,
+	'show_ui' => true,
+	'supports' => array( 'thumbnail' ),
+	'label'  => 'Non Public CPT',
+);
+
+register_post_type( 'test_non_public_cpt', $args );

tests/js/system/pages/WordPressHelper.js

@@ -27,8 +27,12 @@ module.exports = {
                 this.click('@submitButton');
                 return this.waitForElementVisible('#adminmenu #menu-dashboard .current', 15000);
             },
-            newPost: function(){
-                this.api.url( this.api.launchUrl + '/wp/wp-admin/post-new.php' );
+            newPost: function(cpt){
+                if(cpt  !== undefined){
+                    cpt = '?post_type=' + cpt;
+                }
+                cpt = cpt || '';
+                this.api.url( this.api.launchUrl + '/wp/wp-admin/post-new.php' + cpt );
                 this.waitForElementVisible('body.post-new-php', 15000);
 
                 return this.api.execute(function() {

tests/js/system/tests/general/cpt.js

@@ -0,0 +1,38 @@
+var simpleField = require('../../helpers/simpleField');
+var Logger = require('nightwatch/lib/util/logger.js');
+
+module.exports = {
+    tags: ['acf4', 'acf5', 'cpt'],
+
+    before: function (browser) {
+        var page = browser.page.WordPressHelper();
+        page.newPost('test_non_public_cpt');
+    },
+
+    beforeEach: function (browser) {
+    },
+
+    'Custom Post Type (non public->no metabox)' : function (browser) {
+        browser.getLog('browser', function(logEntriesArray) {
+
+            var errors = logEntriesArray.filter(function(log){
+                return log.level === 'SEVERE';
+            });
+
+            browser.assert.ok( errors.length === 0, "No JS errors thrown." )
+
+            var warnings = logEntriesArray.filter(function(log){
+                return log.level === 'WARNING';
+            });
+
+            warnings.forEach(function(log){
+                console.log(Logger.colors.light_purple('   WARNING: ' + log.message));
+            });
+
+        });
+    },
+
+    after : function(browser) {
+        browser.end();
+    }
+};