- Patch #260501 by cwgordon7: made the trigger module tests pass.

2 files changed, 3 insertions, 2 deletions

diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index 1944c659f..946777eda 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -368,7 +368,8 @@ class DrupalWebTestCase extends UnitTestCase {
     drupal_install_system();
 
     // Add the specified modules to the list of modules in the default profile.
-    $modules = array_unique(array_merge(func_get_args(), drupal_verify_profile('default', 'en')));
+    $args = func_get_args();
+    $modules = array_unique(array_merge(drupal_verify_profile('default', 'en'), $args));
     drupal_install_modules($modules);
 
     // Store the list of modules for use in subsequent drupalModuleEnable calls.
diff --git a/modules/trigger/trigger.test b/modules/trigger/trigger.test
index ed907cdf2..566d252d9 100644
--- a/modules/trigger/trigger.test
+++ b/modules/trigger/trigger.test
@@ -62,7 +62,7 @@ class TriggerContentTestCase extends DrupalWebTestCase {
 
       // Test 3: The action should be able to be unassigned from a trigger.
       $this->drupalPost('admin/build/trigger/unassign/nodeapi/presave/' . $hash, array(), t('Unassign'));
-      $this->assertRaw(t('Action %action has been unassigned.', array('%action' => 'Publish post')), t('Check to make sure the @action action can be unassigned from the trigger.', array('@action' => $info['name'])));
+      $this->assertRaw(t('Action %action has been unassigned.', array('%action' => ucfirst($info['name']))), t('Check to make sure the @action action can be unassigned from the trigger.', array('@action' => $info['name'])));
       $assigned = db_result(db_query("SELECT COUNT(*) FROM {trigger_assignments} WHERE aid IN ('" . implode("','", $content_actions) . "')"));
       $this->assertFalse($assigned, t('Check to make sure unassign worked properly at the database level.'));
     }