Merge pull request #9566 from totten/master-19690-layout

[civicrm-core.git] / tests / phpunit / WebTest / Contact / AddTest.php

diff --git a/tests/phpunit/WebTest/Contact/AddTest.php b/tests/phpunit/WebTest/Contact/AddTest.php
index f2d546c68e7548bde32a85ae54754da023ac9f72..6c93ca12ac3cad0db5b0fdadd816b9139908189b 100644 (file)
--- a/tests/phpunit/WebTest/Contact/AddTest.php
+++ b/tests/phpunit/WebTest/Contact/AddTest.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2017                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -43,7 +43,9 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase {
     // go to display preferences to enable Open ID field
     $this->openCiviPage('admin/setting/preferences/display', "reset=1", "_qf_Display_next-bottom");
     $this->waitForAjaxContent();
-    $this->click("xpath=//ul[@id='contactEditBlocks']//li/span/label[text()='Open ID']");
+    if (!$this->isChecked("xpath=//ul[@id='contactEditBlocks']//li[@id='preference-10-contactedit']/span/input")) {
+      $this->click("xpath=//ul[@id='contactEditBlocks']//li/span/label[text()='Open ID']");
+    }
     $this->click("_qf_Display_next-bottom");
     $this->waitForPageToLoad($this->getTimeoutMsec());
     $this->openCiviPage('contact/add', 'reset=1&ct=Individual');
@@ -180,7 +182,9 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase {
     // go to display preferences to enable Open ID field
     $this->openCiviPage('admin/setting/preferences/display', "reset=1", "_qf_Display_next-bottom");
     $this->waitForAjaxContent();
-    $this->click("xpath=//ul[@id='contactEditBlocks']//li/span/label[text()='Open ID']");
+    if (!$this->isChecked("xpath=//ul[@id='contactEditBlocks']//li[@id='preference-10-contactedit']/span/input")) {
+      $this->click("xpath=//ul[@id='contactEditBlocks']//li/span/label[text()='Open ID']");
+    }
     $this->click("_qf_Display_next-bottom");
     $this->waitForPageToLoad($this->getTimeoutMsec());
 
@@ -292,7 +296,9 @@ class WebTest_Contact_AddTest extends CiviSeleniumTestCase {
     // go to display preferences to enable Open ID field
     $this->openCiviPage('admin/setting/preferences/display', "reset=1", "_qf_Display_next-bottom");
     $this->waitForAjaxContent();
-    $this->click("xpath=//ul[@id='contactEditBlocks']//li/span/label[text()='Open ID']");
+    if (!$this->isChecked("xpath=//ul[@id='contactEditBlocks']//li[@id='preference-10-contactedit']/span/input")) {
+      $this->click("xpath=//ul[@id='contactEditBlocks']//li/span/label[text()='Open ID']");
+    }
     $this->click("_qf_Display_next-bottom");
     $this->waitForPageToLoad($this->getTimeoutMsec());