diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-03 01:11:52 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-03 01:11:52 -0700 |
| commit | c4b449add1a64bc464f695248a2435afa81a437d (patch) | |
| tree | ce1b3eb4ad076c627e165f1f9bdf63a98f67e386 | |
| parent | 33bcf11e2714f727f16136a1c09926cd5b6c8212 (diff) | |
| parent | dcdd44109b13a2cd2b29884edb6090e970178f32 (diff) | |
Merge branch 'master' into talmdal
| -rw-r--r-- | modules/gallery/tests/Albums_Controller_Test.php | 2 | ||||
| -rw-r--r-- | modules/gallery/tests/Photos_Controller_Test.php | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/modules/gallery/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php index 7674e85f..d65946c7 100644 --- a/modules/gallery/tests/Albums_Controller_Test.php +++ b/modules/gallery/tests/Albums_Controller_Test.php @@ -52,7 +52,7 @@ class Albums_Controller_Test extends Unit_Test_Case { ob_end_clean(); $this->assert_equal( - json_encode(array("result" => "success", "location" => "http://./index.php/test")), + json_encode(array("result" => "success")), $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 5c4802c2..ac5ecdfd 100644 --- a/modules/gallery/tests/Photos_Controller_Test.php +++ b/modules/gallery/tests/Photos_Controller_Test.php @@ -50,8 +50,7 @@ class Photos_Controller_Test extends Unit_Test_Case { ob_end_clean(); $this->assert_equal( - json_encode(array("result" => "success", - "location" => "http://./index.php/test.jpeg")), + json_encode(array("result" => "success")), $results); $this->assert_equal("new title", $this->_photo->title); $this->assert_equal("new description", $this->_photo->description); |