Unverified Commit 37aec4df authored by mattwire's avatar mattwire Committed by GitHub

Merge pull request #16912 from eileenmcnaughton/conf_2

[Test] Remove skip that seems no longer required
parents 2d929df8 5acc6183
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
* *
* @package CRM * @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing * @copyright CiviCRM LLC https://civicrm.org/licensing
* $Id$
*
*/ */
...@@ -57,10 +55,16 @@ class ConformanceTest extends UnitTestCase { ...@@ -57,10 +55,16 @@ class ConformanceTest extends UnitTestCase {
$this->loadDataSet('ConformanceTest'); $this->loadDataSet('ConformanceTest');
$this->creationParamProvider = \Civi::container()->get('test.param_provider'); $this->creationParamProvider = \Civi::container()->get('test.param_provider');
parent::setUp(); parent::setUp();
// calculateTaxAmount() for contribution triggers a deprecation notice
\PHPUnit\Framework\Error\Deprecated::$enabled = FALSE;
} }
/**
* Get entities to test.
*
* @return array
*
* @throws \API_Exception
* @throws \Civi\API\Exception\UnauthorizedException
*/
public function getEntities() { public function getEntities() {
return Entity::get()->setCheckPermissions(FALSE)->execute()->column('name'); return Entity::get()->setCheckPermissions(FALSE)->execute()->column('name');
} }
...@@ -97,7 +101,7 @@ class ConformanceTest extends UnitTestCase { ...@@ -97,7 +101,7 @@ class ConformanceTest extends UnitTestCase {
/** /**
* @param string $entityClass * @param string $entityClass
* @param $entity * @param string $entity
*/ */
protected function checkFields($entityClass, $entity) { protected function checkFields($entityClass, $entity) {
$fields = $entityClass::getFields() $fields = $entityClass::getFields()
...@@ -114,6 +118,8 @@ class ConformanceTest extends UnitTestCase { ...@@ -114,6 +118,8 @@ class ConformanceTest extends UnitTestCase {
/** /**
* @param string $entityClass * @param string $entityClass
*
* @return array
*/ */
protected function checkActions($entityClass) { protected function checkActions($entityClass) {
$actions = $entityClass::getActions() $actions = $entityClass::getActions()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment