Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

-- webtest cleanup (used openCiviPage function in place of open) #4

Merged
merged 1 commit into from
Mar 1, 2013
Merged

-- webtest cleanup (used openCiviPage function in place of open) #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions tests/phpunit/WebTest/Export/ContactTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function testContactExport() {
$this->waitForPageToLoad($this->getTimeoutMsec());

// Visit contact search page.
$this->open($this->sboxPath . "civicrm/contact/search?reset=1");
$this->openCiviPage("contact/search", "reset=1");
$this->waitForPageToLoad($this->getTimeoutMsec());

// Select contact type as Indiividual.
Expand Down Expand Up @@ -173,7 +173,7 @@ function testMergeHousehold() {
// We're using Quick Add block on the main page for this.
$houseHold = 'H' . substr(sha1(rand()), 0, 5) . ' House';

$this->open($this->sboxPath . 'civicrm/contact/add?reset=1&ct=Household');
$this->openCiviPage("contact/add", "reset=1&ct=Household");
$this->click('household_name');
$this->type('household_name', $houseHold);

Expand Down Expand Up @@ -221,8 +221,7 @@ function testMergeHousehold() {

$firstName2 = 'bb' . substr(sha1(rand()), 0, 5);

$this->open($this->sboxPath . 'civicrm/contact/add?reset=1&ct=Individual');
$this->waitForElementPresent('_qf_Contact_upload_view-bottom');
$this->openCiviPage("contact/add", "reset=1&ct=Individual", "_qf_Contact_upload_view-bottom");
$this->type('first_name', $firstName2);
$this->type('last_name', "Smith");
$this->type('email_1_email', "{$firstName2}[email protected]");
Expand Down Expand Up @@ -254,7 +253,7 @@ function testMergeHousehold() {
$this->click("_qf_GroupContact_next");
$this->waitForPageToLoad($this->getTimeoutMsec());

$this->open($this->sboxPath . "civicrm/contact/search?reset=1");
$this->openCiviPage("contact/search", "reset=1");
$this->waitForPageToLoad($this->getTimeoutMsec());

// Select group.
Expand Down Expand Up @@ -319,11 +318,7 @@ function testMergeHousehold() {
}

function addContactGroup($groupName = 'New Group', $parentGroupName = "- select -") {
$this->open($this->sboxPath . "civicrm/group/add?reset=1");

// As mentioned before, waitForPageToLoad is not always reliable. Below, we're waiting for the submit
// button at the end of this page to show up, to make sure it's fully loaded.
$this->waitForElementPresent("_qf_Edit_upload");
$this->openCiviPage("group/add", "reset=1", "_qf_Edit_upload");

// Fill group name.
$this->type("title", $groupName);
Expand Down
4 changes: 1 addition & 3 deletions tests/phpunit/WebTest/Generic/CheckActivityTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,8 @@ function testCheckDashboardElements() {
// We're using Quick Add block on the main page for this.
$contactFirstName2 = substr(sha1(rand()), 0, 7);
$this->webtestAddContact($contactFirstName2, "Anderson", TRUE);
$this->open($this->sboxPath . "civicrm/activity?reset=1&action=add&context=standalone");
$this->openCiviPage("activity", "reset=1&action=add&context=standalone", "_qf_Activity_upload");

// make sure the form loaded, check the end element
$this->waitForElementPresent("_qf_Activity_upload");
$this->select("activity_type_id", "label=Meeting");

$this->click("css=tr.crm-activity-form-block-target_contact_id input#token-input-contact_1");
Expand Down
23 changes: 6 additions & 17 deletions tests/phpunit/WebTest/Generic/GeneralClickAroundTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,7 @@ function testManageGroups() {
function testContributionDashboard() {
$this->login();
// Enable CiviContribute module if necessary
$this->open($this->sboxPath . "civicrm/admin/setting/component?reset=1");
$this->waitForPageToLoad($this->getTimeoutMsec());
$this->waitForElementPresent("_qf_Component_next-bottom");
$this->openCiviPage("admin/setting/component", "reset=1", "_qf_Component_next-bottom");
$enabledComponents = $this->getSelectOptions("enableComponents-t");
if (!in_array("CiviContribute", $enabledComponents)) {
$this->addSelection("enableComponents-f", "label=CiviContribute");
Expand All @@ -135,9 +133,7 @@ function testEventDashboard() {
$this->login();

// Enable CiviEvent module if necessary
$this->open($this->sboxPath . "civicrm/admin/setting/component?reset=1");
$this->waitForPageToLoad($this->getTimeoutMsec());
$this->waitForElementPresent("_qf_Component_next-bottom");
$this->openCiviPage("admin/setting/component", "reset=1", "_qf_Component_next-bottom");
$enabledComponents = $this->getSelectOptions("enableComponents-t");
if (!in_array("CiviEvent", $enabledComponents)) {
$this->addSelection("enableComponents-f", "label=CiviEvent");
Expand Down Expand Up @@ -170,9 +166,7 @@ function testMembershipsDashboard() {
$this->login();

// Enable CiviMember module if necessary
$this->open($this->sboxPath . "civicrm/admin/setting/component?reset=1");
$this->waitForPageToLoad($this->getTimeoutMsec());
$this->waitForElementPresent("_qf_Component_next-bottom");
$this->openCiviPage("admin/setting/component", "reset=1", "_qf_Component_next-bottom");
$enabledComponents = $this->getSelectOptions("enableComponents-t");
if (!in_array("CiviMember", $enabledComponents)) {
$this->addSelection("enableComponents-f", "label=CiviMember");
Expand All @@ -197,9 +191,7 @@ function testFindContributions() {
$this->login();

// Enable CiviContribute module if necessary
$this->open($this->sboxPath . "civicrm/admin/setting/component?reset=1");
$this->waitForPageToLoad($this->getTimeoutMsec());
$this->waitForElementPresent("_qf_Component_next-bottom");
$this->openCiviPage("admin/setting/component", "reset=1", "_qf_Component_next-bottom");
$enabledComponents = $this->getSelectOptions("enableComponents-t");
if (!in_array("CiviContribute", $enabledComponents)) {
$this->addSelection("enableComponents-f", "label=CiviContribute");
Expand Down Expand Up @@ -233,9 +225,7 @@ function testNewMailing() {
$this->login();

// Enable CiviMail module if necessary
$this->open($this->sboxPath . "civicrm/admin/setting/component?reset=1");
$this->waitForPageToLoad($this->getTimeoutMsec());
$this->waitForElementPresent("_qf_Component_next-bottom");
$this->openCiviPage("admin/setting/component", "reset=1", "_qf_Component_next-bottom");
$enabledComponents = $this->getSelectOptions("enableComponents-t");
if (!in_array("CiviMail", $enabledComponents)) {
$this->addSelection("enableComponents-f", "label=CiviMail");
Expand All @@ -246,8 +236,7 @@ function testNewMailing() {
}

// configure default mail-box
$this->open($this->sboxPath . "civicrm/admin/mailSettings?action=update&id=1&reset=1");
$this->waitForElementPresent('_qf_MailSettings_cancel-bottom');
$this->openCiviPage("admin/mailSettings", "action=update&id=1&reset=1", "_qf_MailSettings_cancel-bottom");
$this->type('name', 'Test Domain');
$this->type('domain', 'example.com');
$this->select('protocol', 'value=1');
Expand Down