Merge pull request #7587 from totten/master-jobproc-2m

[civicrm-core.git] / tests / phpunit / WebTest / Case / AddCaseTypeTest.php

diff --git a/tests/phpunit/WebTest/Case/AddCaseTypeTest.php b/tests/phpunit/WebTest/Case/AddCaseTypeTest.php
index 4de0a8f0a2e18dc4afed792ed714ab97576b9e5b..9390781246ca877f489535546c61912048bc40f5 100644 (file)
--- a/tests/phpunit/WebTest/Case/AddCaseTypeTest.php
+++ b/tests/phpunit/WebTest/Case/AddCaseTypeTest.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.                                    |
  |                                                                    |
@@ -91,10 +91,9 @@ class WebTest_Case_AddCaseTypeTest extends CiviSeleniumTestCase {
     $this->fillRichTextField("activity_details", $details, 'CKEditor');
     $this->type("activity_subject", $subject);
     $this->waitForElementPresent('case_type_id');
-    $this->select("case_type_id", "label={$caseTypeLabel}");
     $this->waitForElementPresent('status_id');
+    $this->select("case_type_id", "label=$caseTypeLabel");
     $this->select("status_id", "label={$caseStatusLabel}");
-
     $this->webtestFillDate('start_date', 'now');
     $today = date('F jS, Y', strtotime('now'));
 
@@ -109,16 +108,17 @@ class WebTest_Case_AddCaseTypeTest extends CiviSeleniumTestCase {
     }
 
     $this->click("xpath=//div[contains(text(), 'Roles')]");
+    $this->waitForAjaxContent();
 
     // check that expected roles are listed in the Case Roles pane
     foreach ($caseRoles as $key => $role) {
-      $this->assertText("css=div.crm-case-roles-block", $role);
+      $this->assertElementContainsText("css=div.crm-case-roles-block", $role);
     }
 
     $id = $this->urlArg('id');
     // check that expected activities are listed in the Case Activities table
     foreach ($timelineActivityTypes as $tActivityType) {
-      $this->assertText("case_id_$id", $tActivityType);
+      $this->assertElementContainsText("case_id_$id", $tActivityType);
     }
 
     // for edit case type
@@ -133,7 +133,7 @@ class WebTest_Case_AddCaseTypeTest extends CiviSeleniumTestCase {
     $this->type('title', $editCaseTypeLabel);
 
     $this->select2("xpath=//div[@id='crm-main-content-wrapper']/div/div/form/div/div[4]/table/tfoot/tr/td/span/div/a", 'Sibling of', FALSE, TRUE);
-    $this->click("xpath=//*[@id='crm-main-content-wrapper']/div/div/form/div/div[4]/table/tbody/tr[4]/td[2]/input[@type='checkbox']");
+    $this->click("xpath=//form[@name='editCaseTypeForm']/div/div[4]/table/tbody/tr[4]/td[2]/input[@type='checkbox']");
 
     $this->click("xpath=//a[text()='Standard Timeline']");
     $this->select2("xpath=//tr[@class='addRow']/td/span[@placeholder='Add activity']/div/a", 'SMS', FALSE, TRUE);