From 5d76008993fc7edc5d4c1aedba8af81b36d1554e Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Tue, 5 Oct 2010 06:17:29 +0000
Subject: #438224 by dww, sun, netsensei, vordude, et al: 'Post comments
 without approval' permission name is completely misleading.

---
 modules/trigger/trigger.test | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/trigger')

diff --git a/modules/trigger/trigger.test b/modules/trigger/trigger.test
index 6d60eda9e..a9fbffec3 100644
--- a/modules/trigger/trigger.test
+++ b/modules/trigger/trigger.test
@@ -495,7 +495,7 @@ class TriggerUserActionTestCase extends TriggerActionTestCase {
    * Tests user action assignment and execution.
    */
   function testUserActionAssignmentExecution() {
-    $test_user = $this->drupalCreateUser(array('administer actions', 'create article content', 'access comments', 'administer comments', 'post comments without approval', 'edit own comments'));
+    $test_user = $this->drupalCreateUser(array('administer actions', 'create article content', 'access comments', 'administer comments', 'skip comment approval', 'edit own comments'));
     $this->drupalLogin($test_user);
 
     $triggers = array('comment_presave', 'comment_insert', 'comment_update');
@@ -517,7 +517,7 @@ class TriggerUserActionTestCase extends TriggerActionTestCase {
     // the comment is updated.
     user_save($account, array('status' => TRUE));
 
-    $test_user = $this->drupalCreateUser(array('administer actions', 'create article content', 'access comments', 'administer comments', 'post comments without approval', 'edit own comments'));
+    $test_user = $this->drupalCreateUser(array('administer actions', 'create article content', 'access comments', 'administer comments', 'skip comment approval', 'edit own comments'));
     $this->drupalLogin($test_user);
 
     // Our original comment will have been comment 1.
@@ -526,7 +526,7 @@ class TriggerUserActionTestCase extends TriggerActionTestCase {
     $this->assertTrue($comment_author_account->status == 0, t('Comment author account (uid=@uid) is blocked after update to comment', array('@uid' => $comment_author_uid)));
 
     // Verify that the comment was updated.
-    $test_user = $this->drupalCreateUser(array('administer actions', 'create article content', 'access comments', 'administer comments', 'post comments without approval', 'edit own comments'));
+    $test_user = $this->drupalCreateUser(array('administer actions', 'create article content', 'access comments', 'administer comments', 'skip comment approval', 'edit own comments'));
     $this->drupalLogin($test_user);
 
     $this->drupalGet("node/$node->nid");
@@ -627,7 +627,7 @@ class TriggerOtherTestCase extends TriggerWebTestCase {
     variable_set($action_id, FALSE);
 
     // Create a node and add a comment to it.
-    $web_user = $this->drupalCreateUser(array('create article content', 'access content', 'post comments without approval', 'post comments'));
+    $web_user = $this->drupalCreateUser(array('create article content', 'access content', 'skip comment approval', 'post comments'));
     $this->drupalLogin($web_user);
     $node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1));
     $edit = array();
-- 
cgit v1.2.3