Sync to master

.travis.yml

@@ -9,6 +9,7 @@ notifications:
 
 branches:
   only:
+    - /^v\d.*$/
     - master
     - develop
 
@@ -48,16 +49,16 @@ before_deploy:
   - curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli-nightly.phar > /tmp/wp-cli.phar
   - chmod +x /tmp/wp-cli.phar
   - export RELEASE_FOLDER=godaddy-email-marketing-sign-up-forms
-  - php /tmp/wp-cli.phar package install runcommand/dist-archive
+  - php /tmp/wp-cli.phar package install git@github.com:wp-cli/dist-archive-command.git
   - cp -r ${TRAVIS_BUILD_DIR} /tmp/${RELEASE_FOLDER}
   - mv /tmp/${RELEASE_FOLDER} ${TRAVIS_BUILD_DIR}
   - php /tmp/wp-cli.phar dist-archive ${RELEASE_FOLDER} ${TRAVIS_BUILD_DIR}/${RELEASE_FOLDER}.zip --format=zip --debug
 
 deploy:
   provider: releases
   api_key:
-    secure: jQMEnbE3F9zkrYn4WyPhDmw9ph+hs6gTY8kQyBYOA310PQkyyhKASG9i84R24DKiIUCuJhUiuVotGUCt5Y0fP/QjxwEET2IPYhhzL6lonoraGt2u0mJ9zQVJvajx+0J6auVKp9VIBucGLQPGPHECZO03cdmzYdQhLiaOhjf6vMedCLVimGu/2hDWEtQgfpZztNUMehRqDg7s8co8hlHMQa+E+mmmihRGjYjU7eMZUXF3izGFiOMKxlr9tRXNMafVwEyO/IAdeN0KZI6rYGSeegukVem+HwOTTc1ZIGS51Brr47tA46zEeWcNaPZalC35Kdfu3axNNpEWzX7AeyVJvr37klXK2Tffh9wZxGIW9mulHcvV0uOrI7d5ATEjcriMsA2tBiHaSfzQCyYcz2h7R3KiAskqXfUU9TkvhZiFjjfTWHlGTgASNsZecGa5geEnGZ/14vIAL7mfAMxi+zodviRVJ2eZdOGKXE/W5525bggD7qNrf2/upDJd8T7sma8YDpb5yuXavvQWI3dgaCSDOhDkzLTYFzwjNhiztd4YM8S/w2fqr7NmF+OqJtt7gOD5MpeGR97WbrejV3fsUSS4tirH2HddC7Xfs9dGXKusoD6Vm8TqR3w1ldok10KTnRs4LfT7XqX2Nz9nVYKh23Qr9UtmdwXRy/7mcHa8p8Mjzy8=
-  file: godaddy-email-marketing-sign-up-forms.zip
+    secure: QjszjdBVY4X6n4aIjJyfd31vGdkmzfF/m80GnU3/ZpHZFtBsNab2mx4ZMp/8ZUcFtxtvGU9oRub9Q5GkYWRWDVErjJQbuoz89AsXqSJHrturY1rjOEYUG5oh7Kyi/TqKj+4eR/iGBq4eHS+D90/MLIpRQxU9CIPHUho4WbbRowVQ59RDBxcgW5lGlDoMAr4z0R/7eMN9HdVmcP43DHuPTDPLjevWiN9QdOLRB1dOwTWYaYQYanBp/NCKCR9JZPCBeX0lurnzNGhi+cWQremU/DRb3rfxejKTgQjX4g0DoC0VjjvySRl69W4Z/+fOayJV4szppgC2DoCiPHGnStLSkV5vuQPNphpHqi8uk6uge3FIXCWUJInPV2B9P8rG8ZvnUXHwhpv4p9yly8BOjQof6nQU/uNA6c6VWWnFC/KJfh+u3T3X9W1wTd/vJtM07/8NV4GQaHswhkFA3Bm8S71vLp5bPwtOvDp9YWC2TyZxxrHFCxgqz0zv6p9Iegkv1WPF7fxndZJPg5vqihv2D55zoPV5HqjABaHRoDbShrWz5cb1Re2FW25BrpubV+jnNMxPkL35B+z8/UlX3fT/VhXEyp54T0LcTDRSIT85Bx+Pcd8iHcDXXPY4Z6N4w7s+vTKB0Ayd5npiH8GxQtjANuUJi8htVIa7bbGpOyRf80SRRfM=
+  file: "$TRAVIS_BUILD_DIR/$RELEASE_FOLDER.zip"
   skip_cleanup: true
   overwrite: true
   on:

godaddy-email-marketing.php

