From 67ca12e1c133cd9ba37c3d6f39e93973a92990a8 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 6 Feb 2015 13:57:32 -0500
Subject: [PATCH] Improved test stability.
---
module/VuFind/src/VuFind/Db/Table/User.php | 2 +-
module/VuFind/src/VuFindTest/Unit/DbTestCase.php | 6 +++++-
.../integration-tests/src/VuFindTest/Mink/CartTest.php | 2 ++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/module/VuFind/src/VuFind/Db/Table/User.php b/module/VuFind/src/VuFind/Db/Table/User.php
index 46ddc32a934..9978af7f188 100644
--- a/module/VuFind/src/VuFind/Db/Table/User.php
+++ b/module/VuFind/src/VuFind/Db/Table/User.php
@@ -50,7 +50,7 @@ class User extends Gateway
*
* @param \Zend\Config\Config $config VuFind configuration
*/
- public function __construct(\Zend\Config\Config $config = null)
+ public function __construct(\Zend\Config\Config $config)
{
parent::__construct('user', 'VuFind\Db\Row\User');
$this->config = $config;
diff --git a/module/VuFind/src/VuFindTest/Unit/DbTestCase.php b/module/VuFind/src/VuFindTest/Unit/DbTestCase.php
index 3e4447f13ff..52ad6cf13c5 100644
--- a/module/VuFind/src/VuFindTest/Unit/DbTestCase.php
+++ b/module/VuFind/src/VuFindTest/Unit/DbTestCase.php
@@ -60,7 +60,11 @@ abstract class DbTestCase extends TestCase
new \Zend\ServiceManager\Config(
array(
'abstract_factories' =>
- array('VuFind\Db\Table\PluginFactory')
+ array('VuFind\Db\Table\PluginFactory'),
+ 'factories' => array(
+ 'resource' => 'VuFind\Db\Table\Factory::getResource',
+ 'user' => 'VuFind\Db\Table\Factory::getUser',
+ )
)
)
);
diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CartTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CartTest.php
index ef37bc2703c..32291f88922 100644
--- a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CartTest.php
+++ b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CartTest.php
@@ -58,6 +58,7 @@ class CartTest extends \VuFindTest\Unit\MinkTestCase
// Click "add" without selecting anything:
$updateCart = $page->find('css', '#updateCart');
+ $this->assertTrue(is_object($updateCart));
$updateCart->click();
$this->assertEquals(
'No items were selected. '
@@ -73,6 +74,7 @@ class CartTest extends \VuFindTest\Unit\MinkTestCase
// Open the cart and empty it:
$viewCart = $page->find('css', '#viewCart');
+ $this->assertTrue(is_object($viewCart));
$viewCart->click();
$cartSelectAll = $page->find('css', '#cartCheckboxSelectAll');
$cartSelectAll->check();
--
GitLab