Merge pull request #2991 from colemanw/master

[civicrm-core.git] / tests / phpunit / WebTest / Import / DateFormatTest.php

diff --git a/tests/phpunit/WebTest/Import/DateFormatTest.php b/tests/phpunit/WebTest/Import/DateFormatTest.php
index 574cc1126bdaef3370af94fd6968414fe36a3110..ea5cdb5278ea39467d4794ceadf6bf37a8188f9b 100644 (file)
--- a/tests/phpunit/WebTest/Import/DateFormatTest.php
+++ b/tests/phpunit/WebTest/Import/DateFormatTest.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -24,14 +24,9 @@
  +--------------------------------------------------------------------+
 */
 
-
 require_once 'WebTest/Import/ImportCiviSeleniumTestCase.php';
 class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
 
-  protected $captureScreenshotOnFailure = TRUE;
-  protected $screenshotPath = '/var/www/api.dev.civicrm.org/public/sc';
-  protected $screenshotUrl = 'http://api.dev.civicrm.org/sc/';
-
   protected function setUp() {
     parent::setUp();
   }
@@ -40,16 +35,6 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
    *  Test contact import for yyyy_mm_dd date format.
    */
   function testDateFormat_yyyy_mm_dd() {
-    // This is the path where our testing install resides.
-    // The rest of URL is defined in CiviSeleniumTestCase base class, in
-    // class attributes.
-    $this->open($this->sboxPath);
-
-    // Logging in. Remember to wait for page to load. In most cases,
-    // you can rely on 30000 as the value that allows your test to pass, however,
-    // sometimes your test might fail because of this. In such cases, it's better to pick one element
-    // somewhere at the end of page and use waitForElementPresent on it - this assures you, that whole
-    // page contents loaded and you can continue your test execution.
     $this->webtestLogin();
 
     // Get sample import data.
@@ -65,16 +50,6 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
    *  Test contact import for mm_dd_yy date format.
    */
   function testDateFormat_mm_dd_yy() {
-    // This is the path where our testing install resides.
-    // The rest of URL is defined in CiviSeleniumTestCase base class, in
-    // class attributes.
-    $this->open($this->sboxPath);
-
-    // Logging in. Remember to wait for page to load. In most cases,
-    // you can rely on 30000 as the value that allows your test to pass, however,
-    // sometimes your test might fail because of this. In such cases, it's better to pick one element
-    // somewhere at the end of page and use waitForElementPresent on it - this assures you, that whole
-    // page contents loaded and you can continue your test execution.
     $this->webtestLogin();
 
     // Get sample import data.
@@ -91,11 +66,6 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
    *  Test contact import for mm_dd_yyyy date format.
    */
   function testDateFormat_mm_dd_yyyy() {
-    // This is the path where our testing install resides.
-    // The rest of URL is defined in CiviSeleniumTestCase base class, in
-    // class attributes.
-    $this->open($this->sboxPath);
-
     // Logging in. Remember to wait for page to load. In most cases,
     // you can rely on 30000 as the value that allows your test to pass, however,
     // sometimes your test might fail because of this. In such cases, it's better to pick one element
@@ -117,11 +87,6 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
    *  Test contact import for Month_dd_yyyy date format.
    */
   function testDateFormat_Month_dd_yyyy() {
-    // This is the path where our testing install resides.
-    // The rest of URL is defined in CiviSeleniumTestCase base class, in
-    // class attributes.
-    $this->open($this->sboxPath);
-
     // Logging in. Remember to wait for page to load. In most cases,
     // you can rely on 30000 as the value that allows your test to pass, however,
     // sometimes your test might fail because of this. In such cases, it's better to pick one element
@@ -143,11 +108,6 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
    *  Test contact import for dd_mon_yy date format.
    */
   function testDateFormat_dd_mon_yy() {
-    // This is the path where our testing install resides.
-    // The rest of URL is defined in CiviSeleniumTestCase base class, in
-    // class attributes.
-    $this->open($this->sboxPath);
-
     // Logging in. Remember to wait for page to load. In most cases,
     // you can rely on 30000 as the value that allows your test to pass, however,
     // sometimes your test might fail because of this. In such cases, it's better to pick one element
@@ -169,11 +129,6 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
    *  Test contact import for dd_mm_yyyy date format.
    */
   function testDateFormat_dd_mm_yyyy() {
-    // This is the path where our testing install resides.
-    // The rest of URL is defined in CiviSeleniumTestCase base class, in
-    // class attributes.
-    $this->open($this->sboxPath);
-
     // Logging in. Remember to wait for page to load. In most cases,
     // you can rely on 30000 as the value that allows your test to pass, however,
     // sometimes your test might fail because of this. In such cases, it's better to pick one element