From 4977318f46781619ff5cee2b10784e8807be96ec Mon Sep 17 00:00:00 2001
From: Will Rossiter <will.rossiter@gmail.com>
Date: Fri, 29 Jun 2012 20:45:57 +1200
Subject: [PATCH] FIX: ensure RestfulServiceTest uses email as the unique
 identifer field for running tests. Fixes: #6156.

---
 tests/api/RestfulServiceTest.php | 34 +++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/tests/api/RestfulServiceTest.php b/tests/api/RestfulServiceTest.php
index 61aa0f8f5..3a4e1503a 100644
--- a/tests/api/RestfulServiceTest.php
+++ b/tests/api/RestfulServiceTest.php
@@ -1,7 +1,31 @@
 <?php
 
+/**
+ * @package framework
+ * @subpackage tests
+ */
 class RestfulServiceTest extends SapphireTest {
 	
+	protected $member_unique_identifier_field = ''; 
+	
+	function setUp() { 
+		// backup the project unique identifier field
+		$this->member_unique_identifier_field = Member::get_unique_identifier_field();
+
+		Member::set_unique_identifier_field('Email');
+
+		parent::setUp(); 
+	} 
+
+	function tearDown() {
+		parent::tearDown(); 
+
+		// set old member::get_unique_identifier_field value 
+		if ($this->member_unique_identifier_field) { 
+			Member::set_unique_identifier_field($this->member_unique_identifier_field); 
+		}
+	} 
+
 	function testSpecialCharacters() {
 		$service = new RestfulServiceTest_MockRestfulService(Director::absoluteBaseURL());
 		$url = 'RestfulServiceTest_Controller/';
@@ -134,8 +158,16 @@ class RestfulServiceTest extends SapphireTest {
 }
 
 class RestfulServiceTest_Controller extends Controller implements TestOnly {
+
+	public static $allowed_actions = array(
+		'index',
+		'httpErrorWithoutCache',
+		'httpErrorWithCache'
+	);
+
 	public function init() {
 		$this->basicAuthEnabled = false;
+
 		parent::init();
 	}
 
@@ -191,7 +223,7 @@ XML;
 		$this->response->setBody($out);
 		$this->response->setStatusCode(400); 
 		$this->response->addHeader('Content-type', 'text/xml');
-		
+
 		return $this->response;
 	}