From 04248c72ed86cd96341e3d7bbeea22ec24648fac Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 25 Jul 2015 11:49:26 +1000
Subject: [PATCH] Fixes unit tests

---
 tests/unit/cms/classes/ControllerTest.php     | 31 ++++++++++++-------
 .../system/classes/VersionManagerTest.php     |  2 +-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/tests/unit/cms/classes/ControllerTest.php b/tests/unit/cms/classes/ControllerTest.php
index ca4bb38a1..2de040214 100644
--- a/tests/unit/cms/classes/ControllerTest.php
+++ b/tests/unit/cms/classes/ControllerTest.php
@@ -127,19 +127,28 @@ class ControllerTest extends TestCase
 
     protected function configAjaxRequestMock($handler, $partials = false)
     {
-        $requestMock = $this->getMock('Illuminate\Http\Request', array('header'));
+        $requestMock = $this
+            ->getMockBuilder('Illuminate\Http\Request')
+            ->disableOriginalConstructor()
+            ->setMethods(array('ajax', 'method', 'header'))
+            ->getMock();
 
-        $requestMock->expects($this->at(0))
+        $map = array(
+            array('X_OCTOBER_REQUEST_HANDLER', null, $handler),
+            array('X_OCTOBER_REQUEST_PARTIALS', null, $partials),
+        );
+
+        $requestMock->expects($this->any())
+            ->method('ajax')
+            ->will($this->returnValue(true));
+
+        $requestMock->expects($this->any())
+            ->method('method')
+            ->will($this->returnValue('POST'));
+
+        $requestMock->expects($this->any())
             ->method('header')
-            ->with($this->stringContains('X_OCTOBER_REQUEST_HANDLER'), $this->anything())
-            ->will($this->returnValue($handler));
-
-        if ($partials !== false) {
-            $requestMock->expects($this->at(1))
-                ->method('header')
-                ->with($this->stringContains('X_OCTOBER_REQUEST_PARTIALS'), $this->anything())
-                ->will($this->returnValue($partials));
-        }
+            ->will($this->returnValueMap($map));
 
         return $requestMock;
     }
diff --git a/tests/unit/system/classes/VersionManagerTest.php b/tests/unit/system/classes/VersionManagerTest.php
index 514a8e81f..857e15380 100644
--- a/tests/unit/system/classes/VersionManagerTest.php
+++ b/tests/unit/system/classes/VersionManagerTest.php
@@ -93,7 +93,7 @@ class VersionManagerTest extends TestCase
          * Test empty file
          */
         $result = self::callProtectedMethod($manager, 'getFileVersions', ['\October\\NoUpdates']);
-        $this->assertNull($result);
+        $this->assertEmpty($result);
     }
 
     public function testGetNewFileVersions()