Merge branch 'development' into issue-627

Author: contactashish13

.gitignore

@@ -11,3 +11,4 @@ cypress/integration/examples
 cypress/integration/localhost*
 cypress/plugins
 cypress.env.json
+grunt

.travis.yml

@@ -18,12 +18,20 @@ matrix:
       env: TEST_SUITE=Wraith_Visual_Regression_Testing WRAITH_FAIL=5
       script: "./bin/wraith.sh"
     - name: Cypress
+      if: type IN (pull_request)
       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
+    - name: Cypress Gutenberg
+      language: node_js
+      node_js:
+        - 10.8
+      script:
+        - docker-compose -f docker-compose.travis.yml up -d
+        - chmod +x ./bin/run-e2e-tests-gutenberg.sh ./bin/wp-init.sh && ./bin/wp-init.sh && ./bin/run-e2e-tests-gutenberg.sh
   allow_failures:
     - env: TEST_SUITE=Wraith_Visual_Regression_Testing WRAITH_FAIL=5
 branches:

CHANGELOG.md

@@ -1,4 +1,18 @@
 
+ ### v3.4.0 - 2020-02-13 
+ **Changes:** 
+ * [Feat] Support for authentication for JSON import
+* [Feat] New chart type: Bubble
+* [Feat] Combine one-time import and schedule import into a single control for an online .csv file import
+* [Feat] Add support for annotations and other roles
+* [Feat] For every chart show the last updated date and any error that exists
+* [Feat] Tested up to WP 5.3
+* [Fix] When new data is imported using csv/url, the manual editor still show old data
+* [Fix] Having SCRIPT_DEBUG on causes issues in real time update of charts
+* [Fix] Table chart: Error appears when trying to import from JSON
+* [Fix] PHP Fatal error: Uncaught Error: Cannot unset string offsets
+* [Fix] Long responsive table can overflow on smaller screens
+ 
  ### v3.3.4 - 2019-11-15 
  **Changes:** 
  * Fix issue with table chart not loading in the block editor

bin/run-e2e-tests-gutenberg.sh

@@ -0,0 +1,23 @@
+#!/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
+
+docker exec $args visualizer_wordpress wp --quiet plugin deactivate classic-editor
+export CYPRESS_SPEC_TO_RUN="free-gutenberg.js"
+npm run cypress:run

bin/run-e2e-tests.sh

@@ -25,3 +25,4 @@ npm run cypress:run
 # test free - sources
 export CYPRESS_SPEC_TO_RUN="free-sources.js"
 npm run cypress:run
+

classes/Visualizer/Gutenberg/Block.php

@@ -102,6 +102,7 @@ public function enqueue_gutenberg_scripts() {
 			'charts'    => Visualizer_Module_Admin::_getChartTypesLocalized(),
 			'adminPage' => menu_page_url( 'visualizer', false ),
 			'sqlTable'  => $table_col_mapping,
+			'chartsPerPage' => defined( 'TI_CYPRESS_TESTING' ) ? 20 : 6,
 		);
 		wp_localize_script( 'visualizer-gutenberg-block', 'visualizerLocalize', $translation_array );