Merge branch '3.4.0' of https://github.com/codeinwp/visualizer into issue-214

Author: contactashish13

.distignore

@@ -20,4 +20,8 @@ composer.lock
 package-lock.json
 key.enc
 vendor/phpoffice/phpexcel/Examples
-vendor/phpoffice/phpexcel/unitTests
+vendor/phpoffice/phpexcel/unitTests
+cypress
+docker-compose.travis.yml
+cypress.env.json.template
+cypress.json

.gitignore

@@ -7,3 +7,7 @@ vendor
 composer.lock
 bin/
 package-lock.json
+cypress/integration/examples
+cypress/integration/localhost*
+cypress/plugins
+cypress.env.json

.travis.yml

@@ -1,6 +1,8 @@
 language: php
 sudo: false
 dist: trusty
+services:
+    - docker
 matrix:
   fast_finish: true
   include:
@@ -14,6 +16,14 @@ matrix:
       before_script: chmod +x bin/wraith.sh
       env: TEST_SUITE=Wraith_Visual_Regression_Testing WRAITH_FAIL=5
       script: "./bin/wraith.sh"
+    - name: Cypress
+      if: branch = development
+      language: node_js
+      node_js:
+        - 10.8
+      script:
+        - docker-compose -f docker-compose.travis.yml up -d
+        - chmod +x ./bin/run-e2e-tests.sh ./bin/wp-init.sh && ./bin/wp-init.sh && ./bin/run-e2e-tests.sh
   allow_failures:
     - env: TEST_SUITE=Wraith_Visual_Regression_Testing WRAITH_FAIL=5
 branches:

Gruntfile.js

@@ -7,6 +7,7 @@ module.exports = function (grunt) {
 	var loader = require( 'load-project-config' ),
 		config = require( 'grunt-plugin-fleet' );
 	config = config();
+	config.files.js.push( '!cypress/**/*.js' );
 	// jshint ignore: start
 	config.taskMap['faq_builder'] = 'grunt-helpscout-faq';
 	// jshint ignore: end

bin/kill-and-create-all.sh

@@ -0,0 +1,12 @@
+# to be executed from the plugin main directory (visualizer-pro)
+docker kill $(docker ps -q)
+docker system prune -a
+
+windows=`echo $OSTYPE | grep -i -e "win" -e "msys" -e "cygw" | wc -l`
+if [[ $windows -gt 0 ]]; then
+    docker-machine start default
+fi
+
+docker-compose -f docker-compose.travis.yml up -d
+./bin/wp-init.sh
+./bin/run-e2e-tests.sh

bin/mysql/init-db.sql

@@ -0,0 +1 @@
+grant all privileges on *.* to 'wordpress'@'%' identified by 'wordpress';

bin/run-e2e-tests.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+if [[ "$TRAVIS" == "true" ]]; then
+    npm install --only=dev --prefix ./cypress/
+    composer install --no-dev
+fi
+
+wp_host='localhost'
+windows=`echo $OSTYPE | grep -i -e "win" -e "msys" -e "cygw" | wc -l`
+args='-it';
+if [[ $windows -gt 0 ]]; then
+    wp_host=`docker-machine ip`
+    args=''
+fi
+
+# exit on error
+set -e
+
+export CYPRESS_HOST=$wp_host
+
+# test free - lifecycle
+export CYPRESS_SPEC_TO_RUN="free-lifecycle.js"
+npm run cypress:run
+
+# test free - sources
+export CYPRESS_SPEC_TO_RUN="free-sources.js"
+npm run cypress:run

bin/wp-init.sh

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+
+# if on windows, find out the IP using `docker-machine ip` and provide the IP as the host.
+wp_host='localhost'
+windows=`echo $OSTYPE | grep -i -e "win" -e "msys" -e "cygw" | wc -l`
+args='-it';
+if [[ $windows -gt 0 ]]; then
+    wp_host=`docker-machine ip`
+    args=''
+fi
+
+# sleep for sometime till WP initializes successfully
+sleep_time=15
+if [[ $windows -gt 0 ]]; then
+    sleep_time=30
+fi
+echo "Sleeping for $sleep_time..."
+sleep $sleep_time
+
+# install WP
+docker exec $args visualizer_wordpress wp --quiet core install --url="http://$wp_host:8888/" --admin_user="wordpress" --admin_password="wordpress" --admin_email="[email protected]" --title="test" --skip-email
+
+# install required external plugins
+docker exec $args visualizer_wordpress chown -R www-data:www-data /var/www/html/
+docker exec $args visualizer_wordpress wp plugin install classic-editor --activate
+
+# so that debug.log is created
+docker exec $args visualizer_wordpress chmod 0777 -R /var/www/html/wp-content
+
+# install visualizer free
+docker exec $args visualizer_wordpress git clone https://github.com/Codeinwp/visualizer /var/www/html/wp-content/plugins/visualizer
+
+# activate
+docker exec $args visualizer_wordpress wp --quiet plugin activate visualizer
+
+# set this constant so that the license is not checked
+docker exec $args visualizer_wordpress wp --quiet config set TI_UNIT_TESTING true --raw
+
+# set this constant so that the specific hooks are loaded
+docker exec $args visualizer_wordpress wp --quiet config set TI_CYPRESS_TESTING true --raw
+
+# debugging
+docker exec $args visualizer_wordpress wp --quiet config set WP_DEBUG true --raw
+docker exec $args visualizer_wordpress wp --quiet config set WP_DEBUG_LOG true --raw
+docker exec $args visualizer_wordpress wp --quiet config set WP_DEBUG_DISPLAY false --raw
+

classes/Visualizer/Module.php

@@ -67,9 +67,24 @@ public function __construct( Visualizer_Plugin $plugin ) {
 		$this->_addFilter( Visualizer_Plugin::FILTER_UNDO_REVISIONS, 'undoRevisions', 10, 2 );
 		$this->_addFilter( Visualizer_Plugin::FILTER_HANDLE_REVISIONS, 'handleExistingRevisions', 10, 2 );
 		$this->_addFilter( Visualizer_Plugin::FILTER_GET_CHART_DATA_AS, 'getDataAs', 10, 3 );
+		register_shutdown_function( array($this, 'onShutdown') );
 
 	}
 
+	/**
+	 * Register a shutdown hook to catch fatal errors.
+	 *
+	 * @since ?
+	 *
+	 * @access public
+	 */
+	public function onShutdown() {
+		$error = error_get_last();
+		if ( $error['type'] === E_ERROR && false !== strpos( $error['file'], 'Visualizer/' ) ) {
+			do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Critical error %s', print_r( $error, true ) ), 'error', __FILE__, __LINE__ );
+		}
+	}
+
 	/**
 	 * Registers an action hook.
 	 *
@@ -640,4 +655,16 @@ public static function is_pro_older_than( $version ) {
 		return version_compare( VISUALIZER_PRO_VERSION, $version, '<' );
 	}
 
+	/**
+	 * Gets the features for the provided license type.
+	 */
+	public static final function get_features_for_license( $plan ) {
+		switch ( $plan ) {
+			case 1:
+				return array( 'import-wp', 'db-query' );
+			case 2:
+				return array( 'schedule-chart', 'chart-permissions' );
+		}
+	}
+
 }