@@ -3,7 +3,7 @@
  * Plugin Name: GoDaddy Email Marketing
  * Plugin URI: https://gem.godaddy.com/
  * Description: Add the GoDaddy Email Marketing signup form to your WordPress site! Easy to set up, the plugin allows your site visitors to subscribe to your email lists.
- * Version: 1.2.0
+ * Version: 1.2.1
  * Author: GoDaddy
  * Author URI: https://gem.godaddy.com/
  * License: GPL-2.0
@@ -108,7 +108,7 @@ private function setup_constants() {
 
 		// Plugin's main directory.
 		defined( 'GEM_VERSION' )
-			or define( 'GEM_VERSION', '1.2.0' );
+			or define( 'GEM_VERSION', '1.2.1' );
 
 		// Set up the base name.
 		isset( self::$basename ) || self::$basename = plugin_basename( __FILE__ );

package.json

@@ -2,7 +2,7 @@
   "name": "godaddy-email-marketing-sign-up-forms",
   "title": "GoDaddy Email Marketing",
   "description": "Allow your site visitors to subscribe to your email lists using a sidebar widget.",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "author": "GoDaddy",
   "license": "GPL-2.0",
   "repository": "godaddy/wp-godaddy-email-marketing",

readme.md

@@ -5,7 +5,7 @@
 **Tags:** [email](https://wordpress.org/plugins/tags/email/), [forms](https://wordpress.org/plugins/tags/forms/), [godaddy](https://wordpress.org/plugins/tags/godaddy/), [mailing list](https://wordpress.org/plugins/tags/mailing list/), [marketing](https://wordpress.org/plugins/tags/marketing/), [newsletter](https://wordpress.org/plugins/tags/newsletter/), [opt-in](https://wordpress.org/plugins/tags/opt-in/), [signup](https://wordpress.org/plugins/tags/signup/), [subscribe](https://wordpress.org/plugins/tags/subscribe/), [widget](https://wordpress.org/plugins/tags/widget/), [contacts](https://wordpress.org/plugins/tags/contacts/)  
 **Requires at least:** 3.8  
 **Tested up to:** 4.9  
-**Stable tag:** 1.2.0  
+**Stable tag:** 1.2.1  
 **License:** GPL-2.0  
 **License URI:** https://www.gnu.org/licenses/gpl-2.0.html  
 

readme.txt

@@ -3,7 +3,7 @@ Contributors: godaddy, fjarrett, jonathanbardo, eherman24, susanygodaddy, madmim
 Tags: email, forms, godaddy, mailing list, marketing, newsletter, opt-in, signup, subscribe, widget, contacts
 Requires at least: 3.8
 Tested up to: 4.9
-Stable tag: 1.2.0
+Stable tag: 1.2.1
 License: GPL-2.0
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 

tests/test-class-gem-form-fields.php

@@ -233,14 +233,17 @@ public function test_radio_buttons() {
 	 * Test date markup.
 	 *
 	 * @see GEM_Form_Fields::date()
+	 * @group test
 	 */
 	public function test_date() {
 		add_action( 'gem_required_field_class', array( $this, 'gem_required_field_class_callback' ) );
-		$field = new stdClass();
-		$field->name = 'the_name_a';
+		$field           = new stdClass();
+		$field->name     = 'the_name_a';
 		$field->required = false;
-		$field->display = 'text_a';
-		$field->value = 'the_value';
+		$field->display  = 'text_a';
+		$field->value    = 'the_value';
+		$cur_year        = date( 'Y' ) + 5;
+		$min_year        = date( 'Y' ) - 80;
 		ob_start();
 		GEM_Form_Fields::date( $field );
 		$actual_output = ob_get_clean();
@@ -253,8 +256,8 @@ public function test_date() {
 		$this->assertContains( '<option value="01"> 1 </option>', $actual_output );
 		$this->assertContains( '<option value="31"> 31 </option>', $actual_output );
 		$this->assertContains( '<select fingerprint="date" data-id="form_1_the_name_a" data-name="the_name_a">', $actual_output );
-		$this->assertContains( '<option value="2021"> 2021 </option>', $actual_output );
-		$this->assertContains( '<option value="1937"> 1937 </option>', $actual_output );
+		$this->assertContains( '<option value="' . $cur_year . '"> ' . $cur_year . ' </option>', $actual_output );
+		$this->assertContains( '<option value="' . $min_year . '"> ' . $min_year . ' </option>', $actual_output );
 		$this->assertContains( '<input type="hidden" id="form_1_the_name_a" name="the_name_a" value="" class="" data-label="' . $field->display . '" />', $actual_output );
 		remove_action( 'gem_required_field_class', array( $this, 'gem_required_field_class_callback' ) );