Merge pull request #3508 from CalderaWP/develop

1.8.11

.gitlab-ci.yml

@@ -46,7 +46,6 @@ WP-Integration:
     - phpunit --configuration phpunit-integration.xml.dist
   before_script:
     # Install dependencies
-
     # update the docker
     - apt-get clean
     - apt-get -yqq update

assets/js/caldera-forms-front.js

@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.8.10 - 2020-02-11 */var resBaldrickTriggers;
+/*! GENERATED SOURCE FILE caldera-forms - v1.8.11 - 2020-03-09 */var resBaldrickTriggers;
 
 jQuery(function($){
 	function fieldErrors(fields, $form, $notice) {

assets/js/edit.js

@@ -1173,7 +1173,7 @@ jQuery(document).ready(function($){
             fieldtype.push('vars');
             for( var ft = 0; ft < fieldtype.length; ft++){
                 for( var tp in system_values ){
-                    if(typeof system_values[tp].tags === 'undefined' || typeof system_values[tp].tags[fieldtype[ft]] === 'undefined'){
+                    if( ! system_values[tp] || typeof system_values[tp].tags === 'undefined' || typeof system_values[tp].tags[fieldtype[ft]] === 'undefined'){
                         continue;
                     }
 

assets/js/entry-viewer-2.js

@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.8.10 - 2020-02-11 *//**
+/*! GENERATED SOURCE FILE caldera-forms - v1.8.11 - 2020-03-09 *//**
  * API Client for Caldera Forms API for a single form
  *
  * @since 1.5.0

assets/js/parsley.min.js

@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.8.10 - 2020-02-11 *//*!
+/*! GENERATED SOURCE FILE caldera-forms - v1.8.11 - 2020-03-09 *//*!
 * Parsley.js
 * Version 2.8.1 - built Sat, Feb 3rd 2018, 2:27 pm
 * http://parsleyjs.org

assets/js/vue.js

@@ -1,4 +1,4 @@
-/*! GENERATED SOURCE FILE caldera-forms - v1.8.10 - 2020-02-11 *//*!
+/*! GENERATED SOURCE FILE caldera-forms - v1.8.11 - 2020-03-09 *//*!
  * Vue.js v2.1.6
  * (c) 2014-2016 Evan You
  * Released under the MIT License.

caldera-core.php

@@ -4,7 +4,7 @@
   Plugin URI: https://CalderaForms.com
   Description: Easy to use, grid based responsive form builder for creating simple to complex forms.
   Author: Caldera Labs
-  Version: 1.8.10
+  Version: 1.8.11
   Author URI: http://CalderaLabs.org
   Text Domain: caldera-forms
   GitHub Plugin URI: https://github.com/CalderaWP/caldera-forms
@@ -60,7 +60,7 @@ function caldera_forms_wp_version_nag(){
 } else {
 	define('CFCORE_PATH', plugin_dir_path(__FILE__));
 	define('CFCORE_URL', plugin_dir_url(__FILE__));
-	define( 'CFCORE_VER', '1.8.10' );
+	define( 'CFCORE_VER', '1.8.11' );
 	define('CFCORE_EXTEND_URL', 'https://api.calderaforms.com/1.0/');
 	define('CFCORE_BASENAME', plugin_basename(__FILE__));
 

clients/admin/build/index.min.asset.json

@@ -1 +1 @@
-{"dependencies":["jquery","react","react-dom","wp-components","wp-dom-ready","wp-element","wp-i18n","wp-polyfill"],"version":"852eefe4086634e145d86a175c32d7e8"}
+{"dependencies":["jquery","react","react-dom","wp-components","wp-dom-ready","wp-element","wp-i18n","wp-polyfill"],"version":"7cdf48aa0e8ca51d553e7adeccacfefa"}

clients/admin/build/index.min.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '852eefe4086634e145d86a175c32d7e8');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '7cdf48aa0e8ca51d553e7adeccacfefa');

clients/blocks/build/index.min.asset.json

@@ -1 +1 @@
-{"dependencies":["react","wp-components","wp-data","wp-i18n","wp-polyfill"],"version":"0df9e23548d517224e54926c3b0957b1"}
+{"dependencies":["react","wp-components","wp-data","wp-i18n","wp-polyfill"],"version":"458c0e245f93cdd7eb6deb70947c0f53"}

clients/privacy/build/index.min.asset.json

@@ -1 +1 @@
-{"dependencies":["react","react-dom","wp-data","wp-polyfill"],"version":"511f1f3662f04c6ba8cfc60741fb14fe"}
+{"dependencies":["react","react-dom","wp-data","wp-polyfill"],"version":"b6a79bfd1cfcbd1a031f167ecee2458c"}

clients/privacy/build/index.min.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '511f1f3662f04c6ba8cfc60741fb14fe');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => 'b6a79bfd1cfcbd1a031f167ecee2458c');

clients/render/build/index.min.asset.json

@@ -1 +1 @@
-{"dependencies":["react","react-dom","wp-dom-ready","wp-polyfill"],"version":"379d5c8585563d50190a8b2b126f7265"}
+{"dependencies":["react","react-dom","wp-dom-ready","wp-polyfill"],"version":"3d9bc917ef8bf618aa9dd5fdda368bbe"}

clients/render/build/index.min.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-polyfill'), 'version' => '379d5c8585563d50190a8b2b126f7265');
+<?php return array('dependencies' => array('wp-polyfill'), 'version' => '3d9bc917ef8bf618aa9dd5fdda368bbe');

composer.json

@@ -34,7 +34,8 @@
         "composer/installers": "^1.6",
         "a5hleyrich/wp-queue": "^1.3",
         "symfony/translation": "~3.0",
-        "mossadal/math-parser": "^1.3"
+        "mossadal/math-parser": "^1.3",
+        "pimple/pimple": "3.2.*"
     },
     "autoload": {
         "psr-4": {

cypress/integration/processors-conditionals.test.js

@@ -0,0 +1,22 @@
+import {
+    login,
+    visitFormEditor
+} from '../support/util';
+
+const formId = 'CF5bc25738c82c2';
+
+/**
+ * Tests for when conditions are hide type
+ */
+describe('Conditionals - hide type - text fields', () => {
+	before(() => login() );
+	beforeEach(() => {
+		visitFormEditor( formId )
+	});
+
+
+	it('Add a condition line in a processors conditional group', () => {
+
+    });
+
+});

cypress/integration/test-editor-basic.test.js

@@ -48,16 +48,22 @@ describe( 'Basic editing of form',  () => {
 		cy.get( '.processor-form_redirect' ).should('be.visible');
 	});
 
-
-
-
 	it( 'Can add a processor', () => {
 		cfGoToProcessorsTab();
 		const processorType = 'auto_responder';
 		cfAddProcessor(processorType);
 		cy.get( '.active-processors-list').children().should('have.length', 2);
 	});
 
+	it( 'Can add a second condition line in a processors conditional group', () => {
+		cfGoToProcessorsTab();
+		cy.get('.caldera-processor-nav:first-child').click();
+		cy.get('a[href="#fp_6427173_conditions_pane"]').click();
+		cy.get('.caldera-editor-processor-config .caldera-conditionals-wrapper > .caldera-condition-group > .caldera-condition-lines .caldera-condition-line').should('have.length', 2);
+		cy.get('.caldera-editor-processor-config .caldera-condition-group > button').first().click();
+		cy.get('.caldera-editor-processor-config .caldera-conditionals-wrapper > .caldera-condition-group > .caldera-condition-lines .caldera-condition-line').should('have.length', 3);
+	});
+
 	it.skip( 'Page nav', () => {
 		cy.get('button[data-name="Page 1"]').should( 'have.class', 'button-primary');
 		cy.get('button[data-name="Page 2"]').not( 'have.class', 'button-primary');

package.json

@@ -1,6 +1,6 @@
 {
   "name": "caldera-forms",
-  "version": "1.8.10",
+  "version": "1.8.11",
   "description": "Apex WordPress Forms",
   "main": "Gruntfile.js",
   "repository": {