non security modules update

sites/all/modules/contrib/form/honeypot/honeypot.test

@@ -9,8 +9,8 @@
  * Test the functionality of the Honeypot module for an admin user.
  */
 class HoneypotFormTestCase extends DrupalWebTestCase {
-  protected $admin_user;
-  protected $web_user;
+  protected $adminUser;
+  protected $webUser;
   protected $node;
 
   public static function getInfo() {
@@ -27,8 +27,10 @@ class HoneypotFormTestCase extends DrupalWebTestCase {
 
     // Set up required Honeypot variables.
     variable_set('honeypot_element_name', 'url');
-    variable_set('honeypot_time_limit', 0); // Disable time_limit protection.
-    variable_set('honeypot_protect_all_forms', TRUE); // Test protecting all forms.
+    // Disable time_limit protection.
+    variable_set('honeypot_time_limit', 0);
+    // Test protecting all forms.
+    variable_set('honeypot_protect_all_forms', TRUE);
     variable_set('honeypot_log', FALSE);
 
     // Set up other required variables.
@@ -36,7 +38,7 @@ class HoneypotFormTestCase extends DrupalWebTestCase {
     variable_set('user_register', USER_REGISTER_VISITORS);
 
     // Set up admin user.
-    $this->admin_user = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser(array(
       'administer honeypot',
       'bypass honeypot protection',
       'administer content types',
@@ -48,7 +50,7 @@ class HoneypotFormTestCase extends DrupalWebTestCase {
     ));
 
     // Set up web user.
-    $this->web_user = $this->drupalCreateUser(array(
+    $this->webUser = $this->drupalCreateUser(array(
       'access comments',
       'post comments',
       'create article content',
@@ -58,7 +60,7 @@ class HoneypotFormTestCase extends DrupalWebTestCase {
     $this->node = $this->drupalCreateNode(array(
       'type' => 'article',
       'promote' => 1,
-      'uid' => $this->web_user->uid,
+      'uid' => $this->webUser->uid,
     ));
   }
 
@@ -96,9 +98,12 @@ class HoneypotFormTestCase extends DrupalWebTestCase {
     $this->drupalPost('user/register', $edit, t('Create new account'));
 
     // Form should have error message.
-    $this->assertText(t('There was a problem with your form submission. Please wait'), 'Registration form protected by time limit.');
+    $this->assertText(t('There was a problem with your form submission. Please wait 6 seconds and try again.'), 'Registration form protected by time limit.');
   }
 
+  /**
+   * Test comment form protection.
+   */
   public function testProtectCommentFormNormal() {
     $comment = 'Test comment.';
 
@@ -106,7 +111,7 @@ class HoneypotFormTestCase extends DrupalWebTestCase {
     variable_set('honeypot_time_limit', 0);
 
     // Log in the web user.
-    $this->drupalLogin($this->web_user);
+    $this->drupalLogin($this->webUser);
 
     // Set up form and submit it.
     $edit['comment_body[' . LANGUAGE_NONE . '][0][value]'] = $comment;
@@ -118,7 +123,7 @@ class HoneypotFormTestCase extends DrupalWebTestCase {
     $comment = 'Test comment.';
 
     // Log in the web user.
-    $this->drupalLogin($this->web_user);
+    $this->drupalLogin($this->webUser);
 
     // Set up form and submit it.
     $edit['comment_body[' . LANGUAGE_NONE . '][0][value]'] = $comment;
@@ -129,10 +134,96 @@ class HoneypotFormTestCase extends DrupalWebTestCase {
 
   public function testProtectCommentFormHoneypotBypass() {
     // Log in the admin user.
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
 
     // Get the comment reply form and ensure there's no 'url' field.
     $this->drupalGet('comment/reply/' . $this->node->nid);
     $this->assertNoText('id="edit-url" name="url"', 'Honeypot home page field not shown.');
   }
+
+  /**
+   * Test node form protection.
+   */
+  public function testProtectNodeFormTooFast() {
+    // Log in the admin user.
+    $this->drupalLogin($this->webUser);
+
+    // Reset the time limit to 5 seconds.
+    variable_set('honeypot_time_limit', 5);
+
+    // Set up the form and submit it.
+    $edit["title"] = 'Test Page';
+    $this->drupalPost('node/add/article', $edit, t('Save'));
+    $this->assertText(t('There was a problem with your form submission.'), 'Honeypot node form timestamp protection works.');
+  }
+
+  /**
+   * Test node form protection.
+   */
+  public function testProtectNodeFormPreviewPassthru() {
+    // Log in the admin user.
+    $this->drupalLogin($this->webUser);
+
+    // Post a node form using the 'Preview' button and make sure it's allowed.
+    $edit["title"] = 'Test Page';
+    $this->drupalPost('node/add/article', $edit, t('Preview'));
+    $this->assertNoText(t('There was a problem with your form submission.'), 'Honeypot not blocking node form previews.');
+  }
+}
+
+/**
+ * Test the functionality of the Honeypot module's integration with Trigger.
+ */
+class HoneypotTriggerTestCase extends DrupalWebTestCase {
+  public static function getInfo() {
+    return array(
+      'name' => 'Honeypot Trigger integration',
+      'description' => 'Ensure that Honeypot triggers events correctly.',
+      'group' => 'Form API',
+    );
+  }
+
+  public function setUp() {
+    // Enable modules required for this test.
+    parent::setUp(array('honeypot', 'trigger'));
+
+    // Set up required Honeypot variables.
+    variable_set('honeypot_element_name', 'url');
+    // Disable time_limit protection.
+    variable_set('honeypot_time_limit', 0);
+    // Test protecting all forms.
+    variable_set('honeypot_protect_all_forms', TRUE);
+    variable_set('honeypot_log', FALSE);
+
+    // Set up other required variables.
+    variable_set('user_email_verification', TRUE);
+    variable_set('user_register', USER_REGISTER_VISITORS);
+
+    // Assign new action to Honeypot form rejection Trigger.
+    db_insert('trigger_assignments')
+      ->fields(array(
+        'hook' => 'honeypot_reject',
+        'aid' => 'system_block_ip_action',
+        'weight' => 1,
+      ))
+      ->execute();
+  }
+
+  /**
+   * Test trigger integration.
+   */
+  public function testHoneypotTriggerIntegration() {
+    // Set up form and submit it.
+    $edit['name'] = $this->randomName();
+    $edit['mail'] = $edit['name'] . '@example.com';
+    $edit['url'] = 'http://www.example.com/';
+    $this->drupalPost('user/register', $edit, t('Create new account'));
+
+    // Make sure Honeypot is working.
+    $this->assertText(t('There was a problem with your form submission.'), 'Honeypot working correctly.');
+
+    // Visit the home page and make sure the user is banned.
+    $this->drupalGet('node');
+    $this->assertText(t('has been banned'), 'User banned successfully.');
+  }
 }