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

Fix for magento/magento2#29315: \Magento\Config\Model\Config\Source\Email\Tem… #29316

Merged
merged 2 commits into from
Aug 20, 2020

Conversation

willwright
Copy link

@willwright willwright commented Jul 29, 2020

Description (*)

Adds a guard to \Magento\Config\Model\Config\Source\Email\Template::toOptionArray which protects against throwing an unhandled exception when a user has not called $this->setPath() before calling toOptionArray()

Related Pull Requests

Fixed Issues (if relevant)

  1. Fixes \Magento\Config\Model\Config\Source\Email\Template::toOptionArray throws error when setPath() is not called first #29315

Manual testing scenarios (*)

  1. Create a custom module, plugin, or Observer
  2. Inject a concrete instance of \Magento\Framework\ObjectManagerInterface ($this->_objectManager) through the constructor
  3. Execute the following:
    $sourceModelObj = $this->_objectManager->create('\Magento\Config\Model\Config\Source\Email\Template');
    $optionsArray = $sourceModelObj->toOptionArray();
  4. Notice unhandled exception is written to the screen

Questions or comments

I included a Unit test in app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php to illustrate the issue and test for it.

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds are green)

…OptionArray throws error when setPath() is not called first

- Guard against an edge case where toOptionArray is called without having set a path first
@m2-assistant
Copy link

m2-assistant bot commented Jul 29, 2020

Hi @willwright. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento give me test instance - deploy test instance based on PR changes
  • @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE,
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

@m2-assistant
Copy link

m2-assistant bot commented Jul 29, 2020

Hi @willwright, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

@willwright willwright reopened this Jul 29, 2020
@m2-assistant
Copy link

m2-assistant bot commented Jul 29, 2020

Hi @willwright. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento give me test instance - deploy test instance based on PR changes
  • @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE,
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

@willwright
Copy link
Author

@magento run all tests

@rogyar rogyar self-assigned this Jul 29, 2020
@rogyar rogyar added Auto-Tests: Covered All changes in Pull Request is covered by auto-tests Award: test coverage labels Jul 29, 2020
@rogyar
Copy link
Contributor

rogyar commented Jul 29, 2020

Hi @willwright. Thank you for your collaboration. Please, take a look at the failing static tests.
Thank you!

…OptionArray throws error when setPath() is not called first

- Fix formatting for static tests
@willwright
Copy link
Author

@magento run Static Tests

@willwright
Copy link
Author

@magento run all tests

@willwright
Copy link
Author

@rogyar Thanks for your comment.

I updated the branch and re-ran the tests. Please let me know if you have any other questions.

@rogyar
Copy link
Contributor

rogyar commented Aug 3, 2020

@magento run all tests

Copy link
Contributor

@rogyar rogyar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The failing tests are not related to the current changeset

@magento-engcom-team
Copy link
Contributor

Hi @rogyar, thank you for the review.
ENGCOM-7961 has been created to process this Pull Request

@magento-engcom-team
Copy link
Contributor

@willwright thank you for contributing. Please accept Community Contributors team invitation here to gain extended permissions for this repository.

@engcom-Charlie
Copy link
Contributor

✔️ QA Passed

Manual testing scenario:

  1. Inject a concrete instance of \Magento\Framework\ObjectManagerInterface ($this->_objectManager) through the constructor
$sourceModelObj = $this->_objectManager->create('\Magento\Config\Model\Config\Source\Email\Template');
  1. Execute the following:
$optionsArray = $sourceModelObj->toOptionArray();

Before: We see an exception message.
image

After: The exception wasn't thrown.

@engcom-Charlie engcom-Charlie self-assigned this Aug 7, 2020
@engcom-Charlie engcom-Charlie added the QA: Ready to add to Regression Scope Should be analyzed and added to Regression Testing Scope(if applicable) label Aug 7, 2020
@sidolov sidolov added Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Severity: S2 Major restrictions or short-term circumventions are required until a fix is available. labels Aug 18, 2020
@engcom-Alfa engcom-Alfa added QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope and removed QA: Ready to add to Regression Scope Should be analyzed and added to Regression Testing Scope(if applicable) labels Aug 19, 2020
@magento-engcom-team magento-engcom-team merged commit e91b9ff into magento:2.4-develop Aug 20, 2020
@m2-assistant
Copy link

m2-assistant bot commented Aug 20, 2020

Hi @willwright, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Auto-Tests: Covered All changes in Pull Request is covered by auto-tests Award: test coverage Component: Config Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Progress: accept QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope Release Line: 2.4 Severity: S2 Major restrictions or short-term circumventions are required until a fix is available.
Projects
Archived in project
7 participants