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

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/Admin.php

@@ -115,6 +115,8 @@ public function addSplChartSchedules( $feature, $chart_id, $plan ) {
 			case 'wp':
 				// fall-through.
 			case 'db':
+				// fall-through.
+			case 'csv':
 				break;
 			default:
 				return;

classes/Visualizer/Module/Chart.php

@@ -688,7 +688,7 @@ private function _handleDataAndSettingsPage() {
 			'visualizer',
 			array(
 				'l10n'   => array(
-					'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
+					'invalid_source' => esc_html__( 'You have entered an invalid URL. Please provide a valid URL.', 'visualizer' ),
 					'loading'       => esc_html__( 'Loading...', 'visualizer' ),
 					'json_error'    => esc_html__( 'An error occured in fetching data.', 'visualizer' ),
 					'select_columns'    => esc_html__( 'Please select a few columns to include in the chart.', 'visualizer' ),
@@ -1146,15 +1146,18 @@ private function _handleDataPage() {
 		$render        = new Visualizer_Render_Page_Data();
 		$render->chart = $this->_chart;
 		$render->type  = $data['type'];
-		unset( $data['settings']['width'], $data['settings']['height'], $data['settings']['chartArea'] );
+
+		if ( $data && $data['settings'] ) {
+			unset( $data['settings']['width'], $data['settings']['height'], $data['settings']['chartArea'] );
+		}
 		wp_enqueue_style( 'visualizer-frame' );
 		wp_enqueue_script( 'visualizer-render' );
 		wp_localize_script(
 			'visualizer-render',
 			'visualizer',
 			array(
 				'l10n'   => array(
-					'invalid_source' => esc_html__( 'You have entered invalid URL. Please, insert proper URL.', 'visualizer' ),
+					'invalid_source' => esc_html__( 'You have entered an invalid URL. Please provide a valid URL.', 'visualizer' ),
 					'loading'       => esc_html__( 'Loading...', 'visualizer' ),
 				),
 				'charts' => array(