classes/Visualizer/Module/Admin.php

@@ -68,9 +68,67 @@ public function __construct( Visualizer_Plugin $plugin ) {
 		$this->_addAction( '_wp_put_post_revision', 'addRevision', null, 10, 1 );
 		$this->_addAction( 'wp_restore_post_revision', 'restoreRevision', null, 10, 2 );
 
+		$this->_addAction( 'visualizer_chart_schedules_spl', 'addSplChartSchedules', null, 10, 3 );
+
 		$this->_addAction( 'admin_init', 'init' );
 	}
 
+
+	/**
+	 * Add disabled `optgroup` schedules to the drop downs.
+	 *
+	 * @since ?
+	 *
+	 * @access public
+	 *
+	 * @param string $feature The feature for which to add schedules.
+	 * @param int    $chart_id The chart ID.
+	 * @param int    $plan The plan number.
+	 */
+	public function addSplChartSchedules( $feature, $chart_id, $plan ) {
+		if ( apply_filters( 'visualizer_is_business', false ) ) {
+			return;
+		}
+
+		$license = __( 'PRO', 'visualizer' );
+		switch ( $plan ) {
+			case 2:
+				$license = __( 'Developer', 'visualizer' );
+				break;
+		}
+
+		$hours = array(
+			'0' => __( 'Live', 'visualizer' ),
+			'1'  => __( 'Each hour', 'visualizer' ),
+			'12' => __( 'Each 12 hours', 'visualizer' ),
+			'24' => __( 'Each day', 'visualizer' ),
+			'72' => __( 'Each 3 days', 'visualizer' ),
+		);
+
+		switch ( $feature ) {
+			case 'json':
+				// no more schedules if pro is already active.
+				if ( Visualizer_Module::is_pro() ) {
+					return;
+				}
+				break;
+			case 'wp':
+				// fall-through.
+			case 'db':
+				// fall-through.
+			case 'csv':
+				break;
+			default:
+				return;
+		}
+
+		echo '<optgroup disabled label="' . sprintf( __( 'More in the %s version', 'visualizer' ), $license ) . '">';
+		foreach ( $hours as $hour => $desc ) {
+			echo '<option disabled>' . $desc . '</option>';
+		}
+		echo '</optgroup>';
+	}
+
 	/**
 	 * No limits on revisions.
 	 */
@@ -726,7 +784,10 @@ public function renderLibraryPage() {
 				$settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
 			}
 
-			unset( $settings['height'], $settings['width'], $settings['chartArea'] );
+			if ( $settings ) {
+				unset( $settings['height'], $settings['width'], $settings['chartArea'] );
+			}
+
 			$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
 			$data   = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );