-
-
Notifications
You must be signed in to change notification settings - Fork 825
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev/core#866, dev/core#1318 Fix failure to import checkboxes for acti…
…vities This seeks to address a long-standing issue whereby checkboxes cannot be imported onto activities if the name and value match. Since this code was written the create was switched from a BAO create to the activity api create. Simply removing the handling to prepare for the BAO create allows the api to do it correctly
- Loading branch information
1 parent
1d2cb41
commit 65d27ad
Showing
6 changed files
with
212 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
108 changes: 108 additions & 0 deletions
108
tests/phpunit/CRM/Activity/Import/Parser/ActivityTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * File for the TestActivityType class | ||
| * | ||
| * (PHP 5) | ||
| * | ||
| * @package CiviCRM | ||
| * | ||
| * This file is part of CiviCRM | ||
| * | ||
| * CiviCRM is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Affero General Public License | ||
| * as published by the Free Software Foundation; either version 3 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * CiviCRM is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public | ||
| * License along with this program. If not, see | ||
| * <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| /** | ||
| * Test CRM/Member/BAO Membership Log add , delete functions | ||
| * | ||
| * @package CiviCRM | ||
| * @group headless | ||
| */ | ||
| class CRM_Activity_Import_Parser_ActivityTest extends CiviUnitTestCase { | ||
| use CRMTraits_Custom_CustomDataTrait; | ||
|
|
||
| /** | ||
| * Prepare for tests. | ||
| */ | ||
| public function setUp():void { | ||
| parent::setUp(); | ||
| $this->createLoggedInUser(); | ||
| } | ||
|
|
||
| /** | ||
| * Clean up after test. | ||
| * | ||
| * @throws \CRM_Core_Exception | ||
| */ | ||
| public function tearDown():void { | ||
| $this->quickCleanup(['civicrm_contact', 'civicrm_activity'], TRUE); | ||
| parent::tearDown(); | ||
| } | ||
|
|
||
| /** | ||
| * Test Import. | ||
| * | ||
| * So far this is just testing the class constructor & preparing for more | ||
| * tests. | ||
| * | ||
| * @throws \API_Exception | ||
| * @throws \CRM_Core_Exception | ||
| * @throws \CiviCRM_API3_Exception | ||
| */ | ||
| public function testImport(): void { | ||
| $this->createCustomGroupWithFieldOfType(['extends' => 'Activity'], 'checkbox'); | ||
| $values = [ | ||
| 'activity_detail' => 'fascinating', | ||
| 'activity_type_id' => 1, | ||
| 'activity_date_time' => '2010-01-06', | ||
| 'target_contact_id' => $this->individualCreate(), | ||
| 'subject' => 'riveting stuff', | ||
| $this->getCustomFieldName('checkbox') => 'L', | ||
| ]; | ||
| $this->importValues($values); | ||
| $this->callAPISuccessGetSingle('Activity', [$this->getCustomFieldName('checkbox') => 'L']); | ||
| } | ||
|
|
||
| /** | ||
| * Create an import object. | ||
| * | ||
| * @param array $fields | ||
| * | ||
| * @return \CRM_Activity_Import_Parser_Activity | ||
| */ | ||
| protected function createImportObject(array $fields): \CRM_Activity_Import_Parser_Activity { | ||
| $fieldMapper = []; | ||
| foreach ($fields as $index => $field) { | ||
| $fieldMapper[] = $field; | ||
| } | ||
| $importer = new CRM_Activity_Import_Parser_Activity($fieldMapper); | ||
| $importer->init(); | ||
| return $importer; | ||
| } | ||
|
|
||
| /** | ||
| * Run the importer. | ||
| * | ||
| * @param array $values | ||
| * @param int $expectedOutcome | ||
| */ | ||
| protected function importValues(array $values, $expectedOutcome = 1): void { | ||
| $importer = $this->createImportObject(array_keys($values)); | ||
| $params = array_values($values); | ||
| CRM_Core_Session::singleton()->set('dateTypes', 1); | ||
| $this->assertEquals($expectedOutcome, $importer->import(NULL, $params)); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters