3 files changed, 12 insertions, 8 deletions
diff --git a/modules/comment/tests/Comment_Helper_Test.php b/modules/comment/tests/Comment_Helper_Test.php
index 9a8c83f1..82b7ebd2 100644
--- a/modules/comment/tests/Comment_Helper_Test.php
+++ b/modules/comment/tests/Comment_Helper_Test.php
@@ -24,6 +24,7 @@ class Comment_Helper_Test extends Unit_Test_Case {
   public function setup() {
     $this->_ip_address = Input::instance()->ip_address;
     $this->_user_agent = Kohana::$user_agent;
+    $this->_save = $_SERVER;
 
     $_SERVER["HTTP_ACCEPT"] = "HTTP_ACCEPT";
     $_SERVER["HTTP_ACCEPT_CHARSET"] = "HTTP_ACCEPT_CHARSET";
@@ -42,6 +43,7 @@ class Comment_Helper_Test extends Unit_Test_Case {
   public function teardown() {
     Input::instance()->ip_address = $this->_ip_address;
     Kohana::$user_agent = $this->_user_agent;
+    $_SERVER = $this->_save;
   }
 
   public function create_comment_for_guest_test() {
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);