X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FWebTest%2FMember%2FInheritedMembershipTest.php;h=e76ab50d32f326ba129eec3aaad3f32a17cd0fa3;hb=9d4765a2aa7c9f5d26c76d36a9379402e986034b;hp=497bf2b16ea2f4901e68e8b91808ba041090d435;hpb=783ffa43de0ea201dd046960419e4a63c39c7876;p=civicrm-core.git

diff --git a/tests/phpunit/WebTest/Member/InheritedMembershipTest.php b/tests/phpunit/WebTest/Member/InheritedMembershipTest.php
index 497bf2b16e..e76ab50d32 100644
--- a/tests/phpunit/WebTest/Member/InheritedMembershipTest.php
+++ b/tests/phpunit/WebTest/Member/InheritedMembershipTest.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.                                    |
  |                                                                    |
@@ -41,7 +41,7 @@ class WebTest_Member_InheritedMembershipTest extends CiviSeleniumTestCase {
     $this->type('email_1_email', "$title@org.com");
     $this->click('_qf_Contact_upload_view');
     $this->waitForPageToLoad($this->getTimeoutMsec());
-    $this->assertElementContainsText('crm-notification-container', "Organization {$title} has been created.");
+    $this->waitForText('crm-notification-container', "Organization {$title} has been created.");
 
     $this->openCiviPage('admin/member/membershipType', 'reset=1&action=browse');
 
@@ -50,17 +50,14 @@ class WebTest_Member_InheritedMembershipTest extends CiviSeleniumTestCase {
 
     $this->type('name', "Membership Type $title");
 
-    $this->type('member_of_contact', $title);
-    $this->click('member_of_contact');
-    $this->waitForElementPresent("css=div.ac_results-inner li");
-    $this->click("css=div.ac_results-inner li");
+    $this->select2('member_of_contact_id', $title);
 
     $this->type('minimum_fee', '100');
     $this->select( 'financial_type_id', 'value=2' );
     $this->type('duration_interval', 1);
     $this->select('duration_unit', 'label=year');
 
-    $this->select('period_type', 'label=rolling');
+    $this->select('period_type', 'value=rolling');
 
     $this->removeSelection('relationship_type_id', 'label=- select -');
     $this->addSelection('relationship_type_id', 'label=Employer of');
@@ -69,7 +66,7 @@ class WebTest_Member_InheritedMembershipTest extends CiviSeleniumTestCase {
 
     $this->click('_qf_MembershipType_upload-bottom');
     $this->waitForElementPresent('link=Add Membership Type');
-    $this->assertElementContainsText('crm-notification-container', "The membership type 'Membership Type $title' has been saved.");
+    $this->waitForText('crm-notification-container', "Membership Type $title");
 
     $this->openCiviPage('contact/add', 'reset=1&ct=Organization', '_qf_Contact_cancel');
 
@@ -98,14 +95,13 @@ class WebTest_Member_InheritedMembershipTest extends CiviSeleniumTestCase {
 
     // Clicking save.
     $this->click('_qf_Membership_upload');
-    $this->waitForPageToLoad($this->getTimeoutMsec());
+    $this->waitForElementPresent('link=Add Membership');
 
     // page was loaded
     $this->waitForTextPresent($sourceText);
 
     // Is status message correct?
-    $this->assertElementContainsText('crm-notification-container', "Membership Type $title membership for Organization $title1 has been added.",
-      "Status message didn't show up after saving!");
+    $this->waitForText('crm-notification-container', "Membership Type $title");
 
     // click through to the membership view screen
     $this->click("xpath=//div[@id='memberships']//table//tbody/tr[1]/td[9]/span/a[text()='View']");
@@ -140,25 +136,24 @@ class WebTest_Member_InheritedMembershipTest extends CiviSeleniumTestCase {
     // visit relationship tab
     $this->click('css=li#tab_rel a');
     $this->waitForElementPresent('css=div.action-link');
-    $this->click("//div[@class='crm-container-snippet']/div/div[1]/div[1]/a/span");
-    $this->waitForPageToLoad($this->getTimeoutMsec());
+    $this->click("//div[@class='action-link']/a/span");
+    $this->waitForElementPresent('_qf_Relationship_cancel-bottom');
     $this->click('relationship_type_id');
     $this->select('relationship_type_id', 'label=Employee of');
 
-    $this->webtestFillAutocomplete($title1);
 
-    $this->waitForElementPresent('quick-save');
+    $this->select2('related_contact_id', $title1, TRUE);
 
     $description = 'Well here is some description !!!!';
     $this->type('description', $description);
 
     //save the relationship
-    $this->click('quick-save');
-    $this->waitForElementPresent('current-relationships');
+    $this->click('_qf_Relationship_upload-bottom');
+    $this->waitForElementPresent('crm-contact-relationship-selector-current_wrapper');
     //check the status message
-    $this->assertElementContainsText('crm-notification-container', 'New relationship created.');
+    $this->waitForText('crm-notification-container', 'Relationship created.');
 
-    $this->waitForElementPresent("xpath=//div[@id='current-relationships']//div//table/tbody//tr/td[9]/span/a[text()='View']");
+    $this->waitForElementPresent("xpath=//div[@id='crm-contact-relationship-selector-current_wrapper']//table/tbody//tr/td[9]/span/a[text()='View']");
 
     // click through to the membership view screen
     $this->click('css=li#tab_member a');
@@ -186,11 +181,12 @@ class WebTest_Member_InheritedMembershipTest extends CiviSeleniumTestCase {
     $this->waitForElementPresent('css=div.action-link');
 
     $this->click("//li[@id='tab_rel']/a");
-    $this->waitForElementPresent("xpath=//div[@id='current-relationships']//div//table/tbody//tr/td[9]/span/a[text()='Edit']");
-    $this->click("xpath=//div[@id='current-relationships']//div//table/tbody//tr/td[9]/span/a[text()='Edit']");
-    $matches = array();
-    preg_match('/cid=([0-9]+)/', $this->getLocation(), $matches);
-    $id = $matches[1];
+    $this->waitForElementPresent("xpath=//div[@id='crm-contact-relationship-selector-current_wrapper']//table/tbody//tr/td[9]/span/a[text()='Edit']");
+    $id = explode('&id=', $this->getAttribute("xpath=//div[@id='crm-contact-relationship-selector-current_wrapper']//table/tbody//tr/td[9]/span/a@href"));
+    $id = explode('&', $id[0]);
+    $id = explode('=', $id[2]);
+    $id = $id[1];
+    $this->click("xpath=//div[@id='crm-contact-relationship-selector-current_wrapper']//table/tbody//tr/td[9]/span/a[text()='Edit']");
 
     $this->waitForElementPresent('is_active');
     //disable relationship
@@ -198,32 +194,32 @@ class WebTest_Member_InheritedMembershipTest extends CiviSeleniumTestCase {
       $this->click('is_active');
     }
     $this->click('_qf_Relationship_upload');
-    $this->waitForElementPresent('inactive-relationships');
+    $this->waitForElementPresent('crm-contact-relationship-selector-past_wrapper');
     //check the status message
-    $this->assertElementContainsText('crm-notification-container', 'Relationship record has been updated.');
+    $this->waitForText('crm-notification-container', 'Relationship record has been updated');
 
     // click through to the membership view screen
     $this->click('css=li#tab_member a');
 
     //verify inherited membership has been removed
-    $this->openCiviPage("contact/view", "reset=1&cid=$id&selectedChild=member", "xpath=//div[@class='crm-container-snippet']/div/div[3]");
-    $this->assertElementContainsText('Memberships', 'No memberships have been recorded for this contact.');
+    $this->openCiviPage("contact/view", "reset=1&cid=$id&selectedChild=member", "xpath=//div[@class='view-content']/div[3]");
+    $this->assertElementContainsText("xpath=//div[@class='view-content']", 'No memberships have been recorded for this contact.');
 
     // visit relationship tab and re-enable the relationship
     $this->click('css=li#tab_rel a');
     $this->waitForElementPresent('css=div.action-link');
     $this->click("//li[@id='tab_rel']/a");
 
-    $this->waitForElementPresent("xpath=//div[@id='inactive-relationships']//div//table/tbody//tr/td[7]/span/a[text()='Edit']");
-    $this->click("xpath=//div[@id='inactive-relationships']//div//table/tbody//tr/td[7]/span/a[text()='Edit']");
+    $this->waitForElementPresent("xpath=//div[@id='crm-contact-relationship-selector-past_wrapper']//table/tbody//tr/td[9]/span/a[text()='Edit']");
+    $this->click("xpath=//div[@id='crm-contact-relationship-selector-past_wrapper']//table/tbody//tr/td[9]/span/a[text()='Edit']");
     $this->waitForElementPresent('is_active');
     if (!$this->isChecked('is_active')) {
       $this->click('is_active');
     }
     $this->click('_qf_Relationship_upload');
-    $this->waitForElementPresent('current-relationships');
+    $this->waitForElementPresent('crm-contact-relationship-selector-current_wrapper');
     //check the status message
-    $this->assertElementContainsText('crm-notification-container', 'Relationship record has been updated.');
+    $this->waitForText('crm-notification-container', 'Relationship record has been updated.');
 
     //check for memberships
     $this->click('css=li#tab_member a');
@@ -233,38 +229,310 @@ class WebTest_Member_InheritedMembershipTest extends CiviSeleniumTestCase {
     //disable relationship
     $this->click('css=li#tab_rel a');
     $this->waitForElementPresent('css=div.action-link');
-    $this->waitForElementPresent("xpath=//div[@id='current-relationships']//div//table/tbody//tr/td[9]/span[2][text()='more']/ul/li[1]/a[text()='Disable']");
-    $this->click("xpath=//div[@id='current-relationships']//div//table/tbody//tr/td[9]/span[2][text()='more']/ul/li[1]/a[text()='Disable']");
-
-    $this->assertTrue((bool)preg_match("/^Are you sure you want to disable this relationship?[\s\S]$/",
-        $this->getConfirmation()
-      ));
-    $this->chooseOkOnNextConfirmation();
+    $this->waitForElementPresent("xpath=//div[@id='crm-contact-relationship-selector-current_wrapper']//table/tbody//tr/td[9]/span[2][text()='more']/ul/li[1]/a[text()='Disable']");
+    $this->click("xpath=//div[@id='crm-contact-relationship-selector-current_wrapper']//table/tbody//tr/td[9]/span[2][text()='more']/ul/li[1]/a[text()='Disable']");
+    $this->waitForText("xpath=//div[@class='crm-confirm-dialog ui-dialog-content ui-widget-content modal-dialog']", 'Are you sure you want to disable this record?');
+    $this->click("xpath=//div[@class='ui-dialog-buttonset']//button//span[text()='Disable']");
     // 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(10);
 
     //verify inherited membership has been removed
-    $this->openCiviPage("contact/view", "reset=1&cid={$id}&selectedChild=member", "xpath=//div[@class='crm-container-snippet']/div/div[3]");
-    $this->assertElementContainsText('Memberships', 'No memberships have been recorded for this contact.');
+    $this->openCiviPage("contact/view", "reset=1&cid={$id}&selectedChild=member", "xpath=//div[@class='view-content']/div[3]");
+    $this->assertElementContainsText("xpath=//div[@class='view-content']/div[3]", 'No memberships have been recorded for this contact.');
 
     //enable relationship
     $this->click('css=li#tab_rel a');
     $this->waitForElementPresent('css=div.action-link');
 
-    $this->waitForElementPresent("xpath=//div[@id='inactive-relationships']//div//table/tbody//tr/td[7]/span[2][text()='more']/ul/li[1]/a[text()='Enable']");
-    $this->click("xpath=//div[@id='inactive-relationships']//div//table/tbody//tr/td[7]/span[2][text()='more']/ul/li[1]/a[text()='Enable']");
-
-    $this->assertTrue((bool)preg_match("/^Are you sure you want to re-enable this relationship?[\s\S]$/",
-        $this->getConfirmation()
-      ));
-    $this->chooseOkOnNextConfirmation();
-    $this->waitForPageToLoad($this->getTimeoutMsec());
+    $this->waitForElementPresent("xpath=//div[@id='crm-contact-relationship-selector-past_wrapper']//table/tbody//tr/td[9]/span[2][text()='more']/ul/li[1]/a[text()='Enable']");
+    $this->click("xpath=//div[@id='crm-contact-relationship-selector-past_wrapper']//table/tbody//tr/td[9]/span[2][text()='more']/ul/li[1]/a[text()='Enable']");
 
     //verify membership
     $this->click('css=li#tab_member a');
     $this->waitForElementPresent('css=div#memberships');
   }
+
+  /*
+   * Webtest for CRM-10146
+   *
+   */
+  function testInheritedMembershipActivity() {
+    // Log in using webtestLogin() method
+    $this->webtestLogin();
+
+    $this->openCiviPage('contact/add', 'reset=1&ct=Organization', '_qf_Contact_cancel');
+
+    $title = substr(sha1(rand()), 0, 7);
+    $this->type('organization_name', "Organization $title");
+    $this->type('email_1_email', "$title@org.com");
+    $this->clickLink('_qf_Contact_upload_view');
+    $this->waitForText('crm-notification-container', "Organization {$title} has been created.");
+
+    $this->openCiviPage('admin/member/membershipType', 'reset=1&action=browse');
+
+    $this->click('link=Add Membership Type');
+    $this->waitForElementPresent('_qf_MembershipType_cancel-bottom');
+
+    $this->type('name', "Membership Type $title");
+
+    $this->select2('member_of_contact_id', $title);
+
+    $this->type('minimum_fee', '100');
+    $this->select('financial_type_id', 'label=Member Dues');
+    $this->type('duration_interval', 1);
+    $this->select('duration_unit', 'label=year');
+
+    $this->select('period_type', 'value=rolling');
+
+    $this->removeSelection('relationship_type_id', 'label=- select -');
+    $this->addSelection('relationship_type_id', 'label=Employer of');
+
+    $this->type('max_related', '5');
+
+    $this->click('_qf_MembershipType_upload-bottom');
+    $this->waitForElementPresent('link=Add Membership Type');
+    $this->waitForText('crm-notification-container', "Membership Type $title");
+
+    // creating another Orgnization
+    $this->openCiviPage('contact/add', 'reset=1&ct=Organization', '_qf_Contact_cancel');
+    $org1 = substr(sha1(rand()), 0, 7);
+    $this->type('organization_name', "Organization $org1");
+    $this->type('email_1_email', "$org1@org.com");
+    $this->clickLink('_qf_Contact_upload_view');
+
+    // click through to the membership view screen
+    $this->click('css=li#tab_member a');
+
+    $this->waitForElementPresent('link=Add Membership');
+    $this->click('link=Add Membership');
+
+    $this->waitForElementPresent('_qf_Membership_cancel-bottom');
+
+    // fill in Membership Organization and Type
+    $this->select('membership_type_id[0]', "label=Organization $title");
+    $this->select('membership_type_id[1]', "label=Membership Type $title");
+
+    $sourceText = 'Membership ContactAddTest with Rolling Membership Type';
+    // fill in Source
+    $this->type('source', $sourceText);
+
+    // Clicking save.
+    $this->click('_qf_Membership_upload');
+
+    // page was loaded
+    $this->waitForTextPresent($sourceText);
+
+    // Is status message correct?
+    $this->waitForText('crm-notification-container', "Membership Type $title");
+
+    // Adding contact
+    $this->openCiviPage('contact/add', 'reset=1&ct=Individual', '_qf_Contact_cancel-bottom');
+    $firstName = substr(sha1(rand()), 0, 7);
+    $lastName = 'Anderson';
+    $email = "$firstName@anderson.name";
+    $this->type("first_name", $firstName);
+    $this->type("last_name", $lastName);
+
+    // Set Current Employer
+    $this->select2('employer_id', $org1);
+    $this->waitForText('s2id_employer_id', $org1);
+
+    $this->type("email_1_email", $email);
+    $this->clickLink("_qf_Contact_upload_view-bottom");
+    $cid = $this->urlArg('cid');
+
+    // click through to the membership view screen
+    $this->click('css=li#tab_member a');
+    $this->waitForElementPresent("xpath=//div[@id='memberships']//table//tbody/tr[1]/td[9]/span/a[text()='View']");
+
+    // check number of membership for contact
+    $this->assertEquals(1, $this->getText("xpath=//li[@id='tab_member']/a/em"));
+
+    $this->clickLink("xpath=//div[@id='memberships']//table//tbody/tr[1]/td[9]/span/a[text()='View']");
+    $expectedMembershipId = $this->urlArg('id');
+    $this->clickLink("_qf_MembershipView_cancel-bottom");
+
+    // click through to the activity view screen
+    $this->click('css=li#tab_activity a');
+    $this->waitForElementPresent("xpath=//table[@id='contact-activity-selector-activity']/tbody//tr/td[8]/span/a[text()='View']");
+
+    // check number of activity for contact
+    $this->assertEquals(1, $this->getText("xpath=//li[@id='tab_activity']/a/em"));
+
+    $this->clickLink("xpath=//table[@id='contact-activity-selector-activity']/tbody//tr/td[8]/span/a[text()='View']");
+    $expectedMembershipActivityId = $this->urlArg('id');
+    $this->clickLink("_qf_MembershipView_cancel-bottom");
+
+    // verify membership id with membership activity id
+    $this->assertEquals($expectedMembershipId, $expectedMembershipActivityId);
+
+    // click through to the relationship view screen
+    $this->click('css=li#tab_rel a');
+    $this->waitForElementPresent("xpath=//div[@id='option11_wrapper']/table/tbody/tr/td[2]/a");
+    $this->assertTrue($this->isElementPresent("xpath=//div[@id='option11_wrapper']/table/tbody/tr/td[2]/a[text()='Organization $org1']"));
+    $this->assertEquals(1, $this->getText("xpath=//li[@id='tab_rel']/a/em"));
+
+    // Edit Contact but do not change any field
+    $this->waitForElementPresent("xpath=//ul[@id='actions']/li[2]/a/span");
+    $this->clickLink("xpath=//ul[@id='actions']/li[2]/a/span");
+    $this->waitForElementPresent('_qf_Contact_cancel-bottom');
+    $this->clickLink("_qf_Contact_upload_view-top");
+
+    // click through to the membership view screen after edit
+    $this->click('css=li#tab_member a');
+    $this->waitForElementPresent("xpath=//div[@id='memberships']//table//tbody/tr[1]/td[9]/span/a[text()='View']");
+    $this->assertEquals(1, $this->getText("xpath=//li[@id='tab_member']/a/em"));
+    $this->clickLink("xpath=//div[@id='memberships']//table//tbody/tr[1]/td[9]/span/a[text()='View']");
+    $actualMembershipId1 = $this->urlArg('id');
+    $this->clickLink("_qf_MembershipView_cancel-bottom");
+
+    // click through to the activity view screen after edit
+    $this->click('css=li#tab_activity a');
+    $this->waitForElementPresent("xpath=//table[@id='contact-activity-selector-activity']/tbody//tr/td[8]/span/a[text()='View']");
+    $this->assertEquals(1, $this->getText("xpath=//li[@id='tab_activity']/a/em"));
+    $this->clickLink("xpath=//table[@id='contact-activity-selector-activity']/tbody//tr/td[8]/span/a[text()='View']");
+    $actualMembershipActivityId1 = $this->urlArg('id');
+    $this->clickLink("_qf_MembershipView_cancel-bottom");
+
+    // verify membership id and membership activity id with previous one
+    $this->assertEquals($expectedMembershipId, $actualMembershipId1);
+    $this->assertEquals($expectedMembershipId, $actualMembershipActivityId1);
+
+    // click through to the relationship view screen after edit
+    $this->click('css=li#tab_rel a');
+    $this->waitForElementPresent("xpath=//div[@id='option11_wrapper']/table/tbody/tr/td[2]/a");
+    $this->assertTrue($this->isElementPresent("xpath=//div[@id='option11_wrapper']/table/tbody/tr/td[2]/a[text()='Organization $org1']"));
+    $this->assertEquals(1, $this->getText("xpath=//li[@id='tab_rel']/a/em"));
+
+    // change the current employer of the contact
+    // creating another membership type
+    $this->openCiviPage('admin/member/membershipType', 'reset=1&action=browse');
+
+    $this->click('link=Add Membership Type');
+    $this->waitForElementPresent('_qf_MembershipType_cancel-bottom');
+
+    $this->type('name', "Membership Type Another $title");
+
+    $this->type('member_of_contact', $title);
+    $this->click('member_of_contact');
+    $this->waitForElementPresent("css=div.ac_results-inner li");
+    $this->click("css=div.ac_results-inner li");
+
+    $this->type('minimum_fee', '100');
+    $this->select('financial_type_id', 'label=Member Dues');
+    $this->type('duration_interval', 1);
+    $this->select('duration_unit', 'label=year');
+
+    $this->select('period_type', 'label=rolling');
+
+    $this->removeSelection('relationship_type_id', 'label=- select -');
+    $this->addSelection('relationship_type_id', 'label=Employer of');
+
+    $this->type('max_related', '5');
+
+    $this->click('_qf_MembershipType_upload-bottom');
+    $this->waitForElementPresent('link=Add Membership Type');
+    $this->waitForText('crm-notification-container', "Membership Type Another $title");
+
+    // creating another Orgnization
+    $this->openCiviPage('contact/add', 'reset=1&ct=Organization', '_qf_Contact_cancel');
+    $org2 = substr(sha1(rand()), 0, 7);
+    $this->type('organization_name', "Organization $org2");
+    $this->type('email_1_email', "$org2@org.com");
+    $this->clickLink('_qf_Contact_upload_view');
+
+    // click through to the membership view screen
+    $this->click('css=li#tab_member a');
+    $this->waitForElementPresent('link=Add Membership');
+    $this->click('link=Add Membership');
+    $this->waitForElementPresent('_qf_Membership_cancel-bottom');
+
+    // fill in Membership Organization and Type
+    $this->select('membership_type_id[0]', "label=Organization $title");
+    $this->select('membership_type_id[1]', "label=Membership Type Another $title");
+
+    $sourceText = 'Membership ContactAddTest with Rolling Membership Type';
+    $this->type('source', $sourceText);
+    $this->clickLink('_qf_Membership_upload');
+    $this->waitForTextPresent($sourceText);
+
+    // Is status message correct?
+    $this->waitForText('crm-notification-container', "Membership Type Another $title");
+
+    // edit contact
+    $this->openCiviPage("contact/add", "reset=1&action=update&cid=$cid", "_qf_Contact_cancel-bottom");
+
+    // change Current Employer
+    $this->type('current_employer', '');
+    $this->click('current_employer');
+    $this->type('current_employer', $org2);
+    $this->click('current_employer');
+    $this->waitForElementPresent("css=div.ac_results-inner li");
+    $this->click("css=div.ac_results-inner li");
+    $this->clickLink("_qf_Contact_upload_view-bottom");
+
+    // click through to the membership view screen
+    $this->click('css=li#tab_member a');
+    $this->waitForElementPresent("xpath=//div[@id='memberships']//table//tbody/tr[1]/td[9]/span/a[text()='View']");
+    $this->assertEquals(1, $this->getText("xpath=//li[@id='tab_member']/a/em"));
+    $this->clickLink("xpath=//div[@id='memberships']//table//tbody/tr[1]/td[9]/span/a[text()='View']");
+    $actualMembershipId2 = $this->urlArg('id');
+    $this->clickLink("_qf_MembershipView_cancel-bottom");
+
+    // click through to the activity view screen
+    $this->click('css=li#tab_activity a');
+    $this->waitForElementPresent("xpath=//table[@id='contact-activity-selector-activity']/tbody//tr/td[8]/span/a[text()='View']");
+    $this->assertEquals(1, $this->getText("xpath=//li[@id='tab_activity']/a/em"));
+    $this->clickLink("xpath=//table[@id='contact-activity-selector-activity']/tbody//tr/td[8]/span/a[text()='View']");
+    $actualMembershipActivityId2 = $this->urlArg('id');
+    $this->clickLink("_qf_MembershipView_cancel-bottom");
+
+    // verify membership id and membership activity id with previous one
+    $this->assertNotEquals($expectedMembershipId, $actualMembershipId2);
+    $this->assertNotEquals($expectedMembershipId, $actualMembershipActivityId2);
+
+    // click through to the relationship view screen
+    $this->click('css=li#tab_rel a');
+    $this->waitForElementPresent("xpath=//div[@id='option11_wrapper']/table/tbody/tr/td[2]/a");
+    $this->assertTrue($this->isElementPresent("xpath=//div[@id='option11_wrapper']/table/tbody/tr/td[2]/a[text()='Organization $org2']"));
+    $this->assertEquals(1, $this->getText("xpath=//li[@id='tab_rel']/a/em"));
+
+    // creating another Orgnization with no membership
+    $this->openCiviPage('contact/add', 'reset=1&ct=Organization', '_qf_Contact_cancel');
+    $org3 = substr(sha1(rand()), 0, 7);
+    $this->type('organization_name', "Organization $org3");
+    $this->type('email_1_email', "$org3@org.com");
+    $this->clickLink('_qf_Contact_upload_view');
+
+    // edit contact
+    $this->openCiviPage("contact/add", "reset=1&action=update&cid=$cid", "_qf_Contact_cancel-bottom");
+
+    // change Current Employer
+    $this->type('current_employer', '');
+    $this->click('current_employer');
+    $this->type('current_employer', $org3);
+    $this->click('current_employer');
+    $this->waitForElementPresent("css=div.ac_results-inner li");
+    $this->click("css=div.ac_results-inner li");
+    $this->clickLink("_qf_Contact_upload_view-bottom");
+
+    // click through to the membership view screen
+    $this->click('css=li#tab_member a');
+    $this->waitForText("xpath=//div[@id='Memberships']/div/div/div[3]", "No memberships have been recorded for this contact.");
+    $this->assertEquals(0, $this->getText("xpath=//li[@id='tab_member']/a/em"));
+
+    // click through to the activity view screen
+    $this->click('css=li#tab_activity a');
+    $this->waitForText("xpath=//table[@id='contact-activity-selector-activity']/tbody/tr/td", "No matches found.");
+    $this->assertEquals(0, $this->getText("xpath=//li[@id='tab_activity']/a/em"));
+
+    // click through to the relationship view screen
+    $this->click('css=li#tab_rel a');
+    $this->waitForElementPresent("xpath=//div[@id='option11_wrapper']/table/tbody/tr/td[2]/a");
+    $this->assertTrue($this->isElementPresent("xpath=//div[@id='option11_wrapper']/table/tbody/tr/td[2]/a[text()='Organization $org3']"));
+    $this->assertEquals(1, $this->getText("xpath=//li[@id='tab_rel']/a/em"));
+  }
 }