Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev

Conflicts:
	modules/gallery/controllers/rest.php

1 files changed, 0 insertions, 45 deletions

diff --git a/modules/gallery/tests/REST_Helper_Test.php b/modules/gallery/tests/REST_Helper_Test.php
deleted file mode 100644
index 1bfc63ab..00000000
--- a/modules/gallery/tests/REST_Helper_Test.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class REST_Helper_Test extends Unit_Test_Case {
-  public function setup() {
-    $this->_post = $_POST;
-  }
-
-  public function teardown() {
-    $_POST = $this->_post;
-  }
-
-  public function request_method_test() {
-    foreach (array("GET", "POST") as $method) {
-      foreach (array("", "PUT", "DELETE") as $tunnel) {
-        if ($method == "GET") {
-          $expected = "GET";
-        } else {
-          $expected = $tunnel == "" ? $method : $tunnel;
-        }
-        $_SERVER["REQUEST_METHOD"] = $method;
-        $_POST["_method"] = $tunnel;
-
-        $this->assert_equal(strtolower(rest::request_method()), strtolower($expected),
-          "Request method: {$method}, tunneled: {$tunnel}");
-      }
-    }
-  }
-}