projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7fadc48
)
Core Bugs and Webtest fixes in 4.7beta1
author
monishdeb
<monish.deb@webaccessglobal.com>
Mon, 9 Nov 2015 14:57:42 +0000
(20:27 +0530)
committer
monishdeb
<monish.deb@webaccessglobal.com>
Mon, 9 Nov 2015 14:57:42 +0000
(20:27 +0530)
CRM/Case/Form/Case.php
patch
|
blob
|
blame
|
history
CRM/Contribute/Form/Contribution/Main.php
patch
|
blob
|
blame
|
history
tests/phpunit/WebTest/Case/AddCaseTest.php
patch
|
blob
|
blame
|
history
tests/phpunit/WebTest/Contribute/OnlineMultiplePaymentProcessorTest.php
patch
|
blob
|
blame
|
history
tests/phpunit/WebTest/Import/ImportCiviSeleniumTestCase.php
patch
|
blob
|
blame
|
history
tests/phpunit/WebTest/Mailing/MailingTest.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Case/Form/Case.php
b/CRM/Case/Form/Case.php
index 059fe437c781c1b2c7a524b6aa746f1b189f4257..6d54dbae270d63c3e44f0fb79df27df8f8382589 100644
(file)
--- a/
CRM/Case/Form/Case.php
+++ b/
CRM/Case/Form/Case.php
@@
-179,15
+179,10
@@
class CRM_Case_Form_Case extends CRM_Core_Form {
$className::preProcess($this);
$activityGroupTree = $this->_groupTree;
$className::preProcess($this);
$activityGroupTree = $this->_groupTree;
- if (!$this->_caseTypeId) {
- $params = CRM_Utils_Request::exportValues();
- if (isset($params['case_type_id'])) {
- $this->_caseTypeId = $params['case_type_id'];
- }
- }
// for case custom fields to populate with defaults
if (!empty($_POST['hidden_custom'])) {
// for case custom fields to populate with defaults
if (!empty($_POST['hidden_custom'])) {
- CRM_Custom_Form_CustomData::preProcess($this, NULL, $this->_caseTypeId, 1, 'Case', $this->_caseId);
+ $params = CRM_Utils_Request::exportValues();
+ CRM_Custom_Form_CustomData::preProcess($this, NULL, CRM_Utils_Array::value('case_type_id', $params, $this->_caseTypeId), 1, 'Case', $this->_caseId);
CRM_Custom_Form_CustomData::buildQuickForm($this);
}
CRM_Custom_Form_CustomData::buildQuickForm($this);
}
diff --git
a/CRM/Contribute/Form/Contribution/Main.php
b/CRM/Contribute/Form/Contribution/Main.php
index ea99fd3032f2609ca826c420a8278116b13970f8..81995735bdcf718dba445511e29c9e99768eb5dd 100644
(file)
--- a/
CRM/Contribute/Form/Contribution/Main.php
+++ b/
CRM/Contribute/Form/Contribution/Main.php
@@
-1039,7
+1039,7
@@
class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
if (($this->_values['is_pay_later'] &&
empty($this->_paymentProcessor) &&
!array_key_exists('hidden_processor', $params)) ||
if (($this->_values['is_pay_later'] &&
empty($this->_paymentProcessor) &&
!array_key_exists('hidden_processor', $params)) ||
- (
!empty($params['payment_processor_id']) && $params['payment_processor_id']
== 0)
+ (
CRM_Utils_Array::value('payment_processor_id', $params)
== 0)
) {
$params['is_pay_later'] = 1;
}
) {
$params['is_pay_later'] = 1;
}
diff --git
a/tests/phpunit/WebTest/Case/AddCaseTest.php
b/tests/phpunit/WebTest/Case/AddCaseTest.php
index 31b111cbae048f49050ada1ec66033189d0777ca..89943c3d29647b7ac89220d95a19c48947585d43 100644
(file)
--- a/
tests/phpunit/WebTest/Case/AddCaseTest.php
+++ b/
tests/phpunit/WebTest/Case/AddCaseTest.php
@@
-190,6
+190,8
@@
class WebTest_Case_AddCaseTest extends CiviSeleniumTestCase {
*/
public function _testVerifyCaseRoles($caseRoles, $creatorName) {
$id = $this->urlArg('id');
*/
public function _testVerifyCaseRoles($caseRoles, $creatorName) {
$id = $this->urlArg('id');
+ $this->click('css=div.crm-case-roles-block div.crm-accordion-header');
+
$this->waitForElementPresent("xpath=//table[@id='caseRoles-selector-$id']/tbody/tr[4]/td[2]/a");
// check that expected roles are listed in the Case Roles pane
foreach ($caseRoles as $role) {
$this->waitForElementPresent("xpath=//table[@id='caseRoles-selector-$id']/tbody/tr[4]/td[2]/a");
// check that expected roles are listed in the Case Roles pane
foreach ($caseRoles as $role) {
@@
-228,7
+230,7
@@
class WebTest_Case_AddCaseTest extends CiviSeleniumTestCase {
// Probably don't need both tableId and prefix - but good examples for other situations where only one can be used
$this->webtestVerifyTabularData($openCaseData, '', $activityViewTableId);
// Probably don't need both tableId and prefix - but good examples for other situations where only one can be used
$this->webtestVerifyTabularData($openCaseData, '', $activityViewTableId);
- $this->click("xpath=//span[@class='ui-button-icon-primary ui-icon
ui-icon-closethick
']");
+ $this->click("xpath=//span[@class='ui-button-icon-primary ui-icon
fa-times
']");
}
/**
}
/**
diff --git
a/tests/phpunit/WebTest/Contribute/OnlineMultiplePaymentProcessorTest.php
b/tests/phpunit/WebTest/Contribute/OnlineMultiplePaymentProcessorTest.php
index e2e63971f18110b15f7353010e6f4bc3d6375ca9..5913088d622773be60350504d42dec2c49603b97 100644
(file)
--- a/
tests/phpunit/WebTest/Contribute/OnlineMultiplePaymentProcessorTest.php
+++ b/
tests/phpunit/WebTest/Contribute/OnlineMultiplePaymentProcessorTest.php
@@
-174,15
+174,15
@@
class WebTest_Contribute_OnlineMultiplePaymentProcessorTest extends CiviSelenium
$xpath = "xpath=//label[text() = '{$payLaterText}']/preceding-sibling::input[1]";
$this->click($xpath);
$xpath = "xpath=//label[text() = '{$payLaterText}']/preceding-sibling::input[1]";
$this->click($xpath);
- $this->clickLink("_qf_Main_upload-bottom", "_qf_Confirm_next-bottom");
+ $this->click("_qf_Main_upload-bottom");
+ $this->waitForElementPresent("xpath=//div[@class='bold pay_later_receipt-section']");
$payLaterInstructionsText = "Pay later instructions $hash";
$this->verifyText("xpath=//div[@class='bold pay_later_receipt-section']/p", $payLaterInstructionsText);
$payLaterInstructionsText = "Pay later instructions $hash";
$this->verifyText("xpath=//div[@class='bold pay_later_receipt-section']/p", $payLaterInstructionsText);
-
$this->click("_qf_Confirm_next-bottom");
$this->click("_qf_Confirm_next-bottom");
- $this->waitForPageToLoad($this->getTimeoutMsec());
- $this->verifyText("xpath=//div[@id='help']/div/p", $payLaterInstructionsText);
+ $this->waitForElementPresent("xpath=//div[@class='help']/div/p");
+ $this->verifyText("xpath=//div[@class='help']/div/p", $payLaterInstructionsText);
//login to check contribution
$this->openCiviPage("contribute/search", "reset=1", 'contribution_date_low');
//login to check contribution
$this->openCiviPage("contribute/search", "reset=1", 'contribution_date_low');
diff --git
a/tests/phpunit/WebTest/Import/ImportCiviSeleniumTestCase.php
b/tests/phpunit/WebTest/Import/ImportCiviSeleniumTestCase.php
index c6178f2f4230532f12106035adfe8996b3d8442a..54e4c9d168d2d8930ad9846012dfd0366fc1f1e9 100644
(file)
--- a/
tests/phpunit/WebTest/Import/ImportCiviSeleniumTestCase.php
+++ b/
tests/phpunit/WebTest/Import/ImportCiviSeleniumTestCase.php
@@
-458,9
+458,9
@@
class ImportCiviSeleniumTestCase extends CiviSeleniumTestCase {
public function _getImportComponentContactType($component, $contactType) {
$importComponentMode = array(
'Event' => array(
public function _getImportComponentContactType($component, $contactType) {
$importComponentMode = array(
'Event' => array(
- 'Individual' => 'CIVICRM_QFID_1_
18
',
- 'Household' => 'CIVICRM_QFID_2_2
0
',
- 'Organization' => 'CIVICRM_QFID_4_2
2
',
+ 'Individual' => 'CIVICRM_QFID_1_
20
',
+ 'Household' => 'CIVICRM_QFID_2_2
2
',
+ 'Organization' => 'CIVICRM_QFID_4_2
4
',
),
'Contribution' => array(
'Individual' => 'CIVICRM_QFID_1_18',
),
'Contribution' => array(
'Individual' => 'CIVICRM_QFID_1_18',
diff --git
a/tests/phpunit/WebTest/Mailing/MailingTest.php
b/tests/phpunit/WebTest/Mailing/MailingTest.php
index fbe077547bc0a3586266408c84552bf315956282..068d3d94dd940a0d9c63452106305cb17980a6ee 100644
(file)
--- a/
tests/phpunit/WebTest/Mailing/MailingTest.php
+++ b/
tests/phpunit/WebTest/Mailing/MailingTest.php
@@
-420,7
+420,8
@@
class WebTest_Mailing_MailingTest extends CiviSeleniumTestCase {
$summaryInfoLinks = array(
'Intended Recipients',
'Successful Deliveries',
$summaryInfoLinks = array(
'Intended Recipients',
'Successful Deliveries',
- 'Tracked Opens',
+ 'Unique Opens', //as per CRM-16506- Fixed and improve mailing stats changes
+ 'Total Opens',
'Click-throughs',
'Forwards',
'Replies',
'Click-throughs',
'Forwards',
'Replies',
@@
-457,7
+458,7
@@
class WebTest_Mailing_MailingTest extends CiviSeleniumTestCase {
'Mailing Delivery -' => "Successful",
),
),
'Mailing Delivery -' => "Successful",
),
),
- '
Tracked
Opens' => array(
+ '
Unique
Opens' => array(
'report' => array('report_name' => 'Mail Opened', 'Mailing' => "Mailing $mailingName Webtest"),
'search' => array(
'Mailing Name IN' => "\"Mailing {$mailingName} Webtest",
'report' => array('report_name' => 'Mail Opened', 'Mailing' => "Mailing $mailingName Webtest"),
'search' => array(
'Mailing Name IN' => "\"Mailing {$mailingName} Webtest",