Save/restore $_SERVER before/after tests to avoid contamination.

Fix albums/photos tests to make sure we're really getting the
  HTTP_REFERER back.

2 files changed, 10 insertions, 8 deletions

diff --git a/modules/gallery/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php
index 5974c6f9..8562355c 100644
--- a/modules/gallery/tests/Albums_Controller_Test.php
+++ b/modules/gallery/tests/Albums_Controller_Test.php
@@ -19,13 +19,13 @@
  */
 class Albums_Controller_Test extends Unit_Test_Case {
   public function setup() {
-    $this->_post = $_POST;
-    $this->_album = null;
+    $this->_save = array($_POST, $_SERVER);
+    $_SERVER["HTTP_REFERER"] = "HTTP_REFERER";
   }
 
   public function teardown() {
-    $_POST = $this->_post;
-    if ($this->_album) {
+    list($_POST, $_SERVER) = $this->_save;
+    if (isset($this->_album)) {
       $this->_album->delete();
     }
   }
@@ -53,7 +53,7 @@ class Albums_Controller_Test extends Unit_Test_Case {
     ob_end_clean();
 
     $this->assert_equal(
-      json_encode(array("result" => "success", "location" => "")),
+      json_encode(array("result" => "success", "location" => "HTTP_REFERER")),
       $results);
     $this->assert_equal("new title", $this->_album->title);
     $this->assert_equal("new description", $this->_album->description);
diff --git a/modules/gallery/tests/Photos_Controller_Test.php b/modules/gallery/tests/Photos_Controller_Test.php
index d2404192..624e6878 100644
--- a/modules/gallery/tests/Photos_Controller_Test.php
+++ b/modules/gallery/tests/Photos_Controller_Test.php
@@ -19,11 +19,12 @@
  */
 class Photos_Controller_Test extends Unit_Test_Case {
   public function setup() {
-    $this->_post = $_POST;
+    $this->_save = array($_POST, $_SERVER);
+    $_SERVER["HTTP_REFERER"] = "HTTP_REFERER";
   }
 
   public function teardown() {
-    $_POST = $this->_post;
+    list($_POST, $_SERVER) = $this->_save;
   }
 
   public function change_photo_test() {
@@ -47,7 +48,8 @@ class Photos_Controller_Test extends Unit_Test_Case {
     $results = ob_get_contents();
     ob_end_clean();
 
-    $this->assert_equal(json_encode(array("result" => "success", "location" => "")), $results);
+    $this->assert_equal(
+      json_encode(array("result" => "success", "location" => "HTTP_REFERER")), $results);
     $this->assert_equal("new-slug", $photo->slug);
     $this->assert_equal("new title", $photo->title);
     $this->assert_equal("new description", $photo->description);