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 test assertion and slight cleanup refactoring #911

Merged
merged 1 commit into from
Jan 13, 2015
Merged

Fix test assertion and slight cleanup refactoring #911

merged 1 commit into from
Jan 13, 2015

Conversation

Vinai
Copy link
Contributor

@Vinai Vinai commented Jan 5, 2015

This PR against the develop branch replaces #755.

The PR fixes a test assertion in Magento\Framework\View\Layout\Reader\UiComponentTest::testInterpret().
As can be seen in the diff, previously the code looked like follows:

    $this->helper->expects($this->any())->method('setStructureElementData')->...

Two things are wrong with it:

  1. ->expects($this->any()) only stubs a return value for a method, no actual assertion takes place.
  2. The method setStructureElementData does not exist on the helper instance. It has to be called on the View\Layout\ScheduledStructure.

So the previous method expectation effectively only tested that a non-existant method was called any number of times.

The other thing this PR changes it the name of the test method to reflect the change in the interface, that is the method process() was renamed to interpret(), so the test testProcess() should also be renamed to testInterpret().

* Fix test assertion in View\Layout\Reader\UiComponentTest
* Refactor so the test name matches the changes in the code
@vpelipenko vpelipenko added CS improvement Issue: Ready for Work Gate 4. Acknowledged. Issue is added to backlog and ready for development and removed Progress: needs update labels Jan 8, 2015
@vpelipenko vpelipenko self-assigned this Jan 8, 2015
@vpelipenko
Copy link
Contributor

CR: passed
Builds: green
Resolution: OK to merge
Ticket: MAGETWO-32672

@vpelipenko vpelipenko added Progress: accept and removed Issue: Ready for Work Gate 4. Acknowledged. Issue is added to backlog and ready for development labels Jan 13, 2015
vpelipenko added a commit that referenced this pull request Jan 13, 2015
Fix test assertion and slight cleanup refactoring
@vpelipenko vpelipenko merged commit fc916fb into magento:develop Jan 13, 2015
@Vinai Vinai deleted the view-layout-reader-uicomponent branch January 14, 2015 09:13
magento-team added a commit to buskamuza/magento2-community-edition that referenced this pull request Jan 20, 2015
* Various improvements:
    * Updated Copyright Notice and provided reference to the license file
    * Updated test framework to support stores other than default
    * Removed version information from theme.xml files leaving it only in composer.json files
