INFRA-132 - Spaces around "."

[civicrm-core.git] / tests / phpunit / WebTest / Financial / FinancialAccountTypeTest.php

diff --git a/tests/phpunit/WebTest/Financial/FinancialAccountTypeTest.php b/tests/phpunit/WebTest/Financial/FinancialAccountTypeTest.php
index 26e786054d321f16885ebff2369dd42c61df5d85..7e0f209275ee2d536a03af23f5fbd211157e9816 100644 (file)
--- a/tests/phpunit/WebTest/Financial/FinancialAccountTypeTest.php
+++ b/tests/phpunit/WebTest/Financial/FinancialAccountTypeTest.php
@@ -2,7 +2,7 @@
 
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -32,7 +32,7 @@ require_once 'CiviTest/CiviSeleniumTestCase.php';
  */
 class WebTest_Financial_FinancialAccountTypeTest extends CiviSeleniumTestCase {
 
-  function testFinancialAccount() {
+  public function testFinancialAccount() {
     // To Add Financial Account
 
     // class attributes.
@@ -41,9 +41,9 @@ class WebTest_Financial_FinancialAccountTypeTest extends CiviSeleniumTestCase {
     $this->webtestLogin();
 
     //Add new Financial Type
-    $financialType['name'] = 'FinancialType '.substr(sha1(rand()), 0, 4);
-    $financialType['is_deductible'] = true;
-    $financialType['is_reserved'] = false;
+    $financialType['name'] = 'FinancialType ' . substr(sha1(rand()), 0, 4);
+    $financialType['is_deductible'] = TRUE;
+    $financialType['is_reserved'] = FALSE;
     $this->addeditFinancialType($financialType);
     $expected = array(
       array(
@@ -68,7 +68,7 @@ class WebTest_Financial_FinancialAccountTypeTest extends CiviSeleniumTestCase {
     $this->click("xpath=id('ltype')/div/table/tbody/tr/td[1][text()='$financialType[name]']/../td[7]/span/a[text()='Accounts']");
     $this->waitForElementPresent('newfinancialTypeAccount');
 
-    foreach ($expected as  $value => $label) {
+    foreach ($expected as $value => $label) {
       $this->verifyText("xpath=//div[@id='ltype']/div/table/tbody/tr/td[2][text()='$label[financial_account]']/../td[1]", preg_quote($label['account_relationship']));
     }
 
@@ -79,27 +79,24 @@ class WebTest_Financial_FinancialAccountTypeTest extends CiviSeleniumTestCase {
     $this->click("xpath=//div[@id='ltype']/div/table/tbody/tr/td[2][text()='Banking Fees']/../td[7]/span/a[text()='Edit']");
     $this->waitForElementPresent('_qf_FinancialTypeAccount_next');
     $this->select('account_relationship', "value=select");
-    // Because it tends to cause problems, all uses of sleep() must be justified in comments
-    // Sleep should never be used for wait for anything to load from the server
-    // Justification for this instance: FIXME
-    sleep(1);
+    $this->waitForElementPresent("xpath=//select[@id='account_relationship']/option[text()='- Select Financial Account Relationship -']");
     $this->select('account_relationship', "label=Premiums Inventory Account is");
+    $this->waitForElementPresent("xpath=//select[@id='financial_account_id']/option[3][text()='Deposit Bank Account']");
     $this->select('financial_account_id', "label=Premiums inventory");
     $this->click('_qf_FinancialTypeAccount_next');
     $this->waitForElementPresent("xpath=//div[@id='ltype']/div/table/tbody/tr/td[2][text()='Premiums inventory']/../td[7]/span/a[text()='Edit']");
     $this->verifyText("xpath=//div[@id='ltype']/div/table/tbody/tr/td[2][text()='Premiums inventory']/../td[1]", preg_quote('Premiums Inventory Account is'));
     $this->clickLink("xpath=//div[@id='ltype']/div/table/tbody/tr/td[2][text()='Premiums inventory']/../td[7]/span/a[text()='Delete']", '_qf_FinancialTypeAccount_next-botttom', FALSE);
     $this->click('_qf_FinancialTypeAccount_next-botttom');
-    $this->waitForElementPresent("newfinancialTypeAccount");
     $this->waitForText('crm-notification-container', 'Selected financial type account has been deleted.');
 
     //edit financial type
     $financialType['oldname'] = $financialType['name'];
-    $financialType['name'] = 'Edited FinancialType '.substr(sha1(rand()), 0, 4);
-    $financialType['is_deductible'] = true;
-    $financialType['is_reserved'] = false;
-    $this->addeditFinancialType($financialType , 'Edit');
+    $financialType['name'] = 'Edited FinancialType ' . substr(sha1(rand()), 0, 4);
+    $financialType['is_deductible'] = TRUE;
+    $financialType['is_reserved'] = FALSE;
+    $this->addeditFinancialType($financialType, 'Edit');
     //delete financialtype
-    $this->addeditFinancialType($financialType , 'Delete');
+    $this->addeditFinancialType($financialType, 'Delete');
   }
 }