gg

tests/suites/legacy/request/JRequestGetMethodTest.php

@@ -1,43 +1,13 @@
 <?php
 /**
  * @package     Joomla.UnitTest
-<<<<<<< HEAD
- * @subpackage  Environment
-=======
  * @subpackage  Request
->>>>>>> upstream/master
+
  *
  * @copyright   Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-<<<<<<< HEAD
-/**
- * A unit test class for JRequest
- */
-class JRequestTest_GetMethod extends PHPUnit_Framework_TestCase
-{
-
-	/**
-	 * Clear the cache
-	 */
-	function setUp() {
-		// Make sure the request hash is clean.
-		$GLOBALS['_JREQUEST'] = array();
-	}
-
-	/**
-	 * @covers JRequest::getMethod
-	 */
-	function testGetMethod()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'post';
-		$this -> assertEquals('POST', JRequest::getMethod());
-		$_SERVER['REQUEST_METHOD'] = 'get';
-		$this -> assertEquals('GET', JRequest::getMethod());
-	}
-
-=======
 require_once __DIR__ . '/JRequest-helper-dataset.php';
 
 /**
@@ -189,5 +159,4 @@ public function testSet()
 
 		$this->assertSame($get, $_GET);
 	}
->>>>>>> upstream/master
 }