Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fold processGreetingTemplate function only called from one place into caller, deprecate #24925

Merged
merged 1 commit into from
Dec 8, 2022

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Nov 8, 2022

Overview

Fold processGreetingTemplate function only called from one place into caller, deprecate

(Covered by test in api_v3_JobTest::testCallUpdateGreetingSuccess)

Before

2 line function only called from one place, can no longer justify it's existance

After

Folded back in, deprecated

image

Technical Details

Comments

@civibot
Copy link

civibot bot commented Nov 8, 2022

(Standard links)

@civibot civibot bot added the master label Nov 8, 2022
@eileenmcnaughton
Copy link
Contributor Author

Ah well there is that test ....

api_v3_JobTest::testCallUpdateGreetingSuccess
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'Dear Anthony'
+'Dear {contact.first_name}'

/home/jenkins/bknix-dfl/build/core-24925-2a0vs/web/sites/all/modules/civicrm/tests/phpunit/api/v3/JobTest.php:201
/home/jenkins/bknix-dfl/build/core-24925-2a0vs/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:265
/home/jenkins/bknix-dfl/extern/phpunit8/phpunit8.phar:1721

@eileenmcnaughton
Copy link
Contributor Author

@colemanw can you merge this?

@colemanw
Copy link
Member

colemanw commented Dec 8, 2022

Looks like everything works fine before/after.

@colemanw colemanw merged commit 36cb6b1 into civicrm:master Dec 8, 2022
@colemanw colemanw deleted the token_dep branch December 8, 2022 11:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants