Merge pull request #8072 from colemanw/CRM-17965

[civicrm-core.git] / tests / phpunit / WebTest / Utils / RedirectTest.php

diff --git a/tests/phpunit/WebTest/Utils/RedirectTest.php b/tests/phpunit/WebTest/Utils/RedirectTest.php
index 39d5df94d0178adf0336da5de48476b2b74cfc0f..2aed3261a8378f6dca1c2fafc01dbf7a0bf8b186 100644 (file)
--- a/tests/phpunit/WebTest/Utils/RedirectTest.php
+++ b/tests/phpunit/WebTest/Utils/RedirectTest.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2016                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -24,26 +24,12 @@
  +--------------------------------------------------------------------+
  */
 
-require_once 'CiviTest/CiviUnitTestCase.php';
-require_once 'CiviTest/CiviSeleniumSettings.php';
-
-/**
- *  Include configuration
- */
-define('CIVICRM_SETTINGS_PATH', __DIR__ . '/civicrm.settings.dist.php');
-define('CIVICRM_SETTINGS_LOCAL_PATH', __DIR__ . '/civicrm.settings.local.php');
 define('CIVICRM_WEBTEST', 1);
 
-if (file_exists(CIVICRM_SETTINGS_LOCAL_PATH)) {
-  require_once CIVICRM_SETTINGS_LOCAL_PATH;
-}
-require_once CIVICRM_SETTINGS_PATH;
-
-
 /**
  * Check that we handle redirects appropriately.
  */
-class WebTest_Utils_RedirectTest extends CiviUnitTestCase {
+class WebTest_Utils_RedirectTest extends PHPUnit_Framework_TestCase {
   protected $url;
   protected $ch;
 
@@ -53,6 +39,7 @@ class WebTest_Utils_RedirectTest extends CiviUnitTestCase {
   public function __construct($name = NULL) {
     parent::__construct($name);
 
+    // TODO: Just use $GLOBALS['_CV'] and don't bother with CiviSeleniumSettings.
     $this->settings = new CiviSeleniumSettings();
     if (property_exists($this->settings, 'serverStartupTimeOut') && $this->settings->serverStartupTimeOut) {
       global $CiviSeleniumTestCase_polled;