Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-16-01-08-03

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

diff --git a/tests/phpunit/WebTest/Contact/ProfileChecksumTest.php b/tests/phpunit/WebTest/Contact/ProfileChecksumTest.php
index 423d675bffb6cc45f53606d7c527233e9c8fd011..2c661451abbecbe1baf12c37d8d7fb6fe477788a 100644 (file)
--- a/tests/phpunit/WebTest/Contact/ProfileChecksumTest.php
+++ b/tests/phpunit/WebTest/Contact/ProfileChecksumTest.php
@@ -25,6 +25,10 @@
 */
 
 require_once 'CiviTest/CiviSeleniumTestCase.php';
+
+/**
+ * Class WebTest_Contact_ProfileChecksumTest
+ */
 class WebTest_Contact_ProfileChecksumTest extends CiviSeleniumTestCase {
 
   protected function setUp() {
@@ -66,16 +70,6 @@ class WebTest_Contact_ProfileChecksumTest extends CiviSeleniumTestCase {
         'update_value' => substr(sha1(rand()), 0, 7),
         'element_name' => 'city-Primary',
       ),
-      'state_province' => array(
-        'type' => 'Contact',
-        'label' => 'State',
-        'location' => 0,
-        'default_value' => '1004',
-        'update_value' => '1031',
-        'update_value_label' => 'NY',
-        'element_name' => 'state_province-Primary',
-        'html_type' => 'select',
-      ),
       'country' => array(
         'type' => 'Contact',
         'label' => 'Country',
@@ -86,6 +80,16 @@ class WebTest_Contact_ProfileChecksumTest extends CiviSeleniumTestCase {
         'element_name' => 'country-Primary',
         'html_type' => 'select',
       ),
+      'state_province' => array(
+        'type' => 'Contact',
+        'label' => 'State',
+        'location' => 0,
+        'default_value' => '1004',
+        'update_value' => '1031',
+        'update_value_label' => 'NY',
+        'element_name' => 'state_province-Primary',
+        'html_type' => 'select',
+      ),
     );
 
     // Create a contact.
@@ -99,7 +103,7 @@ class WebTest_Contact_ProfileChecksumTest extends CiviSeleniumTestCase {
     $profileId = $this->_testCreateContactProfile($fields, $profileName);
 
     // Check for profile create/edit permissions.
-    $permission = array('edit-1-profile-edit', 'edit-1-profile-create', 'edit-1-access-all-custom-data');
+    $permission = array('edit-1-profile-edit', 'edit-1-profile-create', 'edit-1-access-all-custom-data', 'edit-1-edit-all-contacts');
     $this->changePermissions($permission);
 
     // Get checksum of the newly created contact.
@@ -116,6 +120,7 @@ class WebTest_Contact_ProfileChecksumTest extends CiviSeleniumTestCase {
     foreach ($fields as $field) {
       $this->assertTrue($this->isElementPresent($field['element_name']), "Missing Field: {$field['label']}.");
       if (isset($field['html_type']) && $field['html_type'] == 'select') {
+        $this->waitForVisible($field['element_name']);
         $this->select($field['element_name'], "value={$field['update_value']}");
       }
       else {
@@ -137,6 +142,12 @@ class WebTest_Contact_ProfileChecksumTest extends CiviSeleniumTestCase {
     $this->assertStringsPresent($checkFieldValues);
   }
 
+  /**
+   * @param $fields
+   * @param string $profileName
+   *
+   * @return null
+   */
   function _testCreateContactProfile($fields, $profileName) {
     // Add new profile.
     $this->openCiviPage("admin/uf/group", "reset=1");
@@ -145,6 +156,7 @@ class WebTest_Contact_ProfileChecksumTest extends CiviSeleniumTestCase {
 
     // Name of the profile.
     $this->type('title', $profileName);
+    $this->click('uf_group_type_Profile');
     $this->click('_qf_Group_next-top');
     $this->waitForPageToLoad($this->getTimeoutMsec());
     $profileId = $this->urlArg('gid');