? .og_post.test.swp
? .og_subscribe.test.swp
? .og_testcase.php.swp
? patches_to_six.patch
Index: og_post.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/og/tests/og_post.test,v
retrieving revision 1.7
diff -u -p -r1.7 og_post.test
--- og_post.test	17 Apr 2008 01:24:15 -0000	1.7
+++ og_post.test	9 Jul 2008 18:28:08 -0000
@@ -41,7 +41,7 @@ class OgPost extends OgTestCase {
     //$edit['og_public']      = true;
     $edit['og_groups[' . $gid . ']'] = true;
     
-    $this->drupalPostRequest("node/add/page", $edit, 'Submit');
+    $this->drupalPost("node/add/page", $edit, 'Submit');
     
     $this->assertWantedRaw(t('Your %post has been created.', array ('%post' => node_get_types('name', 'page'))), 'post created');
     
@@ -58,4 +58,4 @@ class OgPost extends OgTestCase {
     
     node_delete($gid);
   }
-}
\ No newline at end of file
+}
Index: og_subscribe.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/og/tests/og_subscribe.test,v
retrieving revision 1.11
diff -u -p -r1.11 og_subscribe.test
--- og_subscribe.test	20 Apr 2008 21:21:00 -0000	1.11
+++ og_subscribe.test	9 Jul 2008 18:28:09 -0000
@@ -25,7 +25,7 @@ class OgSubscribe extends OgTestCase {
     $this->drupalLoginUser($join_user);
     
     /* Test subscribing a new user */
-    $url = url('og/subscribe/' . $gid, NULL, NULL, TRUE);
+    $url = url('og/subscribe/' . $gid, array('absolute' => TRUE));
     $ret = $this->_browser->get($url);
     $this->assertTrue($ret, " [browser] GET $url");
     // No theme, "Text" only
@@ -38,7 +38,7 @@ class OgSubscribe extends OgTestCase {
     $this->assertNoUnwantedRaw(t('Page not found'), 'page not not found.');
 
     /* Find user in list */
-    $url = url('og/users/' . $gid, NULL, NULL, TRUE);
+    $url = url('og/users/' . $gid, array("absolute" => true));
     $ret = $b->get($url);
     $this->assertTrue($ret, " [browser] GET $url");
     $this->assert(new TextExpectation($join_user->name),
@@ -47,7 +47,7 @@ class OgSubscribe extends OgTestCase {
     /** @TODO: Test Posting etc... */
     
     // Test unsubscribing a new user 
-    $url = url("og/unsubscribe/$gid/$join_user->uid", NULL, NULL, TRUE);
+    $url = url("og/unsubscribe/$gid/$join_user->uid", array('absolute' => true));
     $ret = $this->_browser->get($url);
     // print_r($ret);die(sd);
     $this->assertTrue($ret, " [browser] GET $url");
@@ -63,7 +63,7 @@ class OgSubscribe extends OgTestCase {
     $this->_browser = $b;
     
     // Find user in list */
-    $url = url('og/users/' . $gid, NULL, NULL, TRUE);
+    $url = url('og/users/' . $gid, array('absolute' => true));
     $ret = $b->get($url);
     $this->assertTrue($ret, " [browser] GET $url");
     $this->assertNoUnwantedRaw($join_user->name, 'User name not found.');
@@ -77,7 +77,7 @@ class OgSubscribe extends OgTestCase {
     $this->drupalLoginUser($join_user);
 
     // Test subscribing a new user 
-    $url = url('og/subscribe/' . $gid, NULL, NULL, TRUE);
+    $url = url('og/subscribe/' . $gid, array('absolute' => TRUE));
     $ret = $this->_browser->get($url);
     $this->assertTrue($ret, " [browser] GET $url");
     $this->assertNoUnwantedRaw(t('You are now a member of the @group group', array('@group' => $node->title)),
@@ -91,7 +91,7 @@ class OgSubscribe extends OgTestCase {
     $this->assertNoUnwantedRaw(t('Page not found'), 'page not not found.');
     $this->assertWantedRaw(t('This is a closed group. The group administrators add/remove members as needed.'), 'Closed/Rejected text found.');
     // Find user in list 
-    $url = url('og/users/' . $gid, NULL, NULL, TRUE);
+    $url = url('og/users/' . $gid, array('absolute' => TRUE));
     $ret = $b->get($url);
     $this->assertTrue($ret, " [browser] GET $url");
     $this->assert(new NoTextExpectation($join_user->name),
@@ -109,7 +109,7 @@ class OgSubscribe extends OgTestCase {
     $this->drupalLoginUser($join_user);
 
     // Test subscribing a new user 
-    $url = url('og/subscribe/' . $gid, NULL, NULL, TRUE);
+    $url = url('og/subscribe/' . $gid, array('absolute' => TRUE));
     $ret = $this->_browser->get($url);
     $this->assertTrue($ret, " [browser] GET $url");
     $this->assertNoUnwantedRaw(t('You are now a member of the @group group', array('@group' => $node->title)),
@@ -125,7 +125,7 @@ class OgSubscribe extends OgTestCase {
     $this->assertWantedRaw(t('This is an invite only group. The group administrators add/remove members as needed.'), 'Rejected text found.');
 
    // Find user in list 
-    $url = url('og/users/' . $gid, NULL, NULL, TRUE);
+    $url = url('og/users/' . $gid, array('absolute' => TRUE));
     $ret = $b->get($url);
     $this->assertTrue($ret, " [browser] GET $url");
     $this->assert(new NoTextExpectation($join_user->name),
@@ -143,7 +143,7 @@ class OgSubscribe extends OgTestCase {
     $this->drupalLoginUser($join_user);
 
     // Test subscribing a new user 
-    $url = url('og/subscribe/' . $gid, NULL, NULL, TRUE);
+    $url = url('og/subscribe/' . $gid, array('absolute' => TRUE));
     $ret = $this->_browser->get($url);
     $this->assertTrue($ret, " [browser] GET $url");
     $this->assertNoUnwantedRaw(t('You are now a member of the @group', array('@group' => $node->title)),
@@ -162,7 +162,7 @@ class OgSubscribe extends OgTestCase {
 
     // Find user in list, Inactive users _ARE_ listed
     $this->_browser = $b; // Switch back to admin view
-    $url = url('og/users/' . $gid, NULL, NULL, TRUE);
+    $url = url('og/users/' . $gid, array('absolute' => TRUE));
     $this->get($url);
     $this->assertTrue($ret, " [browser] GET $url");
     $this->assertWantedRaw($join_user->name, 'Username found');
@@ -172,7 +172,7 @@ class OgSubscribe extends OgTestCase {
     $this->assertWantedRaw(t('Membership request denied.'), 'Denied text found.');
     
 
-    $url = url('og/users/' . $gid, NULL, NULL, TRUE);
+    $url = url('og/users/' . $gid, array('absolute' => TRUE));
     $this->get($url);
     $this->assertNoUnwantedRaw($join_user->name, 'Username not found');
 
@@ -182,7 +182,7 @@ class OgSubscribe extends OgTestCase {
     $this->drupalLoginUser($join_user);
 
     // Test subscribing a new user 
-    $url = url('og/subscribe/' . $gid, NULL, NULL, TRUE);
+    $url = url('og/subscribe/' . $gid, array('absolute' => TRUE));
     $ret = $this->_browser->get($url);
     $this->assertTrue($ret, " [browser] GET $url");
     
@@ -202,7 +202,7 @@ class OgSubscribe extends OgTestCase {
 
     // Find user in list, Inactive users _ARE_ listed
     $this->_browser = $b; // Switch back to admin view
-    $url = url('og/users/' . $gid, NULL, NULL, TRUE);
+    $url = url('og/users/' . $gid, array('absolute' => TRUE));
     $ret = $this->_browser->get($url);
     $this->assertTrue($ret, " [browser] GET $url");
     $this->assertWantedRaw($join_user->name, 'Username found');
@@ -211,9 +211,9 @@ class OgSubscribe extends OgTestCase {
 
     $this->assertWantedRaw(t('Membership request approved.'), 'Approved text found.');
     
-    $url = url('og/users/' . $gid, NULL, NULL, TRUE);
+    $url = url('og/users/' . $gid, array('absolute' => TRUE));
     $ret = $this->_browser->get($url);
     $this->assertTrue($ret, " [browser] GET $url");
     $this->assertWantedRaw($join_user->name, 'Username found again');
   }
-}
\ No newline at end of file
+}
Index: og_testcase.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/og/tests/og_testcase.php,v
retrieving revision 1.5
diff -u -p -r1.5 og_testcase.php
--- og_testcase.php	20 Apr 2008 12:32:22 -0000	1.5
+++ og_testcase.php	9 Jul 2008 18:28:09 -0000
@@ -16,7 +16,7 @@ class OgTestCase extends DrupalTestCase 
     $edit['og_selective'] = (string)$selective;
 //    $this->_browser->setFieldByName('edit[og_theme]', ''); // May not be present, so no error catching
 
-    $this->drupalPostRequest("node/add/$type", $edit, 'Submit');
+    $this->drupalPost("node/add/$type", $edit, t('Submit'));
 
     $this->assertWantedRaw(t('Your %post has been created.', array ('%post' => $type)), 'Group created');
 
@@ -71,8 +71,11 @@ class OgTestCase extends DrupalTestCase 
     while (sizeof($this->_cleanupNodeTypes) > 0) {
       $name = array_pop($this->_cleanupNodeTypes);
 
-      node_type_delete_confirm_submit(0, array('name' => $name, 'type' => $name));
+      $ar = array('name' => $name, 'type' => $name);
+      // named this array so it can be passed by reference.
+      // anonymous variables cannot.
+      node_type_delete_confirm_submit(0, $ar);
     }
     parent::tearDown();
   }
-}
\ No newline at end of file
+}