return to the contrib edit form

diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index fd2ba2b43372be2903b9e5964b16bdd40a9a47cc..4d509a865d6b83546598a24d75525c79892a8a99 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -184,7 +184,7 @@
         <td>
         {if $contactId && $contribID && $contributionMode EQ null && $contribution_status_id eq 2}
           {capture assign=payNowLink}{crmURL p='civicrm/contact/view/contribution' q="reset=1&action=update&id=`$contribID`&cid=`$contactId`&context=`$context`&mode=live"}{/capture}
-          <a class="open-inline-noreturn action-item crm-hover-button" href="{$payNowLink}">&raquo; {ts}Pay with Credit Card{/ts}</a>
+          <a class="open-inline action-item crm-hover-button" href="{$payNowLink}">&raquo; {ts}Pay with Credit Card{/ts}</a>
         {/if}
       </td>
       </tr>

diff --git a/tests/phpunit/WebTest/Contribute/UpdatePendingContributionTest.php b/tests/phpunit/WebTest/Contribute/UpdatePendingContributionTest.php
index edaee81c30b4dd98dce1fd3ee52c2c6363ed0b20..9602c258f50cad766f9309b22aa74af9c34eca13 100644 (file)
--- a/tests/phpunit/WebTest/Contribute/UpdatePendingContributionTest.php
+++ b/tests/phpunit/WebTest/Contribute/UpdatePendingContributionTest.php
@@ -47,8 +47,8 @@ class WebTest_Contribute_UpdatePendingContributionTest extends CiviSeleniumTestC
     $this->clickPopupLink("xpath=//table[@class='selector row-highlight']/tbody//tr/td[8]/span/a[@title='Edit Contribution']");
     $this->waitForElementPresent('financial_type_id');
 
-    $this->clickPopupLink("xpath=//a[contains(text(), 'Pay Now')]");
-    $this->assertElementContainsText("xpath=//span[@class='ui-dialog-title']", "Edit Contribution (Pay Now)");
+    $this->clickPopupLink("xpath=//a[contains(text(), 'Pay with Credit Card')]");
+    $this->assertElementContainsText("xpath=//span[@class='ui-dialog-title']", "Pay with Credit Card");
     $this->assertElementNotPresent("xpath=//select[@id='currency']");
     $this->assertNotEditable('total_amount');
     $this->assertElementNotPresent("xpath=//select[@id='contribution_status_id']");
@@ -56,6 +56,11 @@ class WebTest_Contribute_UpdatePendingContributionTest extends CiviSeleniumTestC
     $this->webtestAddCreditCardDetails();
     $this->webtestAddBillingDetails();
 
+    //return to the edit contrib form
+    $this->clickAjaxLink('_qf_Contribution_upload-bottom');
+    $this->waitForText('crm-notification-container', "The contribution record has been saved.");
+
+    //save the edit form
     $this->clickAjaxLink('_qf_Contribution_upload-bottom');
     $this->waitForText('crm-notification-container', "The contribution record has been saved.");