diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-23 10:01:40 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-23 10:01:40 -0700 |
| commit | d0186436de5b282490779a6add014f5f31bd8834 (patch) | |
| tree | a4c97e4147b6da9c44db2d43fa3372682be0ae6b /modules/gallery | |
| parent | e3d6920cd9fdec948ebd5d2954260c67c6aff145 (diff) | |
| parent | aa85d27eab10b47f7c7cfc5bfeb26f41baed8753 (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/tests/Albums_Controller_Test.php
modules/user/helpers/user.php
Diffstat (limited to 'modules/gallery')
| -rw-r--r-- | modules/gallery/tests/Albums_Controller_Test.php | 4 | ||||
| -rw-r--r-- | modules/gallery/tests/Photos_Controller_Test.php | 2 | ||||
| -rw-r--r-- | modules/gallery/tests/controller_auth_data.txt | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/modules/gallery/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php index b85b5258..5974c6f9 100644 --- a/modules/gallery/tests/Albums_Controller_Test.php +++ b/modules/gallery/tests/Albums_Controller_Test.php @@ -43,7 +43,7 @@ class Albums_Controller_Test extends Unit_Test_Case { $_POST["column"] = "weight"; $_POST["direction"] = "ASC"; $_POST["csrf"] = access::csrf_token(); - $_POST["slug"] = "new_name"; + $_POST["slug"] = "new-name"; $_POST["_method"] = "put"; access::allow(identity::everybody(), "edit", $root); @@ -53,7 +53,7 @@ class Albums_Controller_Test extends Unit_Test_Case { ob_end_clean(); $this->assert_equal( - json_encode(array("result" => "success")), + json_encode(array("result" => "success", "location" => "")), $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 2e5d7fe3..d2404192 100644 --- a/modules/gallery/tests/Photos_Controller_Test.php +++ b/modules/gallery/tests/Photos_Controller_Test.php @@ -47,7 +47,7 @@ class Photos_Controller_Test extends Unit_Test_Case { $results = ob_get_contents(); ob_end_clean(); - $this->assert_equal(json_encode(array("result" => "success")), $results); + $this->assert_equal(json_encode(array("result" => "success", "location" => "")), $results); $this->assert_equal("new-slug", $photo->slug); $this->assert_equal("new title", $photo->title); $this->assert_equal("new description", $photo->description); diff --git a/modules/gallery/tests/controller_auth_data.txt b/modules/gallery/tests/controller_auth_data.txt index fdf00c5e..30102538 100644 --- a/modules/gallery/tests/controller_auth_data.txt +++ b/modules/gallery/tests/controller_auth_data.txt @@ -9,6 +9,11 @@ modules/gallery/controllers/albums.php _form_add modules/gallery/controllers/combined.php javascript DIRTY_AUTH modules/gallery/controllers/combined.php css DIRTY_AUTH modules/gallery/controllers/file_proxy.php __call DIRTY_CSRF|DIRTY_AUTH +modules/gallery/controllers/login.php ajax DIRTY_AUTH +modules/gallery/controllers/login.php auth_ajax DIRTY_AUTH +modules/gallery/controllers/login.php html DIRTY_AUTH +modules/gallery/controllers/login.php auth_html DIRTY_AUTH +modules/gallery/controllers/logout.php index DIRTY_CSRF|DIRTY_AUTH modules/gallery/controllers/maintenance.php index DIRTY_AUTH modules/gallery/controllers/rest.php __construct DIRTY_AUTH modules/gallery/controllers/rest.php __call DIRTY_AUTH @@ -31,10 +36,5 @@ modules/server_add/controllers/admin_server_add.php autocomplete modules/server_add/controllers/server_add.php children DIRTY_CSRF modules/tag/controllers/admin_tags.php index DIRTY_CSRF modules/tag/controllers/tags.php _show DIRTY_CSRF|DIRTY_AUTH -modules/user/controllers/login.php ajax DIRTY_AUTH -modules/user/controllers/login.php auth_ajax DIRTY_AUTH -modules/user/controllers/login.php html DIRTY_AUTH -modules/user/controllers/login.php auth_html DIRTY_AUTH -modules/user/controllers/logout.php index DIRTY_CSRF|DIRTY_AUTH modules/user/controllers/password.php reset DIRTY_AUTH modules/user/controllers/password.php do_reset DIRTY_CSRF|DIRTY_AUTH |