Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-12-15-44-44

[civicrm-core.git] / tests / phpunit / CRM / Core / ManagedEntitiesTest.php

diff --git a/tests/phpunit/CRM/Core/ManagedEntitiesTest.php b/tests/phpunit/CRM/Core/ManagedEntitiesTest.php
index 0c1e2be9cc2fbc25c2f55357b1b013971cfac8e8..2f38ee2d903cbefe97ab6184b429560009b792c1 100644 (file)
--- a/tests/phpunit/CRM/Core/ManagedEntitiesTest.php
+++ b/tests/phpunit/CRM/Core/ManagedEntitiesTest.php
@@ -377,7 +377,7 @@ class CRM_Core_ManagedEntitiesTest extends CiviUnitTestCase {
     $this->assertEquals('CRM_Example_One_Foo', $foo['name']);
     $this->assertDBQuery(1, 'SELECT count(*) FROM civicrm_option_value WHERE name = "CRM_Example_One_Foo"');
 
-    // then destory module; note that decls go away
+    // then destroy module; note that decls go away
     unset($this->modules['one']);
     $me = new CRM_Core_ManagedEntities($this->modules, array());
     $me->reconcile();