Conflicts:

	api/v3/Contribution.php

minor test fixes WRT https://test.civicrm.org/job/CiviCRM-4.3-git/LABEL=debian6,SUITE=api_v3_AllTests/lastCompletedBuild/testReport/ failure result

----------------------------------------
* CRM-12510: Copy Contribution Page does not copy associated quick-config price set
  http://issues.civicrm.org/jira/browse/CRM-12510

--fixed for CRM-12498, added condition to check valid contribution status change and throw error if invalid

----------------------------------------
* CRM-12498: API contribution.create/update DB Error: constraint violation
  http://issues.civicrm.org/jira/browse/CRM-12498

----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
  http://issues.civicrm.org/jira/browse/CRM-12470

CRM-12618 webtest updation: added checking in WebTest_Event_AddEventTest::testEventAddMultipleParticipant test case

fix for CRM-12378 comment : WebTest_Member_StandaloneAddTest.testAjaxCustomGroupLoad was failing (https://test.civicrm.org/job/CiviCRM-4.3-WebTest-git/LABEL=ubuntu1204,SUITE=WebTest_AllTests/24/)

The error expected for testNotCMSUser is currently produced for
"?q=civicrm/$entity/$action" but not "?entity=$x&action=$x", so we should be
testing both situations.

RestTest - Use adminApiKey. Comment out test-cases for deprecated/dead functionality. Simplify/patch remaining test-cases.

RestTest - Move code from setUp() to _setUpAdminSessionIdAndApiKey(). Keep current behavior, but make it easier to change on per-test basis.

Colby Warkentin authored 11 years ago and totten committed 11 years ago

----------------------------------------
* CRM-12412: Implement unit tests for REST interface
  http://issues.civicrm.org/jira/browse/CRM-12412

CRM-12378 a new webtest helper function introduction which can help detect break mentioned in CRM-12331

Fixed: phpunit doesn't get mysql password from civicrm.settings.local.php

----------------------------------------
* CRM-12460: phpunit doesn't get mysql password from civicrm.settings.local.php
  http://issues.civicrm.org/jira/browse/CRM-12460

CRM-12350 amend relationship test to pass. Note this could be a regressing but regression is old if so

interim commit setting test passing but regression on api test