* Fixed bugs:
    * Fixed an issue where coupon code was reported to be invalid if it has been removed from reorder in backend and then re-applied
    * Fixed an issue where the 'Guide to Using Sample Data' link was incorrect in the web setup UI
    * Fixed an issue where the link to System Requirements in bootstrap.php was incorrect
    * Fixed an issue where Compiler could not verify case sensitive dependency
    * Fixed an issue where the Recently Compared Products and Recently Viewed Products widgets were not displayed in sidebars
    * Fixed an issue where the Orders and Returns widget type contained unnecessary tab
    * Fixed an issue where an image added to a CMS page using the WYSIWYG editor was displayed as a broken link after turning off the allow_url_fopen parameter in php.ini
    * Fixed an issue where it was impossible to log in to the backend from the first attempt after changing Base URL
    * Fixed an issue where it was impossible to set back the default English (United States) interface locale for the admin user after changing it so an other value
    * Fixed an issue where it was possible to execute malicious JavaScript code in the context of website via the Sender Email parameter
    * Fixed an issue where the Product Stock Alert email was sent to a customer from a store view different than a customer account was created in
    * Fixed an issue where the "Server cannot understand Accept HTTP header media type" error message was not informative enough
    * Fixed an issue where unit tests did not work as expected after installing Magento 2
    * Fixed an issue where the password change email notification was sent after saving admin account settings even if password was not changed
    * Fixed an issue where static tests failed as a result of adding  API functional tests
    * Fixed API functional tests after merging pull request [#927](magento/magento2#927)
    * Fixed an issue where the Edit button was present for invoiced orders
    * Fixed an issue where function _underscore did not work with keys like SKeyName ('s_key_name')
    * Fixed an issue where a fatal error occurred when browsing categories if web server did not have write permissions for media/catalog/product
* Github requests:
    * [#792](magento/magento2#792) -- Failed to set ini option "session.save_path" to value
    * [#796](magento/magento2#796) -- install.log cannot be created with open_basedir restriction
    * [#823](magento/magento2#823) -- Installation bug
    * [#920](magento/magento2#920) -- "web setup wizard is not accessible" error message but the setup wizard is actually accessible
    * [#829](magento/magento2#829) -- [API] OAuth1.0 request token request failing / Consumer key has expired
    * [#658](magento/magento2#658) -- Inline translate malfunctioning
    * [#950](magento/magento2#950) -- Fix for the missed trailing end of line in indexer.php usage help text
    * [#932](magento/magento2#932) -- Migration tool - not all input has comments
    * [#959](magento/magento2#959) -- Replace UTF8 'en dash' with minus in error message
    * [#911](magento/magento2#911) -- Fix test assertion and slight cleanup refactoring
    * [#936](magento/magento2#936) -- Bugfix for regions with single quote in name
    * [#902](magento/magento2#902) -- Add integration test for View\Page\Config\Reader\Html
    * [#925](magento/magento2#925) -- Failed test due to Class not following the naming conventions
    * [#943](magento/magento2#943) -- magento2-925 Failed Test due to Class not following the naming conventions
    * [#968](magento/magento2#968) -- Apply pattern matching datasource config files
    * [#949](magento/magento2#949) -- Added 'status' command for cache cli script / Also improved readability
* PHP 5.6 in composer.json:
    * Added PHP 5.6.0 to the list of required PHP versions in all composer.json files
    * Updated Travis CI configuration to include PHP 5.6 builds
* Framework improvements:
    * Removed TODOs in the Integration and Authorization modules
    * Removed leading backslash from the 'use' statement throughout the code base
magento-team added a commit to buskamuza/magento2-community-edition that referenced this pull request Jan 20, 2015
* Various improvements:
    * Updated Copyright Notice and provided reference to the license file
    * Updated test framework to support stores other than default
    * Removed version information from theme.xml files leaving it only in composer.json files
* Fixed bugs:
    * Fixed an issue where coupon code was reported to be invalid if it has been removed from reorder in backend and then re-applied
    * Fixed an issue where the 'Guide to Using Sample Data' link was incorrect in the web setup UI
    * Fixed an issue where the link to System Requirements in bootstrap.php was incorrect
    * Fixed an issue where Compiler could not verify case sensitive dependency
    * Fixed an issue where the Recently Compared Products and Recently Viewed Products widgets were not displayed in sidebars
    * Fixed an issue where the Orders and Returns widget type contained unnecessary tab
    * Fixed an issue where an image added to a CMS page using the WYSIWYG editor was displayed as a broken link after turning off the allow_url_fopen parameter in php.ini
    * Fixed an issue where it was impossible to log in to the backend from the first attempt after changing Base URL
    * Fixed an issue where it was impossible to set back the default English (United States) interface locale for the admin user after changing it so an other value
    * Fixed an issue where it was possible to execute malicious JavaScript code in the context of website via the Sender Email parameter
    * Fixed an issue where the Product Stock Alert email was sent to a customer from a store view different than a customer account was created in
    * Fixed an issue where the "Server cannot understand Accept HTTP header media type" error message was not informative enough
    * Fixed an issue where unit tests did not work as expected after installing Magento 2
    * Fixed an issue where the password change email notification was sent after saving admin account settings even if password was not changed
    * Fixed an issue where static tests failed as a result of adding  API functional tests
    * Fixed API functional tests after merging pull request [#927](magento/magento2#927)
    * Fixed an issue where the Edit button was present for invoiced orders
    * Fixed an issue where function _underscore did not work with keys like SKeyName ('s_key_name')
    * Fixed an issue where a fatal error occurred when browsing categories if web server did not have write permissions for media/catalog/product
* Github requests:
    * [#792](magento/magento2#792) -- Failed to set ini option "session.save_path" to value
    * [#796](magento/magento2#796) -- install.log cannot be created with open_basedir restriction
    * [#823](magento/magento2#823) -- Installation bug
    * [#920](magento/magento2#920) -- "web setup wizard is not accessible" error message but the setup wizard is actually accessible
    * [#829](magento/magento2#829) -- [API] OAuth1.0 request token request failing / Consumer key has expired
    * [#658](magento/magento2#658) -- Inline translate malfunctioning
    * [#950](magento/magento2#950) -- Fix for the missed trailing end of line in indexer.php usage help text
    * [#932](magento/magento2#932) -- Migration tool - not all input has comments
    * [#959](magento/magento2#959) -- Replace UTF8 'en dash' with minus in error message
    * [#911](magento/magento2#911) -- Fix test assertion and slight cleanup refactoring
    * [#936](magento/magento2#936) -- Bugfix for regions with single quote in name
    * [#902](magento/magento2#902) -- Add integration test for View\Page\Config\Reader\Html
    * [#925](magento/magento2#925) -- Failed test due to Class not following the naming conventions
    * [#943](magento/magento2#943) -- magento2-925 Failed Test due to Class not following the naming conventions
    * [#968](magento/magento2#968) -- Apply pattern matching datasource config files
    * [#949](magento/magento2#949) -- Added 'status' command for cache cli script / Also improved readability
* PHP 5.6 in composer.json:
    * Added PHP 5.6.0 to the list of required PHP versions in all composer.json files
    * Updated Travis CI configuration to include PHP 5.6 builds
* Framework improvements:
    * Removed TODOs in the Integration and Authorization modules
    * Removed leading backslash from the 'use' statement throughout the code base
magento-team pushed a commit that referenced this pull request Mar 15, 2017
Bugs
- MAGETWO-65308 CLI command config:set fails on configurations which requires session
- MAGETWO-62560 Catalog Module UpgradeData to 2.1.3 breaks when cost attribute is deleted #7804 - for 2.2.0
Task
- MAGETWO-65208 Store checksum for every section of configuration file & change behavior on read-only FS & add sorting of importers
magento-engcom-team added a commit that referenced this pull request Oct 2, 2019
 - Merge Pull Request magento/graphql-ce#919 from XxXgeoXxX/graphql-ce:2.3-develop#911
 - Merged commits:
   1. fa8f566
   2. aaee0c8
   3. e9879d1
   4. da62bd1
   5. 2c4adbf
   6. d167013
   7. 33d8148
   8. adb6517
   9. f52ba88
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants