From 382da33baeff4a60732104eeea8d8f833a547ea5 Mon Sep 17 00:00:00 2001 From: mage2-team <mage2-team@magento.com> Date: Fri, 17 Oct 2014 09:04:10 -0700 Subject: [PATCH] 0.1.0-alpha100 * Added the following functional tests: * Add related products * Assign custom order status * Change customer password * Create credit memo for offline payment methods * Product type switching on creation * Sales invoice report * Sales refund report * Update newsletter template --- CHANGELOG.md | 14 +- .../Magento/AdminNotification/composer.json | 10 +- app/code/Magento/Authorization/composer.json | 6 +- app/code/Magento/Authorizenet/composer.json | 18 +-- app/code/Magento/Backend/composer.json | 34 ++--- app/code/Magento/Backup/composer.json | 12 +- app/code/Magento/Bundle/composer.json | 30 ++-- app/code/Magento/Captcha/composer.json | 14 +- app/code/Magento/Catalog/composer.json | 50 +++---- .../Magento/CatalogImportExport/composer.json | 20 +-- .../Magento/CatalogInventory/composer.json | 20 +-- app/code/Magento/CatalogRule/composer.json | 16 +-- app/code/Magento/CatalogSearch/composer.json | 24 ++-- .../Magento/CatalogUrlRewrite/composer.json | 18 +-- app/code/Magento/Centinel/composer.json | 14 +- app/code/Magento/Checkout/composer.json | 36 ++--- .../Magento/CheckoutAgreements/composer.json | 10 +- app/code/Magento/Cms/composer.json | 20 +-- app/code/Magento/CmsUrlRewrite/composer.json | 8 +- .../ConfigurableImportExport/composer.json | 14 +- .../Magento/ConfigurableProduct/composer.json | 28 ++-- app/code/Magento/Contact/composer.json | 12 +- app/code/Magento/Core/composer.json | 16 +-- app/code/Magento/Cron/composer.json | 8 +- app/code/Magento/CurrencySymbol/composer.json | 14 +- app/code/Magento/Customer/composer.json | 36 ++--- .../CustomerImportExport/composer.json | 16 +-- app/code/Magento/DesignEditor/composer.json | 14 +- app/code/Magento/Dhl/composer.json | 22 +-- app/code/Magento/Directory/composer.json | 10 +- app/code/Magento/Downloadable/composer.json | 34 ++--- app/code/Magento/Eav/composer.json | 12 +- app/code/Magento/Email/composer.json | 12 +- app/code/Magento/Fedex/composer.json | 18 +-- app/code/Magento/GiftMessage/composer.json | 22 +-- app/code/Magento/GoogleAdwords/composer.json | 8 +- .../Magento/GoogleAnalytics/composer.json | 8 +- .../Magento/GoogleOptimizer/composer.json | 14 +- app/code/Magento/GoogleShopping/composer.json | 20 +-- .../Magento/GroupedImportExport/composer.json | 14 +- app/code/Magento/GroupedProduct/composer.json | 24 ++-- app/code/Magento/ImportExport/composer.json | 14 +- app/code/Magento/Indexer/composer.json | 8 +- app/code/Magento/Install/composer.json | 14 +- app/code/Magento/Integration/composer.json | 16 +-- .../Magento/LayeredNavigation/composer.json | 8 +- app/code/Magento/Log/composer.json | 14 +- app/code/Magento/Msrp/composer.json | 24 ++-- app/code/Magento/Multishipping/composer.json | 20 +-- app/code/Magento/Newsletter/composer.json | 22 +-- .../Magento/OfflinePayments/composer.json | 6 +- .../Magento/OfflineShipping/composer.json | 20 +-- app/code/Magento/Ogone/composer.json | 12 +- app/code/Magento/PageCache/composer.json | 8 +- .../PayPalRecurringPayment/composer.json | 16 +-- app/code/Magento/Payment/composer.json | 14 +- app/code/Magento/Paypal/composer.json | 30 ++-- app/code/Magento/Persistent/composer.json | 16 +-- app/code/Magento/ProductAlert/composer.json | 12 +- .../Magento/RecurringPayment/composer.json | 26 ++-- app/code/Magento/Reports/composer.json | 36 ++--- app/code/Magento/RequireJs/composer.json | 4 +- app/code/Magento/Review/composer.json | 22 +-- app/code/Magento/Rss/composer.json | 8 +- app/code/Magento/Rule/composer.json | 12 +- app/code/Magento/Sales/composer.json | 44 +++--- app/code/Magento/SalesRule/composer.json | 34 ++--- app/code/Magento/Search/composer.json | 10 +- app/code/Magento/Sendfriend/composer.json | 14 +- app/code/Magento/Shipping/composer.json | 26 ++-- app/code/Magento/Sitemap/composer.json | 18 +-- app/code/Magento/Store/composer.json | 10 +- app/code/Magento/Tax/composer.json | 28 ++-- .../Magento/TaxImportExport/composer.json | 12 +- app/code/Magento/Theme/composer.json | 16 +-- app/code/Magento/Translation/composer.json | 10 +- app/code/Magento/Ui/composer.json | 8 +- app/code/Magento/Ups/composer.json | 18 +-- app/code/Magento/UrlRewrite/composer.json | 18 +-- app/code/Magento/User/composer.json | 14 +- app/code/Magento/Usps/composer.json | 18 +-- app/code/Magento/Webapi/composer.json | 16 +-- app/code/Magento/Weee/composer.json | 24 ++-- app/code/Magento/Widget/composer.json | 14 +- app/code/Magento/Wishlist/composer.json | 32 ++--- .../adminhtml/Magento/backend/composer.json | 4 +- .../adminhtml/Magento/backend/theme.xml | 2 +- .../frontend/Magento/blank/composer.json | 4 +- app/design/frontend/Magento/blank/theme.xml | 2 +- .../frontend/Magento/plushe/composer.json | 6 +- app/design/frontend/Magento/plushe/theme.xml | 2 +- app/design/install/Magento/basic/theme.xml | 2 +- app/i18n/magento/de_de/composer.json | 4 +- app/i18n/magento/en_us/composer.json | 4 +- app/i18n/magento/es_es/composer.json | 4 +- app/i18n/magento/fr_fr/composer.json | 4 +- app/i18n/magento/nl_nl/composer.json | 4 +- app/i18n/magento/pt_br/composer.json | 4 +- app/i18n/magento/zh_cn/composer.json | 4 +- composer.json | 2 +- .../Test/Fixture/CatalogProductSimple.php | 12 ++ .../Test/Fixture/CatalogProductSimple.xml | 10 +- .../AbstractRelatedProducts.php | 2 +- .../CatalogProductSimple/RelatedProducts.php} | 10 +- .../AbstractAddRelatedProductsEntityTest.php | 131 ++++++++++++++++++ .../Product/AddCrossSellEntityTest.php | 54 ++------ .../Product/AddCrossSellEntityTest/test.csv | 4 +- .../Product/AddRelatedProductsEntityTest.php | 70 ++++++++++ .../AddRelatedProductsEntityTest/test.csv | 2 + .../TestCase/Product/AddUpSellEntityTest.php | 94 +------------ .../Product/AddUpSellEntityTest/test.csv | 2 +- .../ProductTypeSwitchingOnCreationTest.php | 106 ++++++++++++++ .../test.csv | 10 ++ .../Test/Block/Cart/AbstractCartItem.php | 2 +- .../Constraint/AssertCartItemsOptions.php | 2 +- .../Product/Edit/Tab/Super/Config.php | 9 +- .../Edit/Tab/Super/Config/Attribute.php | 13 +- .../Product/View/ConfigurableOptions.php | 9 ++ .../Constraint/AssertChildProductsInGrid.php | 2 +- .../Fixture/ConfigurableProductInjectable.xml | 4 +- .../ConfigurableProductInjectable.php | 19 +++ .../Test/Block/Account/Dashboard/Info.php | 34 +++++ .../Customer/Test/Block/Form/CustomerForm.xml | 3 + .../AssertChangePasswordFailMessage.php | 71 ++++++++++ .../AssertCustomerPasswordChanged.php | 107 ++++++++++++++ .../AssertWrongPassConfirmationMessage.php | 71 ++++++++++ .../Test/Fixture/CustomerInjectable.php | 11 ++ .../Test/Fixture/CustomerInjectable.xml | 4 + .../Test/Page/CustomerAccountEdit.xml | 5 + .../Test/Repository/AddressInjectable.php | 10 ++ .../TestCase/ChangeCustomerPasswordTest.php | 127 +++++++++++++++++ .../ChangeCustomerPasswordTest/test.csv | 4 + .../Magento/Customer/Test/etc/constraint.xml | 9 ++ .../Test/Block/Adminhtml/Template/Grid.php | 7 + .../Test/Constraint/AssertNewsletterForm.php | 70 ++++++++++ .../Test/Page/Adminhtml/TemplateEdit.xml} | 48 +++---- .../TestCase/UpdateNewsletterTemplateTest.php | 98 +++++++++++++ .../UpdateNewsletterTemplateTest/test.csv | 2 + .../Newsletter/Test/etc/constraint.xml | 7 +- .../app/Magento/Newsletter/Test/etc/page.xml | 5 + .../Block/Adminhtml/Sales/Invoiced/Grid.php | 52 +++++++ .../Sales/Orders/Viewed/FilterGrid.php | 14 +- .../Adminhtml/Sales/Refunded/FilterGrid.php | 49 +++++++ .../AbstractAssertInvoiceReportResult.php | 92 ++++++++++++ .../AbstractAssertSalesReportResult.php | 17 +-- .../AssertInvoiceReportIntervalResult.php | 72 ++++++++++ .../AssertInvoiceReportTotalResult.php | 72 ++++++++++ .../AssertRefundReportIntervalResult.php | 92 ++++++++++++ .../AssertSalesReportIntervalResult.php | 13 +- .../AssertSalesReportTotalResult.php | 13 +- .../Test/Page/Adminhtml/RefundsReport.xml | 49 +++++++ .../Page/Adminhtml/SalesInvoiceReport.xml | 49 +++++++ .../Test/Page/Adminhtml/SalesReport.xml | 2 +- .../TestCase/SalesInvoiceReportEntityTest.php | 86 ++++++++++++ .../SalesInvoiceReportEntityTest/test.csv | 4 + .../TestCase/SalesOrderReportEntityTest.php | 4 +- .../SalesOrderReportEntityTest/test.csv | 8 +- .../TestCase/SalesRefundsReportEntityTest.php | 104 ++++++++++++++ .../SalesRefundsReportEntityTest/test.csv | 4 + .../Magento/Reports/Test/etc/constraint.xml | 9 ++ .../app/Magento/Reports/Test/etc/page.xml | 10 ++ dev/tests/unit/phpunit.xml.dist | 3 + .../Magento/Framework/AppInterface.php | 2 +- lib/internal/Magento/Framework/composer.json | 2 +- 164 files changed, 2653 insertions(+), 997 deletions(-) rename dev/tests/functional/tests/app/Magento/{Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.php => Catalog/Test/Fixture/CatalogProductSimple/RelatedProducts.php} (82%) create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractAddRelatedProductsEntityTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddRelatedProductsEntityTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddRelatedProductsEntityTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php rename dev/tests/functional/tests/app/Magento/{Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.xml => Newsletter/Test/Page/Adminhtml/TemplateEdit.xml} (54%) create mode 100644 dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Invoiced/Grid.php create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Refunded/FilterGrid.php create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertInvoiceReportResult.php create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/RefundsReport.xml create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesInvoiceReport.xml create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest/test.csv diff --git a/CHANGELOG.md b/CHANGELOG.md index 43781a27f9e..89394c5c2cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +0.1.0-alpha100 +============= + * Added the following functional tests: + * Add related products + * Assign custom order status + * Change customer password + * Create credit memo for offline payment methods + * Product type switching on creation + * Sales invoice report + * Sales refund report + * Update newsletter template + 0.1.0-alpha99 ============= * Released Performance Toolkit @@ -5,7 +17,6 @@ * [#665](https://github.com/magento/magento2/issues/665) -- Main menu event in wrong area * [#666](https://github.com/magento/magento2/pull/666) -- Update di.xml * [#602](https://github.com/magento/magento2/issues/602) -- Magento\Sales\Model\Order::getFullTaxInfo() incorrectly combines percentages - * [#673](https://github.com/magento/magento2/issues/673) -- Fixed fatal error during installation * Functional tests: * Updated API-functional test for Customer and Address metadata service * Add cross sell @@ -46,6 +57,7 @@ * Fixed the link to the license agreement in web installer * Fixed the web installation wizard which was stuck at 96% * Fixed bugs: + * Fixed fatal error during installation * Fixed an issue where newly created attribute was always added to the Product Details tab * Fixed an issue where it was impossible to change the Stock Availability status of a product from the Advanced Inventory tab * Fixed an issue where the Stock Status value changed from In Stock to Out of Stock if quantity was not specified diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json index c1fe011392d..3d75489db0b 100644 --- a/app/code/Magento/AdminNotification/composer.json +++ b/app/code/Magento/AdminNotification/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json index cf442daffa9..9801a83ab4a 100644 --- a/app/code/Magento/Authorization/composer.json +++ b/app/code/Magento/Authorization/composer.json @@ -3,12 +3,12 @@ "description": "Authorization module provides access to Magento ACL functionality.", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-backend": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json index ea5ae667e68..aa4c04928f9 100644 --- a/app/code/Magento/Authorizenet/composer.json +++ b/app/code/Magento/Authorizenet/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-payment": "0.1.0-alpha99", - "magento/module-centinel": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-payment": "0.1.0-alpha100", + "magento/module-centinel": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json index f26196a7f51..d1acaa1ece5 100644 --- a/app/code/Magento/Backend/composer.json +++ b/app/code/Magento/Backend/composer.json @@ -3,26 +3,26 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-cron": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/module-reports": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-user": "0.1.0-alpha99", - "magento/module-backup": "0.1.0-alpha99", - "magento/module-email": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-translation": "0.1.0-alpha99", - "magento/module-require-js": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-cron": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/module-reports": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-user": "0.1.0-alpha100", + "magento/module-backup": "0.1.0-alpha100", + "magento/module-email": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-translation": "0.1.0-alpha100", + "magento/module-require-js": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json index 90de70719b9..88026055c8f 100644 --- a/app/code/Magento/Backup/composer.json +++ b/app/code/Magento/Backup/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-cron": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-cron": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json index b4b2bd56ed5..bab8976e127 100644 --- a/app/code/Magento/Bundle/composer.json +++ b/app/code/Magento/Bundle/composer.json @@ -3,24 +3,24 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-tax": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-catalog-rule": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-gift-message": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", - "magento/module-webapi": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-tax": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-catalog-rule": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-gift-message": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", + "magento/module-webapi": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json index aeded47eb4b..aeb2b865eac 100644 --- a/app/code/Magento/Captcha/composer.json +++ b/app/code/Magento/Captcha/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json index 630753db730..46b90630be5 100644 --- a/app/code/Magento/Catalog/composer.json +++ b/app/code/Magento/Catalog/composer.json @@ -3,34 +3,34 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-cms": "0.1.0-alpha99", - "magento/module-indexer": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-log": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-widget": "0.1.0-alpha99", - "magento/module-wishlist": "0.1.0-alpha99", - "magento/module-tax": "0.1.0-alpha99", - "magento/module-msrp": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-catalog-rule": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-catalog-search": "0.1.0-alpha99", - "magento/module-product-alert": "0.1.0-alpha99", - "magento/module-url-rewrite": "0.1.0-alpha99", - "magento/module-catalog-url-rewrite": "0.1.0-alpha99", - "magento/module-page-cache": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-cms": "0.1.0-alpha100", + "magento/module-indexer": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-log": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-widget": "0.1.0-alpha100", + "magento/module-wishlist": "0.1.0-alpha100", + "magento/module-tax": "0.1.0-alpha100", + "magento/module-msrp": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-catalog-rule": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-catalog-search": "0.1.0-alpha100", + "magento/module-product-alert": "0.1.0-alpha100", + "magento/module-url-rewrite": "0.1.0-alpha100", + "magento/module-catalog-url-rewrite": "0.1.0-alpha100", + "magento/module-page-cache": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json index 80ce8f8cc08..4ab9afd21f5 100644 --- a/app/code/Magento/CatalogImportExport/composer.json +++ b/app/code/Magento/CatalogImportExport/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-core": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-import-export": "0.1.0-alpha99", - "magento/module-indexer": "0.1.0-alpha99", - "magento/module-store": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-import-export": "0.1.0-alpha100", + "magento/module-indexer": "0.1.0-alpha100", + "magento/module-store": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "ext-ctype": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json index 16bc4f8cbb6..ddf712742d1 100644 --- a/app/code/Magento/CatalogInventory/composer.json +++ b/app/code/Magento/CatalogInventory/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-indexer": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-indexer": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json index 8969135936c..8c490dcd71f 100644 --- a/app/code/Magento/CatalogRule/composer.json +++ b/app/code/Magento/CatalogRule/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-rule": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-rule": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json index 9e8a119d34d..349226343a4 100644 --- a/app/code/Magento/CatalogSearch/composer.json +++ b/app/code/Magento/CatalogSearch/composer.json @@ -3,21 +3,21 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-search": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-indexer": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-search": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-indexer": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json index 569f5854fd4..0d2e305b3df 100644 --- a/app/code/Magento/CatalogUrlRewrite/composer.json +++ b/app/code/Magento/CatalogUrlRewrite/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-catalog-import-export": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-import-export": "0.1.0-alpha99", - "magento/module-store": "0.1.0-alpha99", - "magento/module-url-rewrite": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-catalog-import-export": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-import-export": "0.1.0-alpha100", + "magento/module-store": "0.1.0-alpha100", + "magento/module-url-rewrite": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Centinel/composer.json b/app/code/Magento/Centinel/composer.json index b719072f466..4c0895517e9 100644 --- a/app/code/Magento/Centinel/composer.json +++ b/app/code/Magento/Centinel/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json index 5b08a9247ee..ee3e19a4a97 100644 --- a/app/code/Magento/Checkout/composer.json +++ b/app/code/Magento/Checkout/composer.json @@ -3,27 +3,27 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-authorization": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-payment": "0.1.0-alpha99", - "magento/module-tax": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-gift-message": "0.1.0-alpha99", - "magento/module-wishlist": "0.1.0-alpha99", - "magento/module-page-cache": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/module-msrp": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-authorization": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-payment": "0.1.0-alpha100", + "magento/module-tax": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-gift-message": "0.1.0-alpha100", + "magento/module-wishlist": "0.1.0-alpha100", + "magento/module-page-cache": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/module-msrp": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json index 5c8fab2b69c..9c098f0588b 100644 --- a/app/code/Magento/CheckoutAgreements/composer.json +++ b/app/code/Magento/CheckoutAgreements/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-store": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-store": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json index 40f67d3f187..ede920d029c 100644 --- a/app/code/Magento/Cms/composer.json +++ b/app/code/Magento/Cms/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/module-widget": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-email": "0.1.0-alpha99", - "magento/module-ui": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/module-widget": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-email": "0.1.0-alpha100", + "magento/module-ui": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json index 0b9eb21309d..bb657fd5f35 100644 --- a/app/code/Magento/CmsUrlRewrite/composer.json +++ b/app/code/Magento/CmsUrlRewrite/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-cms": "0.1.0-alpha99", - "magento/module-url-rewrite": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-cms": "0.1.0-alpha100", + "magento/module-url-rewrite": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json index ff6273fb6cb..ab3de4e54aa 100644 --- a/app/code/Magento/ConfigurableImportExport/composer.json +++ b/app/code/Magento/ConfigurableImportExport/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-catalog-import-export": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-import-export": "0.1.0-alpha99", - "magento/module-configurable-product": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-catalog-import-export": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-import-export": "0.1.0-alpha100", + "magento/module-configurable-product": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json index 9ed7ffec610..23985f8e513 100644 --- a/app/code/Magento/ConfigurableProduct/composer.json +++ b/app/code/Magento/ConfigurableProduct/composer.json @@ -3,23 +3,23 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-catalog-rule": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", - "magento/module-webapi": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-catalog-rule": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", + "magento/module-webapi": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json index 0a2f4639ffb..ced09c56822 100644 --- a/app/code/Magento/Contact/composer.json +++ b/app/code/Magento/Contact/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-cms": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-cms": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Core/composer.json b/app/code/Magento/Core/composer.json index 6385a681288..79b3331b3d2 100644 --- a/app/code/Magento/Core/composer.json +++ b/app/code/Magento/Core/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-cron": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-page-cache": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-cron": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-page-cache": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json index 7160659a279..e8822a751d0 100644 --- a/app/code/Magento/Cron/composer.json +++ b/app/code/Magento/Cron/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json index 623cca53af8..ee5d01bed4f 100644 --- a/app/code/Magento/CurrencySymbol/composer.json +++ b/app/code/Magento/CurrencySymbol/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-page-cache": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-page-cache": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json index 1ecbe8de0d0..f2300866397 100644 --- a/app/code/Magento/Customer/composer.json +++ b/app/code/Magento/Customer/composer.json @@ -3,27 +3,27 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-newsletter": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-wishlist": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-review": "0.1.0-alpha99", - "magento/module-tax": "0.1.0-alpha99", - "magento/module-page-cache": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", - "magento/module-authorization": "0.1.0-alpha99", - "magento/module-integration": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-newsletter": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-wishlist": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-review": "0.1.0-alpha100", + "magento/module-tax": "0.1.0-alpha100", + "magento/module-page-cache": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", + "magento/module-authorization": "0.1.0-alpha100", + "magento/module-integration": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json index 483378e0d32..e31874c11ec 100644 --- a/app/code/Magento/CustomerImportExport/composer.json +++ b/app/code/Magento/CustomerImportExport/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-import-export": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-import-export": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/DesignEditor/composer.json b/app/code/Magento/DesignEditor/composer.json index 6b7bd9c9821..fae72900d3f 100644 --- a/app/code/Magento/DesignEditor/composer.json +++ b/app/code/Magento/DesignEditor/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json index 27a24171501..62a121220d0 100644 --- a/app/code/Magento/Dhl/composer.json +++ b/app/code/Magento/Dhl/composer.json @@ -3,21 +3,21 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-shipping": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-shipping": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json index 27cec5f8ecb..a6e05bcc522 100644 --- a/app/code/Magento/Directory/composer.json +++ b/app/code/Magento/Directory/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json index 0ff75b817a6..8c6f527aef4 100644 --- a/app/code/Magento/Downloadable/composer.json +++ b/app/code/Magento/Downloadable/composer.json @@ -3,26 +3,26 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-tax": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-wishlist": "0.1.0-alpha99", - "magento/module-gift-message": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/module-msrp": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-tax": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-wishlist": "0.1.0-alpha100", + "magento/module-gift-message": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/module-msrp": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json index 56733a7de08..60ad78880a4 100644 --- a/app/code/Magento/Eav/composer.json +++ b/app/code/Magento/Eav/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json index bd66dbac112..6d50da97432 100644 --- a/app/code/Magento/Email/composer.json +++ b/app/code/Magento/Email/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-cms": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-cms": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json index 35cac1d39fd..bb05a80c683 100644 --- a/app/code/Magento/Fedex/composer.json +++ b/app/code/Magento/Fedex/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-shipping": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-shipping": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json index 1fad6737923..a8874b7adc9 100644 --- a/app/code/Magento/GiftMessage/composer.json +++ b/app/code/Magento/GiftMessage/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-multishipping": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-multishipping": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json index a0b8bf47eab..16feb6d641a 100644 --- a/app/code/Magento/GoogleAdwords/composer.json +++ b/app/code/Magento/GoogleAdwords/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json index 0dd38270051..b7019fc7880 100644 --- a/app/code/Magento/GoogleAnalytics/composer.json +++ b/app/code/Magento/GoogleAnalytics/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json index a971bab4db4..e69eeb805ea 100644 --- a/app/code/Magento/GoogleOptimizer/composer.json +++ b/app/code/Magento/GoogleOptimizer/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-google-analytics": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-cms": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-google-analytics": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-cms": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/GoogleShopping/composer.json b/app/code/Magento/GoogleShopping/composer.json index b8da01b942a..49053185f44 100644 --- a/app/code/Magento/GoogleShopping/composer.json +++ b/app/code/Magento/GoogleShopping/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-tax": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-tax": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json index 24eee9c8ca0..73f91ed761a 100644 --- a/app/code/Magento/GroupedImportExport/composer.json +++ b/app/code/Magento/GroupedImportExport/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-import-export": "0.1.0-alpha99", - "magento/module-catalog-import-export": "0.1.0-alpha99", - "magento/module-grouped-product": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-import-export": "0.1.0-alpha100", + "magento/module-catalog-import-export": "0.1.0-alpha100", + "magento/module-grouped-product": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json index 105c39d73ce..c938f3e4555 100644 --- a/app/code/Magento/GroupedProduct/composer.json +++ b/app/code/Magento/GroupedProduct/composer.json @@ -3,21 +3,21 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-msrp": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-msrp": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json index c4df769cd1c..a5d8e062ae6 100644 --- a/app/code/Magento/ImportExport/composer.json +++ b/app/code/Magento/ImportExport/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-indexer": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-indexer": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "ext-ctype": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json index 89158bdb712..6636bc52c35 100644 --- a/app/code/Magento/Indexer/composer.json +++ b/app/code/Magento/Indexer/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-page-cache": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-page-cache": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Install/composer.json b/app/code/Magento/Install/composer.json index d97e8728870..2e2a0f33021 100644 --- a/app/code/Magento/Install/composer.json +++ b/app/code/Magento/Install/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-user": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-user": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json index aceae5052c4..8cdd5069e80 100644 --- a/app/code/Magento/Integration/composer.json +++ b/app/code/Magento/Integration/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-user": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", - "magento/module-authorization": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-user": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", + "magento/module-authorization": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json index ff05d46afd5..a657286e691 100644 --- a/app/code/Magento/LayeredNavigation/composer.json +++ b/app/code/Magento/LayeredNavigation/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Log/composer.json b/app/code/Magento/Log/composer.json index 7ded9107c41..476ac89353c 100644 --- a/app/code/Magento/Log/composer.json +++ b/app/code/Magento/Log/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json index d91ccbe3d14..bfeb9c52ac1 100644 --- a/app/code/Magento/Msrp/composer.json +++ b/app/code/Magento/Msrp/composer.json @@ -3,21 +3,21 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-bundle": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-configurable-product": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-downloadable": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-grouped-product": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-store": "0.1.0-alpha99", - "magento/module-tax": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-bundle": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-configurable-product": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-downloadable": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-grouped-product": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-store": "0.1.0-alpha100", + "magento/module-tax": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json index d06967fb250..7feeefd3abf 100644 --- a/app/code/Magento/Multishipping/composer.json +++ b/app/code/Magento/Multishipping/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-payment": "0.1.0-alpha99", - "magento/module-tax": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-payment": "0.1.0-alpha100", + "magento/module-tax": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json index d062da3b653..b65ce76e915 100644 --- a/app/code/Magento/Newsletter/composer.json +++ b/app/code/Magento/Newsletter/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-widget": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-cms": "0.1.0-alpha99", - "magento/module-email": "0.1.0-alpha99", - "magento/module-cron": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-widget": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-cms": "0.1.0-alpha100", + "magento/module-email": "0.1.0-alpha100", + "magento/module-cron": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json index ce8b09fbd54..9ac8c14f47a 100644 --- a/app/code/Magento/OfflinePayments/composer.json +++ b/app/code/Magento/OfflinePayments/composer.json @@ -3,12 +3,12 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-payment": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-payment": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json index 732359a8e36..f86e484363a 100644 --- a/app/code/Magento/OfflineShipping/composer.json +++ b/app/code/Magento/OfflineShipping/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-shipping": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-sales-rule": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-shipping": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-sales-rule": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Ogone/composer.json b/app/code/Magento/Ogone/composer.json index a6ae552931a..2dd0962186c 100644 --- a/app/code/Magento/Ogone/composer.json +++ b/app/code/Magento/Ogone/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-payment": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-payment": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json index 08ca19c42d7..1ee2ef856d9 100644 --- a/app/code/Magento/PageCache/composer.json +++ b/app/code/Magento/PageCache/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/PayPalRecurringPayment/composer.json b/app/code/Magento/PayPalRecurringPayment/composer.json index d746f5ebe7d..a26aa7f6470 100644 --- a/app/code/Magento/PayPalRecurringPayment/composer.json +++ b/app/code/Magento/PayPalRecurringPayment/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-payment": "0.1.0-alpha99", - "magento/module-paypal": "0.1.0-alpha99", - "magento/module-recurring-payment": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-payment": "0.1.0-alpha100", + "magento/module-paypal": "0.1.0-alpha100", + "magento/module-recurring-payment": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json index f4f2c074bae..094f7143eef 100644 --- a/app/code/Magento/Payment/composer.json +++ b/app/code/Magento/Payment/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-centinel": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-centinel": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Paypal/composer.json b/app/code/Magento/Paypal/composer.json index a5f7b98113d..dadd399fed5 100644 --- a/app/code/Magento/Paypal/composer.json +++ b/app/code/Magento/Paypal/composer.json @@ -3,25 +3,25 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-payment": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-tax": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/module-centinel": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-payment": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-tax": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/module-centinel": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json index 7285eeb62d5..4b00a96a16e 100644 --- a/app/code/Magento/Persistent/composer.json +++ b/app/code/Magento/Persistent/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-cron": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-cron": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json index 70f4aea631d..dc6fa62014d 100644 --- a/app/code/Magento/ProductAlert/composer.json +++ b/app/code/Magento/ProductAlert/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/RecurringPayment/composer.json b/app/code/Magento/RecurringPayment/composer.json index 5759c57186e..8b0bf5a41a6 100644 --- a/app/code/Magento/RecurringPayment/composer.json +++ b/app/code/Magento/RecurringPayment/composer.json @@ -3,22 +3,22 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-payment": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-payment": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json index 84843815438..80278009cef 100644 --- a/app/code/Magento/Reports/composer.json +++ b/app/code/Magento/Reports/composer.json @@ -3,27 +3,27 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-cms": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-widget": "0.1.0-alpha99", - "magento/module-log": "0.1.0-alpha99", - "magento/module-wishlist": "0.1.0-alpha99", - "magento/module-review": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/module-tax": "0.1.0-alpha99", - "magento/module-downloadable": "0.1.0-alpha99", - "magento/module-sales-rule": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-cms": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-widget": "0.1.0-alpha100", + "magento/module-log": "0.1.0-alpha100", + "magento/module-wishlist": "0.1.0-alpha100", + "magento/module-review": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/module-tax": "0.1.0-alpha100", + "magento/module-downloadable": "0.1.0-alpha100", + "magento/module-sales-rule": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json index 0703faaeb97..90077ab2b20 100644 --- a/app/code/Magento/RequireJs/composer.json +++ b/app/code/Magento/RequireJs/composer.json @@ -3,11 +3,11 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/framework": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json index 5247ac21872..a53815a2311 100644 --- a/app/code/Magento/Review/composer.json +++ b/app/code/Magento/Review/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-tax": "0.1.0-alpha99", - "magento/module-newsletter": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-tax": "0.1.0-alpha100", + "magento/module-newsletter": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json index 1ec8a2abd05..27c62bd5907 100644 --- a/app/code/Magento/Rss/composer.json +++ b/app/code/Magento/Rss/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json index 6bb269688fa..48e6984797a 100644 --- a/app/code/Magento/Rule/composer.json +++ b/app/code/Magento/Rule/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json index 6e17eeb82ee..6f08f6dcf96 100644 --- a/app/code/Magento/Sales/composer.json +++ b/app/code/Magento/Sales/composer.json @@ -3,31 +3,31 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-authorization": "0.1.0-alpha99", - "magento/module-payment": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/module-sales-rule": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-widget": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-tax": "0.1.0-alpha99", - "magento/module-gift-message": "0.1.0-alpha99", - "magento/module-reports": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/module-wishlist": "0.1.0-alpha99", - "magento/module-email": "0.1.0-alpha99", - "magento/module-shipping": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-authorization": "0.1.0-alpha100", + "magento/module-payment": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/module-sales-rule": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-widget": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-tax": "0.1.0-alpha100", + "magento/module-gift-message": "0.1.0-alpha100", + "magento/module-reports": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/module-wishlist": "0.1.0-alpha100", + "magento/module-email": "0.1.0-alpha100", + "magento/module-shipping": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json index 44d93a3205c..363b60b1db4 100644 --- a/app/code/Magento/SalesRule/composer.json +++ b/app/code/Magento/SalesRule/composer.json @@ -3,26 +3,26 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-rule": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-shipping": "0.1.0-alpha99", - "magento/module-payment": "0.1.0-alpha99", - "magento/module-reports": "0.1.0-alpha99", - "magento/module-catalog-rule": "0.1.0-alpha99", - "magento/module-widget": "0.1.0-alpha99", - "magento/module-cron": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-rule": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-shipping": "0.1.0-alpha100", + "magento/module-payment": "0.1.0-alpha100", + "magento/module-reports": "0.1.0-alpha100", + "magento/module-catalog-rule": "0.1.0-alpha100", + "magento/module-widget": "0.1.0-alpha100", + "magento/module-cron": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json index 13aaf747fde..430437277ef 100644 --- a/app/code/Magento/Search/composer.json +++ b/app/code/Magento/Search/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/framework": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-store": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-store": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Sendfriend/composer.json b/app/code/Magento/Sendfriend/composer.json index 48793913b4a..c163bf514e2 100644 --- a/app/code/Magento/Sendfriend/composer.json +++ b/app/code/Magento/Sendfriend/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json index d70a5072668..1a2090b2d66 100644 --- a/app/code/Magento/Shipping/composer.json +++ b/app/code/Magento/Shipping/composer.json @@ -3,23 +3,23 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-contact": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-payment": "0.1.0-alpha99", - "magento/module-tax": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-contact": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-payment": "0.1.0-alpha100", + "magento/module-tax": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "ext-gd": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json index cd62ee2265f..e18f63819dd 100644 --- a/app/code/Magento/Sitemap/composer.json +++ b/app/code/Magento/Sitemap/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-cms": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-catalog-url-rewrite": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-cms": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-catalog-url-rewrite": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json index 713ff4030ff..2b1fd964817 100644 --- a/app/code/Magento/Store/composer.json +++ b/app/code/Magento/Store/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-core": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-ui": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-ui": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json index ae7f7192cec..751bb8361df 100644 --- a/app/code/Magento/Tax/composer.json +++ b/app/code/Magento/Tax/composer.json @@ -3,23 +3,23 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-shipping": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-reports": "0.1.0-alpha99", - "magento/module-configurable-product": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-shipping": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-reports": "0.1.0-alpha100", + "magento/module-configurable-product": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json index 4170611094a..c36f859dc82 100644 --- a/app/code/Magento/TaxImportExport/composer.json +++ b/app/code/Magento/TaxImportExport/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-tax": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-store": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-store": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json index c9ad141aa84..94fa4dc1459 100644 --- a/app/code/Magento/Theme/composer.json +++ b/app/code/Magento/Theme/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-cms": "0.1.0-alpha99", - "magento/module-translation": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-cms": "0.1.0-alpha100", + "magento/module-translation": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json index 22fb25cdd3e..7f5f3eddee1 100644 --- a/app/code/Magento/Translation/composer.json +++ b/app/code/Magento/Translation/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-core": "0.1.0-alpha99", - "magento/module-store": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha100", + "magento/module-store": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json index c676b556756..c8cf4d2ee27 100644 --- a/app/code/Magento/Ui/composer.json +++ b/app/code/Magento/Ui/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-store": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-store": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json index dfd436ce7b8..3f23befedde 100644 --- a/app/code/Magento/Ups/composer.json +++ b/app/code/Magento/Ups/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-shipping": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-shipping": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json index 797c4f63115..399b6157ea8 100644 --- a/app/code/Magento/UrlRewrite/composer.json +++ b/app/code/Magento/UrlRewrite/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-store": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-catalog-url-rewrite": "0.1.0-alpha99", - "magento/module-cms": "0.1.0-alpha99", - "magento/module-cms-url-rewrite": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-store": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-catalog-url-rewrite": "0.1.0-alpha100", + "magento/module-cms": "0.1.0-alpha100", + "magento/module-cms-url-rewrite": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json index 78b7114959f..07b6273e679 100644 --- a/app/code/Magento/User/composer.json +++ b/app/code/Magento/User/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-authorization": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-integration": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-authorization": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-integration": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json index 2adcc8616d2..664270d7e52 100644 --- a/app/code/Magento/Usps/composer.json +++ b/app/code/Magento/Usps/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-shipping": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-shipping": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json index 52932187db1..8a945dd19d1 100644 --- a/app/code/Magento/Webapi/composer.json +++ b/app/code/Magento/Webapi/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-authorization": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-integration": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-user": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-authorization": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-integration": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-user": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json index d4a7d32ab6c..47638113a82 100644 --- a/app/code/Magento/Weee/composer.json +++ b/app/code/Magento/Weee/composer.json @@ -3,21 +3,21 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-tax": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-directory": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-eav": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-bundle": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-tax": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-directory": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-eav": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-bundle": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json index ca168676af0..ba81cbdab95 100644 --- a/app/code/Magento/Widget/composer.json +++ b/app/code/Magento/Widget/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-cms": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-cms": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json index e7f3d6d59dd..ca7ed601047 100644 --- a/app/code/Magento/Wishlist/composer.json +++ b/app/code/Magento/Wishlist/composer.json @@ -3,25 +3,25 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha99", - "magento/module-customer": "0.1.0-alpha99", - "magento/module-catalog": "0.1.0-alpha99", - "magento/module-core": "0.1.0-alpha99", - "magento/module-checkout": "0.1.0-alpha99", - "magento/module-theme": "0.1.0-alpha99", - "magento/module-catalog-inventory": "0.1.0-alpha99", - "magento/module-rss": "0.1.0-alpha99", - "magento/module-backend": "0.1.0-alpha99", - "magento/module-bundle": "0.1.0-alpha99", - "magento/module-sales": "0.1.0-alpha99", - "magento/module-grouped-product": "0.1.0-alpha99", - "magento/module-configurable-product": "0.1.0-alpha99", - "magento/module-downloadable": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha100", + "magento/module-customer": "0.1.0-alpha100", + "magento/module-catalog": "0.1.0-alpha100", + "magento/module-core": "0.1.0-alpha100", + "magento/module-checkout": "0.1.0-alpha100", + "magento/module-theme": "0.1.0-alpha100", + "magento/module-catalog-inventory": "0.1.0-alpha100", + "magento/module-rss": "0.1.0-alpha100", + "magento/module-backend": "0.1.0-alpha100", + "magento/module-bundle": "0.1.0-alpha100", + "magento/module-sales": "0.1.0-alpha100", + "magento/module-grouped-product": "0.1.0-alpha100", + "magento/module-configurable-product": "0.1.0-alpha100", + "magento/module-downloadable": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json index 51e7f021faf..63fa35ed956 100644 --- a/app/design/adminhtml/Magento/backend/composer.json +++ b/app/design/adminhtml/Magento/backend/composer.json @@ -3,11 +3,11 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/framework": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-theme", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/design/adminhtml/Magento/backend/theme.xml b/app/design/adminhtml/Magento/backend/theme.xml index f7bf6aed49a..de93b622831 100644 --- a/app/design/adminhtml/Magento/backend/theme.xml +++ b/app/design/adminhtml/Magento/backend/theme.xml @@ -24,5 +24,5 @@ --> <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd"> <title>Magento 2 backend</title> - <version>0.1.0-alpha99</version> + <version>0.1.0-alpha100</version> </theme> diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json index caa85240e12..e4f07c27fa9 100644 --- a/app/design/frontend/Magento/blank/composer.json +++ b/app/design/frontend/Magento/blank/composer.json @@ -3,11 +3,11 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/framework": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-theme", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/design/frontend/Magento/blank/theme.xml b/app/design/frontend/Magento/blank/theme.xml index 75644de5e44..253ad49461b 100644 --- a/app/design/frontend/Magento/blank/theme.xml +++ b/app/design/frontend/Magento/blank/theme.xml @@ -24,7 +24,7 @@ --> <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd"> <title>Magento Blank</title> - <version>0.1.0-alpha99</version> + <version>0.1.0-alpha100</version> <media> <preview_image>media/preview.jpg</preview_image> </media> diff --git a/app/design/frontend/Magento/plushe/composer.json b/app/design/frontend/Magento/plushe/composer.json index f4aaff55172..3277ffd526e 100644 --- a/app/design/frontend/Magento/plushe/composer.json +++ b/app/design/frontend/Magento/plushe/composer.json @@ -3,12 +3,12 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/theme-frontend-blank": "0.1.0-alpha99", - "magento/framework": "0.1.0-alpha99", + "magento/theme-frontend-blank": "0.1.0-alpha100", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-theme", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "extra": { "map": [ [ diff --git a/app/design/frontend/Magento/plushe/theme.xml b/app/design/frontend/Magento/plushe/theme.xml index 8aa89616028..1bcaa3cd2ac 100644 --- a/app/design/frontend/Magento/plushe/theme.xml +++ b/app/design/frontend/Magento/plushe/theme.xml @@ -24,7 +24,7 @@ --> <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd"> <title>Magento Plushe</title> - <version>0.1.0-alpha99</version> + <version>0.1.0-alpha100</version> <parent>Magento/blank</parent> <media> <preview_image>media/preview.jpg</preview_image> diff --git a/app/design/install/Magento/basic/theme.xml b/app/design/install/Magento/basic/theme.xml index b62e26bf97f..80a2a4efda1 100644 --- a/app/design/install/Magento/basic/theme.xml +++ b/app/design/install/Magento/basic/theme.xml @@ -24,5 +24,5 @@ --> <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd"> <title>Magento Basic</title> - <version>0.1.0-alpha99</version> + <version>0.1.0-alpha100</version> </theme> diff --git a/app/i18n/magento/de_de/composer.json b/app/i18n/magento/de_de/composer.json index b225fb4e3ca..9c4992e1db6 100644 --- a/app/i18n/magento/de_de/composer.json +++ b/app/i18n/magento/de_de/composer.json @@ -1,9 +1,9 @@ { "name": "magento/language-de_de", "description": "German (Germany) language", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "require": { - "magento/framework": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/en_us/composer.json b/app/i18n/magento/en_us/composer.json index cd4cf9d353a..0b621cc2341 100644 --- a/app/i18n/magento/en_us/composer.json +++ b/app/i18n/magento/en_us/composer.json @@ -1,9 +1,9 @@ { "name": "magento/language-en_us", "description": "English (United States) language", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "require": { - "magento/framework": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/es_es/composer.json b/app/i18n/magento/es_es/composer.json index ddbdcec4ccb..e9ba06bc09d 100644 --- a/app/i18n/magento/es_es/composer.json +++ b/app/i18n/magento/es_es/composer.json @@ -1,9 +1,9 @@ { "name": "magento/language-es_es", "description": "Spanish (Spain) language", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "require": { - "magento/framework": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/fr_fr/composer.json b/app/i18n/magento/fr_fr/composer.json index bc518653e2d..78e17ebd457 100644 --- a/app/i18n/magento/fr_fr/composer.json +++ b/app/i18n/magento/fr_fr/composer.json @@ -1,9 +1,9 @@ { "name": "magento/language-fr_fr", "description": "French (France) language", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "require": { - "magento/framework": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/nl_nl/composer.json b/app/i18n/magento/nl_nl/composer.json index 67ab860c4ee..1d4f58e6dec 100644 --- a/app/i18n/magento/nl_nl/composer.json +++ b/app/i18n/magento/nl_nl/composer.json @@ -1,9 +1,9 @@ { "name": "magento/language-nl_nl", "description": "Dutch (Netherlands) language", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "require": { - "magento/framework": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/pt_br/composer.json b/app/i18n/magento/pt_br/composer.json index 20fe0dacdf5..acf248feedb 100644 --- a/app/i18n/magento/pt_br/composer.json +++ b/app/i18n/magento/pt_br/composer.json @@ -1,9 +1,9 @@ { "name": "magento/language-pt_br", "description": "Portuguese (Brazil) language", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "require": { - "magento/framework": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/zh_cn/composer.json b/app/i18n/magento/zh_cn/composer.json index de4070246f7..4852b48a899 100644 --- a/app/i18n/magento/zh_cn/composer.json +++ b/app/i18n/magento/zh_cn/composer.json @@ -1,9 +1,9 @@ { "name": "magento/language-zh_cn", "description": "Chinese (China) language", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "require": { - "magento/framework": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha100", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/composer.json b/composer.json index 717711d1f7c..a1c75d0a375 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magento/project-community-edition", "description": "Magento project (Community Edition)", "type": "project", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "require": { "php": "~5.4.11|~5.5.0", "zendframework/zend-stdlib": "2.0.3" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php index 1d8dee8ecda..94d22714463 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php @@ -617,6 +617,13 @@ class CatalogProductSimple extends InjectableFixture 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts' ]; + protected $related_products = [ + 'attribute_code' => 'related_products', + 'backend_type' => 'virtual', + 'group' => 'related-products', + 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\RelatedProducts' + ]; + public function getCategoryIds() { return $this->getData('category_ids'); @@ -926,4 +933,9 @@ class CatalogProductSimple extends InjectableFixture { return $this->getData('up_sell_products'); } + + public function getRelatedProducts() + { + return $this->getData('related_products'); + } } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml index 8282a773085..ce01bc394d0 100755 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml @@ -470,11 +470,17 @@ <source>Magento\Catalog\Test\Fixture\CatalogProductSimple\CrossSellProducts</source> </cross_sell_products> <up_sell_products> - <attribute_code>cross_sell_products</attribute_code> + <attribute_code>up_sell_products</attribute_code> <backend_type>virtual</backend_type> - <group>crosssells</group> + <group>upsells</group> <source>Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts</source> </up_sell_products> + <related_products> + <attribute_code>related_products</attribute_code> + <backend_type>virtual</backend_type> + <group>related-products</group> + <source>Magento\Catalog\Test\Fixture\CatalogProductSimple\RelatedProducts</source> + </related_products> </fields> <data_set> <sku></sku> diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php index 09d7c16a612..92baca55833 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php @@ -30,7 +30,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple; /** * Class AbstractRelatedProducts - * Base class create related products + * Base class for create related products */ class AbstractRelatedProducts implements FixtureInterface { diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/RelatedProducts.php similarity index 82% rename from dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.php rename to dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/RelatedProducts.php index 9937b4ba01e..486442b9bf7 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/RelatedProducts.php @@ -22,15 +22,13 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed; - -use Magento\Reports\Test\Block\Adminhtml\AbstractFilter; +namespace Magento\Catalog\Test\Fixture\CatalogProductSimple; /** - * Class Filter - * Filter for Sales Report + * Class RelatedProducts + * Create related products */ -class Filter extends AbstractFilter +class RelatedProducts extends AbstractRelatedProducts { // } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractAddRelatedProductsEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractAddRelatedProductsEntityTest.php new file mode 100644 index 00000000000..718fe86b6bd --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractAddRelatedProductsEntityTest.php @@ -0,0 +1,131 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Catalog\Test\TestCase\Product; + +use Mtf\TestCase\Injectable; +use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew; +use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex; +use Mtf\Fixture\FixtureFactory; +use Mtf\Fixture\FixtureInterface; + +/** + * Class AbstractAddRelatedProductsEntityTest + * Base class for add related products entity test + */ +abstract class AbstractAddRelatedProductsEntityTest extends Injectable +{ + /** + * Fixture factory + * + * @var FixtureFactory + */ + protected $fixtureFactory; + + /** + * Catalog product index page on backend + * + * @var CatalogProductIndex + */ + protected $catalogProductIndex; + + /** + * Catalog product view page on backend + * + * @var CatalogProductNew + */ + protected $catalogProductNew; + + /** + * Type of related products + * + * @var string + */ + protected $typeRelatedProducts = ''; + + /** + * Prepare data + * + * @param FixtureFactory $fixtureFactory + * @return void + */ + public function __prepare(FixtureFactory $fixtureFactory) + { + $this->fixtureFactory = $fixtureFactory; + } + + /** + * Inject data + * + * @param CatalogProductIndex $catalogProductIndex + * @param CatalogProductNew $catalogProductNew + * @return void + */ + public function __inject(CatalogProductIndex $catalogProductIndex, CatalogProductNew $catalogProductNew) + { + $this->catalogProductIndex = $catalogProductIndex; + $this->catalogProductNew = $catalogProductNew; + } + + /** + * Get product by data + * + * @param string $productData + * @param array $relatedProductsData + * @return FixtureInterface + */ + protected function getProductByData($productData, array $relatedProductsData) + { + list($fixtureName, $dataSet) = explode('::', $productData); + $relatedProductsPresets = []; + foreach ($relatedProductsData as $type => $presets) { + $relatedProductsPresets[$type]['presets'] = $presets; + } + + return $this->fixtureFactory->createByCode( + $fixtureName, + [ + 'dataSet' => $dataSet, + 'data' => $relatedProductsPresets + ] + ); + } + + /** + * Create and save product + * + * @param FixtureInterface $product + * @return void + */ + protected function createAndSaveProduct(FixtureInterface $product) + { + $dataConfig = $product->getDataConfig(); + $typeId = isset($dataConfig['type_id']) ? $dataConfig['type_id'] : null; + + $this->catalogProductIndex->open(); + $this->catalogProductIndex->getGridPageActionBlock()->addProduct($typeId); + $this->catalogProductNew->getProductForm()->fill($product); + $this->catalogProductNew->getFormPageActions()->save($product); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest.php index 0cb67b73099..da128f67402 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest.php @@ -24,11 +24,6 @@ namespace Magento\Catalog\Test\TestCase\Product; -use Mtf\ObjectManager; -use Mtf\TestCase\Injectable; -use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex; -use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew; -use Magento\Catalog\Test\Fixture\CatalogProductSimple; use Magento\Catalog\Test\Fixture\CatalogProductSimple\CrossSellProducts; /** @@ -50,50 +45,25 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple\CrossSellProducts; * @group Cross-sells_(MX) * @ZephyrId MAGETWO-29081 */ -class AddCrossSellEntityTest extends Injectable +class AddCrossSellEntityTest extends AbstractAddRelatedProductsEntityTest { /** - * Catalog product index page on backend + * Run test add cross sell products entity * - * @var CatalogProductIndex - */ - protected $catalogProductIndex; - - /** - * Catalog product view page on backend - * - * @var CatalogProductNew - */ - protected $catalogProductNew; - - /** - * Inject data - * - * @param CatalogProductIndex $catalogProductIndex - * @param CatalogProductNew $catalogProductNew - * @return void - */ - public function __inject(CatalogProductIndex $catalogProductIndex, CatalogProductNew $catalogProductNew) - { - $this->catalogProductIndex = $catalogProductIndex; - $this->catalogProductNew = $catalogProductNew; - } - - /** - * Run test add cross sell entity - * - * @param CatalogProductSimple $product + * @param string $productData + * @param string $crossSellProductsData * @return array */ - public function test(CatalogProductSimple $product) + public function test($productData, $crossSellProductsData) { - $this->catalogProductIndex->open(); - $this->catalogProductIndex->getGridPageActionBlock()->addProduct('simple'); - $this->catalogProductNew->getProductForm()->fill($product); - $this->catalogProductNew->getFormPageActions()->save(); + $product = $this->getProductByData($productData, ['cross_sell_products' => $crossSellProductsData]); + $this->createAndSaveProduct($product); - /** @var CrossSellProducts $crossSellProducts*/ + /** @var CrossSellProducts $crossSellProducts */ $crossSellProducts = $product->getDataFieldConfig('cross_sell_products')['source']; - return ['relatedProducts' => $crossSellProducts->getProducts()]; + return [ + 'product' => $product, + 'relatedProducts' => $crossSellProducts->getProducts() + ]; } } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest/test.csv index 97fda4fc3f2..70496262556 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest/test.csv +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest/test.csv @@ -1,2 +1,2 @@ -"product/dataSet";"product/data/cross_sell_products/presets";"constraint" -"default";"catalogProductSimple::default, configurableProductInjectable::default";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertCrossSellsProductsSection" +"productData";"crossSellProductsData";"constraint" +"catalogProductSimple::default";"catalogProductSimple::default, configurableProductInjectable::default";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertCrossSellsProductsSection" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddRelatedProductsEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddRelatedProductsEntityTest.php new file mode 100644 index 00000000000..50192e4890f --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddRelatedProductsEntityTest.php @@ -0,0 +1,70 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Catalog\Test\TestCase\Product; + +use Magento\Catalog\Test\Fixture\CatalogProductSimple\RelatedProducts; + +/** + * Class AddRelatedProductsEntityTest + * + * Test Flow: + * + * Preconditions: + * 1. Create simple Product + * 2. Create Configurable Product + * + * Steps: + * 1. Open Backend + * 2. Go to Products> Catalog + * 3. Add Product + * 4. Fill data according to dataSet + * 5. Save product + * 6. Perform all assertions + * + * @group Related_Products_(MX) + * @ZephyrId MAGETWO-29352 + */ +class AddRelatedProductsEntityTest extends AbstractAddRelatedProductsEntityTest +{ + /** + * Run test add related products entity + * + * @param string $productData + * @param string $relatedProductsData + * @return array + */ + public function test($productData, $relatedProductsData) + { + $product = $this->getProductByData($productData, ['related_products' => $relatedProductsData]); + $this->createAndSaveProduct($product); + + /** @var RelatedProducts $relatedProducts */ + $relatedProducts = $product->getDataFieldConfig('related_products')['source']; + return [ + 'product' => $product, + 'relatedProducts' => $relatedProducts->getProducts() + ]; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddRelatedProductsEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddRelatedProductsEntityTest/test.csv new file mode 100644 index 00000000000..c79fcf06524 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddRelatedProductsEntityTest/test.csv @@ -0,0 +1,2 @@ +"productData";"relatedProductsData";"constraint" +"catalogProductSimple::default";"catalogProductSimple::default, configurableProductInjectable::default";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertRelatedProductsSection" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest.php index 00459db77a0..1b8744d50ea 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest.php @@ -24,12 +24,6 @@ namespace Magento\Catalog\Test\TestCase\Product; -use Mtf\TestCase\Injectable; -use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew; -use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex; -use Mtf\Fixture\FixtureFactory; -use Mtf\Fixture\FixtureInterface; -use Magento\Catalog\Test\Fixture\CatalogProductSimple; use Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts; /** @@ -50,99 +44,25 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts; * @group Up-sells_(MX) * @ZephyrId MAGETWO-29105 */ -class AddUpSellEntityTest extends Injectable +class AddUpSellEntityTest extends AbstractAddRelatedProductsEntityTest { /** - * Fixture factory - * - * @var FixtureFactory - */ - protected $fixtureFactory; - - /** - * Catalog product index page on backend - * - * @var CatalogProductIndex - */ - protected $catalogProductIndex; - - /** - * Catalog product view page on backend - * - * @var CatalogProductNew - */ - protected $catalogProductNew; - - /** - * Prepare data - * - * @param FixtureFactory $fixtureFactory - * @return void - */ - public function __prepare(FixtureFactory $fixtureFactory) - { - $this->fixtureFactory = $fixtureFactory; - } - - /** - * Inject data - * - * @param CatalogProductIndex $catalogProductIndex - * @param CatalogProductNew $catalogProductNew - * @return void - */ - public function __inject(CatalogProductIndex $catalogProductIndex, CatalogProductNew $catalogProductNew) - { - $this->catalogProductIndex = $catalogProductIndex; - $this->catalogProductNew = $catalogProductNew; - } - - /** - * Run test add up sell entity + * Run test add up sell products entity * * @param string $productData - * @param string $upSellProducts + * @param string $upSellProductsData * @return array */ - public function test($productData, $upSellProducts) + public function test($productData, $upSellProductsData) { - $product = $this->createProduct($productData, $upSellProducts); - $dataConfig = $product->getDataConfig(); - $typeId = isset($dataConfig['type_id']) ? $dataConfig['type_id'] : null; + $product = $this->getProductByData($productData, ['up_sell_products' => $upSellProductsData]); + $this->createAndSaveProduct($product); - $this->catalogProductIndex->open(); - $this->catalogProductIndex->getGridPageActionBlock()->addProduct($typeId); - $this->catalogProductNew->getProductForm()->fill($product); - $this->catalogProductNew->getFormPageActions()->save($product); - - /** @var UpSellProducts $upSellProducts*/ + /** @var UpSellProducts $upSellProducts */ $upSellProducts = $product->getDataFieldConfig('up_sell_products')['source']; return [ 'product' => $product, 'relatedProducts' => $upSellProducts->getProducts() ]; } - - /** - * Create product - * - * @param string $productData - * @param string $upSellProducts - * @return FixtureInterface - */ - protected function createProduct($productData, $upSellProducts) - { - list($fixtureCode, $dataSet) = explode('::', $productData); - return $this->fixtureFactory->createByCode( - $fixtureCode, - [ - 'dataSet' => $dataSet, - 'data' => [ - 'up_sell_products' => [ - 'presets' => $upSellProducts - ] - ] - ] - ); - } } diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest/test.csv index 75ba2838465..f7e6a3f0837 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest/test.csv +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest/test.csv @@ -1,3 +1,3 @@ -"productData";"upSellProducts";"constraint" +"productData";"upSellProductsData";"constraint" "catalogProductSimple::default";"catalogProductSimple::default, configurableProductInjectable::default";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertUpSellsProductsSection" "configurableProductInjectable::default";"catalogProductSimple::default, configurableProductInjectable::default";"assertProductSaveMessage, assertProductInGrid, assertConfigurableProductForm, assertUpSellsProductsSection" diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php new file mode 100644 index 00000000000..3a2678f73b5 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php @@ -0,0 +1,106 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Catalog\Test\TestCase\Product; + +use Mtf\TestCase\Injectable; +use Mtf\Fixture\FixtureFactory; +use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew; +use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex; + +/** + * Test Creation for ProductTypeSwitchingOnCreation + * + * Test Flow: + * 1. Open backend + * 2. Go to Products > Catalog + * 3. Start create product from preconditions (according dataSet) + * 4. Fill data from dataSet + * 5. Save + * 6. Perform all assertions + * + * @group Products_(MX) + * @ZephyrId MAGETWO-29398 + */ +class ProductTypeSwitchingOnCreationTest extends Injectable +{ + /** + * Product page with a grid + * + * @var CatalogProductIndex + */ + protected $catalogProductIndex; + + /** + * Page to create a product + * + * @var CatalogProductNew + */ + protected $catalogProductNew; + + /** + * Fixture Factory + * + * @var FixtureFactory + */ + protected $fixtureFactory; + + /** + * Injection data + * + * @param CatalogProductIndex $catalogProductIndex + * @param CatalogProductNew $catalogProductNew + * @param FixtureFactory $fixtureFactory + * @return void + */ + public function __inject( + CatalogProductIndex $catalogProductIndex, + CatalogProductNew $catalogProductNew, + FixtureFactory $fixtureFactory + ) { + $this->catalogProductIndex = $catalogProductIndex; + $this->catalogProductNew = $catalogProductNew; + $this->fixtureFactory = $fixtureFactory; + } + + /** + * Run product type switching on creation test + * + * @param string $createProduct + * @param string $product + * @return array + */ + public function test($createProduct, $product) + { + // Steps + $this->catalogProductIndex->open(); + $this->catalogProductIndex->getGridPageActionBlock()->addProduct($createProduct); + list($fixture, $dataSet) = explode('::', $product); + $product = $this->fixtureFactory->createByCode($fixture, ['dataSet' => $dataSet]); + $this->catalogProductNew->getProductForm()->fill($product); + $this->catalogProductNew->getFormPageActions()->save($product); + + return ['product' => $product]; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest/test.csv new file mode 100644 index 00000000000..7881421044a --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest/test.csv @@ -0,0 +1,10 @@ +"createProduct";"product";"constraint" +"simple";"configurableProductInjectable::default";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately" +"simple";"catalogProductVirtual::default";"assertProductSaveMessage, assertProductInGrid" +"configurable";"catalogProductSimple::default";"assertProductSaveMessage, assertProductInGrid" +"configurable";"catalogProductVirtual::default";"assertProductSaveMessage, assertProductInGrid" +"virtual";"catalogProductSimple::default";"assertProductSaveMessage, assertProductInGrid" +"virtual";"configurableProductInjectable::not_virtual_for_type_switching";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately" +"virtual";"downloadableProductInjectable::default";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductInStock" +"downloadable";"catalogProductSimple::default";"assertProductSaveMessage, assertProductInGrid" +"downloadable";"configurableProductInjectable::not_virtual_for_type_switching";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately" diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/AbstractCartItem.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/AbstractCartItem.php index 7b106283eb0..bbb3face4db 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/AbstractCartItem.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/AbstractCartItem.php @@ -65,7 +65,7 @@ class AbstractCartItem extends Block * * @var string */ - protected $optionsBlock = './/dl[@class="cart-item-options"]'; + protected $optionsBlock = './/dl[@class="item-options"]'; /** * Escape currency in price diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php index f8406a32c9f..b698fbe9b1d 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php @@ -110,7 +110,7 @@ class AssertCartItemsOptions extends AbstractAssertForm } $formValue = isset($formData[$key]) ? $formData[$key] : null; - if (!is_array($formValue)) { + if ($formValue && !is_array($formValue)) { $formValue = trim($formValue, '. '); } diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php index dbaf43e4e35..dc1c9d1cdc7 100755 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php @@ -62,6 +62,13 @@ class Config extends Tab */ protected $variationsMatrix = '[data-role="product-variations-matrix"]'; + /** + * Selector for variations matrix row + * + * @var string + */ + protected $variationsMatrixRow = '[data-role="product-variations-matrix"] [data-role="row"]'; + /** * Fill variations fieldset * @@ -110,7 +117,7 @@ class Config extends Tab public function generateVariations() { $this->_rootElement->find($this->generateVariations)->click(); - $this->waitForElementVisible($this->variationsMatrix); + $this->waitForElementVisible($this->variationsMatrixRow); } /** diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php index 5dce160b4cc..ea2cf5cfaa7 100755 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php @@ -138,6 +138,13 @@ class Attribute extends Form */ protected $attributeLabel = '[name$="[label]"]'; + /** + * Config content selector + * + * @var string + */ + protected $configContent = '#super_config-content'; + /** * Fill attributes * @@ -296,16 +303,15 @@ class Attribute extends Form $optionMapping = $this->dataMapping(); $count = 1; + /** @var Element $attributeBlock */ $attributeBlock = $this->_rootElement->find(sprintf($this->attributeBlock, $count), Locator::SELECTOR_XPATH); while ($attributeBlock->isVisible()) { + $this->showAttributeContent($attributeBlock); $attribute = [ 'frontend_label' => $attributeBlock->find($this->attributeTitle)->getText(), 'label' => $attributeBlock->find($this->attributeLabel)->getValue(), 'options' => [] ]; - - /** @var Element $attributeBlock */ - $this->showAttributeContent($attributeBlock); $options = $attributeBlock->find($this->optionContainer, Locator::SELECTOR_XPATH)->getElements(); foreach ($options as $optionKey => $option) { /** @var Element $option */ @@ -335,6 +341,7 @@ class Attribute extends Form protected function showAttributeContent(Element $attribute) { if (!$attribute->find($this->attributeContent)->isVisible()) { + $this->_rootElement->find($this->configContent)->click(); $attribute->find($this->attributeTitle)->click(); $browser = $attribute; diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php index 805983a2436..a3eb1ef4667 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php @@ -38,6 +38,13 @@ use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable; */ class ConfigurableOptions extends CustomOptions { + /** + * Option selector + * + * @var string + */ + protected $optionSelector = '//*[./label[contains(.,"%s")]]//select'; + /** * Get configurable product options * @@ -85,6 +92,8 @@ class ConfigurableOptions extends CustomOptions : 'No'; $result[$title] = $optionData; + $this->_rootElement->find(sprintf($this->optionSelector, $title), Locator::SELECTOR_XPATH, 'select') + ->setValue($optionData['options'][0]['title']); } return $result; diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php index 9170954eb70..76e36876b11 100755 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php @@ -56,7 +56,7 @@ class AssertChildProductsInGrid extends AbstractConstraint public function processAssert(CatalogProductIndex $productGrid, ConfigurableProductInjectable $product) { $configurableAttributesData = $product->getConfigurableAttributesData(); - $productType = $product->getIsVirtual() ? 'Virtual Product' : 'Simple Product'; + $productType = $product->getIsVirtual() === "Yes" ? 'Virtual Product' : 'Simple Product'; $errors = []; $productGrid->open(); diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml index 9c9bf96470d..ca37435b5ab 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.xml @@ -468,9 +468,9 @@ <source>Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable\CheckoutData</source> </checkout_data> <up_sell_products> - <attribute_code>cross_sell_products</attribute_code> + <attribute_code>up_sell_products</attribute_code> <backend_type>virtual</backend_type> - <group>crosssells</group> + <group>upsells</group> <source>Magento\Catalog\Test\Fixture\CatalogProductSimple\UpSellProducts</source> </up_sell_products> </fields> diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php index 0f698312e4f..958b4227b08 100644 --- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php +++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php @@ -112,5 +112,24 @@ class ConfigurableProductInjectable extends AbstractRepository 'website_ids' => ['Main Website'], 'attribute_set_id' => ['dataSet' => 'default'], ]; + + $this->_data['not_virtual_for_type_switching'] = [ + 'name' => 'Test configurable product %isolation%', + 'sku' => 'sku_test_configurable_product_%isolation%', + 'price' => ['value' => 120.00], + 'is_virtual' => 'No', + 'weight' => 30.0000, + 'status' => 'Product online', + 'visibility' => 'Catalog, Search', + 'tax_class_id' => ['dataSet' => 'Taxable Goods'], + 'url_key' => 'configurable-product-%isolation%', + 'configurable_attributes_data' => ['preset' => 'default'], + 'quantity_and_stock_status' => [ + 'is_in_stock' => 'In Stock', + ], + 'website_ids' => ['Main Website'], + 'attribute_set_id' => ['dataSet' => 'default'], + 'checkout_data' => ['preset' => 'default'] + ]; } } diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Info.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Info.php index d02eb863ec2..7d0ef0ae1ac 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Info.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Info.php @@ -39,6 +39,20 @@ class Info extends Block */ protected $contactInfoEditLink = '.block-dashboard-info .box-information .action.edit'; + /** + * Css selector for Contact Information Change Password Link + * + * @var string + */ + protected $contactInfoChangePasswordLink = '.block-dashboard-info .box-information .action.change-password'; + + /** + * Dashboard Welcome block locator + * + * @var string + */ + protected $dashboardWelcome = '.block-dashboard-welcome .block-title'; + /** * Click on Contact Information Edit Link * @@ -48,4 +62,24 @@ class Info extends Block { $this->_rootElement->find($this->contactInfoEditLink)->click(); } + + /** + * Click on Contact Information Edit Link + * + * @return void + */ + public function openChangePassword() + { + $this->_rootElement->find($this->contactInfoChangePasswordLink)->click(); + } + + /** + * Get welcome text + * + * @return string + */ + public function getWelcomeText() + { + return $this->_rootElement->find($this->dashboardWelcome)->getText(); + } } diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.xml index 65bf5562f40..d3db8a88c90 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.xml @@ -28,5 +28,8 @@ <firstname /> <lastname /> <email /> + <current_password /> + <password /> + <confirmation /> </fields> </mapping> diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php new file mode 100644 index 00000000000..ba648b17a9a --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php @@ -0,0 +1,71 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Customer\Test\Constraint; + +use Magento\Customer\Test\Page\CustomerAccountEdit; +use Mtf\Constraint\AbstractConstraint; + +/** + * Class AssertChangePasswordFailMessage + * Check that fail message is present + */ +class AssertChangePasswordFailMessage extends AbstractConstraint +{ + /** + * Fail message + */ + const FAIL_MESSAGE = "Password doesn't match for this account."; + + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert that fail message is present + * + * @param CustomerAccountEdit $customerAccountEdit + * @return void + */ + public function processAssert(CustomerAccountEdit $customerAccountEdit) + { + \PHPUnit_Framework_Assert::assertEquals( + self::FAIL_MESSAGE, + $customerAccountEdit->getMessages()->getErrorMessages() + ); + } + + /** + * Returns a string representation of the object + * + * @return string + */ + public function toString() + { + return 'Fail message is displayed.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php new file mode 100644 index 00000000000..bce1fde65f3 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php @@ -0,0 +1,107 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Customer\Test\Constraint; + +use Magento\Customer\Test\Fixture\CustomerInjectable; +use Magento\Customer\Test\Page\CustomerAccountIndex; +use Mtf\Constraint\AbstractConstraint; +use Magento\Cms\Test\Page\CmsIndex; +use Mtf\Fixture\FixtureFactory; + +/** + * Class AssertCustomerPasswordChanged + * Check that login again to frontend with new password was success + */ +class AssertCustomerPasswordChanged extends AbstractConstraint +{ + /** + * Welcome message after login + */ + const SUCCESS_MESSAGE = 'Hello, %s!'; + + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert that login again to frontend with new password was success + * + * @param FixtureFactory $fixtureFactory + * @param CmsIndex $cmsIndex + * @param CustomerAccountIndex $customerAccountIndex + * @param CustomerInjectable $initialCustomer + * @param CustomerInjectable $customer + * @return void + */ + public function processAssert( + FixtureFactory $fixtureFactory, + CmsIndex $cmsIndex, + CustomerAccountIndex $customerAccountIndex, + CustomerInjectable $initialCustomer, + CustomerInjectable $customer + ) { + $cmsIndex->open(); + if ($cmsIndex->getLinksBlock()->isVisible()) { + $cmsIndex->getLinksBlock()->openLink('Log Out'); + } + + $customer = $fixtureFactory->createByCode( + 'customerInjectable', + [ + 'dataSet' => 'default', + 'data' => [ + 'email' => $initialCustomer->getEmail(), + 'password' => $customer->getPassword(), + 'password_confirmation' => $customer->getPassword(), + ], + ] + ); + + $loginCustomer = $this->objectManager->create( + 'Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep', + ['customer' => $customer] + ); + $loginCustomer->run(); + + $customerName = $initialCustomer->getFirstname() . " " . $initialCustomer->getLastname(); + \PHPUnit_Framework_Assert::assertEquals( + sprintf(self::SUCCESS_MESSAGE, $customerName), + $customerAccountIndex->getInfoBlock()->getWelcomeText() + ); + } + + /** + * Returns a string representation of the object + * + * @return string + */ + public function toString() + { + return 'Customer password was changed.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php new file mode 100644 index 00000000000..efc3325fdac --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php @@ -0,0 +1,71 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Customer\Test\Constraint; + +use Magento\Customer\Test\Page\CustomerAccountEdit; +use Mtf\Constraint\AbstractConstraint; + +/** + * Class AssertWrongPassConfirmationMessage + * Check that conformation message is present + */ +class AssertWrongPassConfirmationMessage extends AbstractConstraint +{ + /** + * Conformation message + */ + const CONFIRMATION_MESSAGE = 'Confirm your new password'; + + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert that conformation message is present + * + * @param CustomerAccountEdit $customerAccountEdit + * @return void + */ + public function processAssert(CustomerAccountEdit $customerAccountEdit) + { + \PHPUnit_Framework_Assert::assertEquals( + self::CONFIRMATION_MESSAGE, + $customerAccountEdit->getMessages()->getErrorMessages() + ); + } + + /** + * Returns a string representation of the object + * + * @return string + */ + public function toString() + { + return 'Conformation message is displayed.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php index 9c72cc50697..840ce684180 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php @@ -273,6 +273,12 @@ class CustomerInjectable extends InjectableFixture 'group' => null, ]; + protected $current_password = [ + 'attribute_code' => 'current_password', + 'backend_type' => 'virtual', + 'group' => null, + ]; + public function getId() { return $this->getData('id'); @@ -407,4 +413,9 @@ class CustomerInjectable extends InjectableFixture { return $this->getData('password_confirmation'); } + + public function getCurrentPassword() + { + return $this->getData('current_password'); + } } diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml index ac1f920f524..fe3eeb45abc 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.xml @@ -231,6 +231,10 @@ <attribute_code>store_credit</attribute_code> <backend_type>virtual</backend_type> </store_credit> + <current_password> + <attribute_code>current_password</attribute_code> + <backend_type>virtual</backend_type> + </current_password> </fields> <handler_interface>Magento\Customer\Test\Handler\CustomerInjectable\CustomerInjectableInterface</handler_interface> </fixture> diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountEdit.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountEdit.xml index ef5c5937586..a62540b280a 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountEdit.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountEdit.xml @@ -30,5 +30,10 @@ <locator>#form-validate</locator> <strategy>css selector</strategy> </accountInfoForm> + <messages> + <class>Magento\Core\Test\Block\Messages</class> + <locator>.page.messages</locator> + <strategy>css selector</strategy> + </messages> </blocks> </page> diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php index 081300a20d7..025f97c0311 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php @@ -238,5 +238,15 @@ class AddressInjectable extends AbstractRepository 'telephone' => '444-44-444-44', 'vat_id' => '584451913', ]; + + $this->_data['address_US_pay_pal'] = [ + 'firstname' => 'Dmytro', + 'lastname' => 'Aponasenko', + 'city' => 'Culver City', + 'street' => '1 Main St', + 'postcode' => '90230', + 'country_id' => 'United States', + 'region_id' => 'Culver City', + ]; } } diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.php new file mode 100644 index 00000000000..ad0d87776f3 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest.php @@ -0,0 +1,127 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Customer\Test\TestCase; + +use Magento\Customer\Test\Fixture\CustomerInjectable; +use Magento\Customer\Test\Page\CustomerAccountEdit; +use Magento\Customer\Test\Page\CustomerAccountIndex; +use Mtf\TestCase\Injectable; +use Magento\Cms\Test\Page\CmsIndex; +use Magento\Customer\Test\Page\CustomerAccountLogin; + +/** + * Test Creation for ChangeCustomerPassword + * + * Test Flow: + * + * Preconditions: + * 1. Create customer + * + * Steps: + * 1. Login to fronted as customer from preconditions + * 2. Navigate to My Account page + * 3. Click "Change Password" link near "Contact Information" + * 4. Fill form according to data set and save + * 5. Perform all assertions + * + * @group Customer_Account_(CS) + * @ZephyrId MAGETWO-29411 + */ +class ChangeCustomerPasswordTest extends Injectable +{ + /** + * CmsIndex page + * + * @var CmsIndex + */ + protected $cmsIndex; + + /** + * CustomerAccountLogin page + * + * @var CustomerAccountLogin + */ + protected $customerAccountLogin; + + /** + * CustomerAccountIndex page + * + * @var CustomerAccountIndex + */ + protected $customerAccountIndex; + + /** + * CustomerAccountEdit page + * + * @var CustomerAccountEdit + */ + protected $customerAccountEdit; + + /** + * Preparing pages for test + * + * @param CmsIndex $cmsIndex + * @param CustomerAccountLogin $customerAccountLogin + * @param CustomerAccountIndex $customerAccountIndex + * @param CustomerAccountEdit $customerAccountEdit + * @return void + */ + public function __inject( + CmsIndex $cmsIndex, + CustomerAccountLogin $customerAccountLogin, + CustomerAccountIndex $customerAccountIndex, + CustomerAccountEdit $customerAccountEdit + ) { + $this->cmsIndex = $cmsIndex; + $this->customerAccountLogin = $customerAccountLogin; + $this->customerAccountIndex = $customerAccountIndex; + $this->customerAccountEdit = $customerAccountEdit; + } + + /** + * Run Change customer password test + * + * @param CustomerInjectable $initialCustomer + * @param CustomerInjectable $customer + * @return void + */ + public function test(CustomerInjectable $initialCustomer, CustomerInjectable $customer) + { + // Preconditions + $initialCustomer->persist(); + + // Steps + $loginCustomer = $this->objectManager->create( + 'Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep', + ['customer' => $initialCustomer] + ); + $loginCustomer->run(); + + $this->cmsIndex->getLinksBlock()->openLink('My Account'); + $this->customerAccountIndex->getInfoBlock()->openChangePassword(); + $this->customerAccountEdit->getAccountInfoForm()->fill($customer); + $this->customerAccountEdit->getAccountInfoForm()->submit(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest/test.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest/test.csv new file mode 100644 index 00000000000..b2504a64899 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest/test.csv @@ -0,0 +1,4 @@ +"initialCustomer/dataSet";"customer/data/current_password";"customer/data/password";"customer/data/confirmation";"constraint";"issue" +"default";"123123q";"123123a";"123123a";"assertCustomerInfoSuccessSavedMessage, assertCustomerPasswordChanged";"Bug: MAGETWO-29412" +"default";"123123";"123123a";"123123a";"assertChangePasswordFailMessage";"" +"default";"123123q";"123123a";"123123";"assertWrongPassConfirmationMessage";"" diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/constraint.xml index 83349a9f1da..7899c1d0513 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/constraint.xml @@ -144,4 +144,13 @@ <severeness>low</severeness> <require /> </assertAddressDeletedBackend> + <assertCustomerPasswordChanged module="Magento_Customer"> + <severeness>low</severeness> + </assertCustomerPasswordChanged> + <assertChangePasswordFailMessage module="Magento_Customer"> + <severeness>low</severeness> + </assertChangePasswordFailMessage> + <assertWrongPassConfirmationMessage module="Magento_Customer"> + <severeness>low</severeness> + </assertWrongPassConfirmationMessage> </constraint> diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php index 1ff86e647f2..bf36ad24e69 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php @@ -43,6 +43,13 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid ] ]; + /** + * Locator value for link in action column + * + * @var string + */ + protected $editLink = 'td.col-template'; + /** * Locator for "Action" * diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php new file mode 100644 index 00000000000..81996a0a2bf --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php @@ -0,0 +1,70 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Newsletter\Test\Constraint; + +use Magento\Newsletter\Test\Fixture\Template; +use Magento\Newsletter\Test\Page\Adminhtml\TemplateEdit; +use Magento\Newsletter\Test\Page\Adminhtml\TemplateIndex; +use Mtf\Constraint\AbstractAssertForm; + +/** + * Class AssertNewsletterForm + * Assert that newsletter template form data equals to data passed from fixture + */ +class AssertNewsletterForm extends AbstractAssertForm +{ + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert that newsletter template form data equals to data passed from fixture + * + * @param TemplateIndex $templateIndex + * @param TemplateEdit $templateEdit + * @param Template $template + * @return void + */ + public function processAssert(TemplateIndex $templateIndex, TemplateEdit $templateEdit, Template $template) + { + $templateIndex->open()->getNewsletterTemplateGrid()->searchAndOpen(['code' => $template->getCode()]); + $errors = $this->verifyData($template->getData(), $templateEdit->getEditForm()->getData($template)); + + \PHPUnit_Framework_Assert::assertEmpty($errors, $errors); + } + + /** + * Return string representation of object + * + * @return string + */ + public function toString() + { + return "Newsletter template form data equals to data passed from fixture."; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateEdit.xml similarity index 54% rename from dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.xml rename to dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateEdit.xml index 23f9fe8ac89..91c64345835 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateEdit.xml @@ -23,32 +23,22 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> -<mapping strict="0"> - <fields> - <from> - <input>datepicker</input> - </from> - <to> - <input>datepicker</input> - </to> - <period_type> - <input>select</input> - </period_type> - <report_type> - <input>select</input> - </report_type> - <show_empty_rows> - <input>select</input> - </show_empty_rows> - <show_order_statuses> - <input>select</input> - </show_order_statuses> - <order_statuses> - <selector>[name="order_statuses[]"]</selector> - <input>multiselect</input> - </order_statuses> - <show_actual_columns> - <input>select</input> - </show_actual_columns> - </fields> -</mapping> +<page mca="newsletter/template/edit" module="Magento_Newsletter"> + <blocks> + <formPageActions> + <class>Magento\Newsletter\Test\Block\Adminhtml\Template\FormPageActions</class> + <locator>.page-main-actions</locator> + <strategy>css selector</strategy> + </formPageActions> + <editForm> + <class>Magento\Backend\Test\Block\Widget\Form</class> + <locator>[id="page:main-container"]</locator> + <strategy>css selector</strategy> + </editForm> + <messagesBlock> + <class>Magento\Core\Test\Block\Messages</class> + <locator>#messages</locator> + <strategy>css selector</strategy> + </messagesBlock> + </blocks> +</page> diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php new file mode 100644 index 00000000000..872c02252ba --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php @@ -0,0 +1,98 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Newsletter\Test\TestCase; + +use Magento\Newsletter\Test\Fixture\Template; +use Magento\Newsletter\Test\Page\Adminhtml\TemplateIndex; +use Magento\Newsletter\Test\Page\Adminhtml\TemplateEdit; +use Mtf\TestCase\Injectable; + +/** + * Test Creation for UpdateNewsletterTemplate + * + * Test Flow: + * + * Preconditions: + * 1. Create newsletter template + * + * Steps: + * 1. Login to backend. + * 2. Navigate to MARKETING > Newsletter Template + * 3. Open Template from preconditions + * 4. Fill in all data according to data set + * 5. Click 'Save Template' button + * 6. Perform asserts + * + * @group Newsletters_(MX) + * @ZephyrId MAGETWO-29427 + */ +class UpdateNewsletterTemplateTest extends Injectable +{ + /** + * Newsletter template index page + * + * @var TemplateIndex + */ + protected $templateIndex; + + /** + * Newsletter template edit page + * + * @var TemplateEdit + */ + protected $templateEdit; + + /** + * Injection data + * + * @param TemplateIndex $templateIndex + * @param TemplateEdit $templateEdit + * @return void + */ + public function __inject(TemplateIndex $templateIndex, TemplateEdit $templateEdit) + { + $this->templateIndex = $templateIndex; + $this->templateEdit = $templateEdit; + } + + /** + * Run Update Newsletter test + * + * @param Template $templateInitial + * @param Template $template + * @return void + */ + public function test(Template $templateInitial, Template $template) + { + // Preconditions: + $templateInitial->persist(); + + // Steps: + $this->templateIndex->open(); + $this->templateIndex->getNewsletterTemplateGrid()->searchAndOpen(['code' => $templateInitial->getCode()]); + $this->templateEdit->getEditForm()->fill($template); + $this->templateEdit->getFormPageActions()->save(); + } +} diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest/test.csv b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest/test.csv new file mode 100644 index 00000000000..462ecbb046d --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest/test.csv @@ -0,0 +1,2 @@ +"template/data/code";"template/data/subject";"template/data/sender_name";"template/data/sender_email";"template/data/text";"constraint" +"TemplateName%isolation%";"TemplateSubject%isolation%";"SenderName%isolation%";"SenderName%isolation%@example.com";"Some content %isolation%";"assertNewsletterSuccessCreateMessage, assertNewsletterInGrid, assertNewsletterForm" diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/constraint.xml index 54d7d533719..55b2a4415a2 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/constraint.xml @@ -38,9 +38,8 @@ </assertNewsletterQueue> <assertCustomerIsSubscribedToNewsletter module="Magento_Newsletter"> <severeness>low</severeness> - <require> - <customer class="Magento\Customer\Test\Fixture\CustomerInjectable" /> - <pageSubscriberIndex class="Magento\Newsletter\Test\Page\Adminhtml\SubscriberIndex" /> - </require> </assertCustomerIsSubscribedToNewsletter> + <assertNewsletterForm module="Magento_Newsletter"> + <severeness>low</severeness> + </assertNewsletterForm> </constraint> diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/page.xml index 02608fa22a8..1667b3015ea 100644 --- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/page.xml +++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/page.xml @@ -34,6 +34,11 @@ <area>adminhtml</area> <class>Magento\Newsletter\Test\Page\Adminhtml\templateNewIndex</class> </templateNewIndex> + <templateEdit> + <mca>newsletter/template/edit</mca> + <area>adminhtml</area> + <class>Magento\Newsletter\Test\Page\Adminhtml\TemplateEdit</class> + </templateEdit> <subscriberIndex> <mca>newsletter/subscriber/index</mca> <area>adminhtml</area> diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Invoiced/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Invoiced/Grid.php new file mode 100644 index 00000000000..5cba186e307 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Invoiced/Grid.php @@ -0,0 +1,52 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Reports\Test\Block\Adminhtml\Sales\Invoiced; + +use Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed\FilterGrid; + +/** + * Class Grid + * Invoice Report filter grid + */ +class Grid extends FilterGrid +{ + /** + * Filters row locator + * + * @var string + */ + protected $filterRows = '(//tr[td[contains(@class, "col-qty")]])[last()]/td[contains(@class, "col-%s")]'; + + /** + * Rows for get invoice result + * + * @var array + */ + protected $rows = [ + 'qty', + 'invoiced', + 'total-invoiced' + ]; +} diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php index 2bea1a7b484..2751f1261f2 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php @@ -60,29 +60,29 @@ class FilterGrid extends Grid ]; /** - * Get last sales from Sales Report grid + * Get last row data from report grid * * @return array */ - public function getLastSalesResult() + public function getLastResult() { return $this->getResults($this->filterRows); } /** - * Get total sales from Sales Report grid + * Get total data from report grid * * @return array */ - public function getSalesTotalResult() + public function getTotalResult() { return $this->getResults($this->totalRows); } /** - * Get sales data from Sales Report grid + * Get data from report grid * - * @param array $filterRows + * @param string $filterRows * @return array */ protected function getResults($filterRows) @@ -93,7 +93,7 @@ class FilterGrid extends Grid return array_fill_keys($this->rows, 0); } foreach ($this->rows as $row) { - $value = $this->_rootElement->find(sprintf($this->filterRows, $row), Locator::SELECTOR_XPATH)->getText(); + $value = $this->_rootElement->find(sprintf($filterRows, $row), Locator::SELECTOR_XPATH)->getText(); $orders[$row] = preg_replace('`[$,]`', '', $value); } diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Refunded/FilterGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Refunded/FilterGrid.php new file mode 100644 index 00000000000..65b88db2b5e --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Refunded/FilterGrid.php @@ -0,0 +1,49 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Reports\Test\Block\Adminhtml\Sales\Refunded; + +/** + * Class FilterGrid + * Sales Refunded Report filter grid + */ +class FilterGrid extends \Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed\FilterGrid +{ + /** + * Filters row locator + * + * @var string + */ + protected $filterRows = '(//tr[td[contains(@class, "col-orders_count")]])[last()]/td[contains(@class, "col-%s")]'; + + /** + * Rows for get sales result + * + * @var array + */ + protected $rows = [ + 'orders_count', + 'refunded', + ]; +} diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertInvoiceReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertInvoiceReportResult.php new file mode 100644 index 00000000000..8490fa7efbb --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertInvoiceReportResult.php @@ -0,0 +1,92 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Reports\Test\Constraint; + +use Mtf\ObjectManager; +use Magento\Sales\Test\Fixture\OrderInjectable; +use Magento\Reports\Test\Page\Adminhtml\SalesInvoiceReport; +use Mtf\Constraint\AbstractConstraint; + +/** + * Class AbstractAssertInvoiceReportResult + * Abstract assert for search in invoice report grid + */ +abstract class AbstractAssertInvoiceReportResult extends AbstractConstraint +{ + /** + * Invoice report page + * + * @var SalesInvoiceReport + */ + protected $salesInvoiceReport; + + /** + * Order + * + * @var OrderInjectable + */ + protected $order; + + /** + * @constructor + * @param ObjectManager $objectManager + * @param SalesInvoiceReport $salesInvoiceReport + */ + public function __construct(ObjectManager $objectManager, SalesInvoiceReport $salesInvoiceReport) + { + parent::__construct($objectManager); + $this->salesInvoiceReport = $salesInvoiceReport; + } + + /** + * Search in invoice report grid + * + * @param array $invoiceReport + * @return void + */ + protected function searchInInvoiceReportGrid(array $invoiceReport) + { + $this->salesInvoiceReport->open(); + $this->salesInvoiceReport->getMessagesBlock()->clickLinkInMessages('notice', 'here'); + $this->salesInvoiceReport->getFilterForm()->viewsReport($invoiceReport); + $this->salesInvoiceReport->getActionBlock()->showReport(); + } + + /** + * Prepare expected result + * + * @param array $expectedInvoiceData + * @return array + */ + protected function prepareExpectedResult(array $expectedInvoiceData) + { + $totalInvoice = $this->order->getPrice()[0]['grand_invoice_total']; + $expectedInvoiceData['invoiced'] += 1; + $expectedInvoiceData['qty'] += 1; + $expectedInvoiceData['total-invoiced'] += $totalInvoice; + + return $expectedInvoiceData; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php index ff9ee81532a..51efabb92ce 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php @@ -25,9 +25,9 @@ namespace Magento\Reports\Test\Constraint; use Mtf\ObjectManager; -use Magento\Sales\Test\Fixture\OrderInjectable; -use Magento\Reports\Test\Page\Adminhtml\SalesReport; +use Mtf\Page\BackendPage; use Mtf\Constraint\AbstractConstraint; +use Magento\Sales\Test\Fixture\OrderInjectable; /** * Class AbstractAssertSalesReportResult @@ -38,7 +38,7 @@ abstract class AbstractAssertSalesReportResult extends AbstractConstraint /** * Sales report page * - * @var SalesReport + * @var BackendPage */ protected $salesReportPage; @@ -49,17 +49,6 @@ abstract class AbstractAssertSalesReportResult extends AbstractConstraint */ protected $order; - /** - * @constructor - * @param ObjectManager $objectManager - * @param SalesReport $salesReportPage - */ - public function __construct(ObjectManager $objectManager, SalesReport $salesReportPage) - { - parent::__construct($objectManager); - $this->salesReportPage = $salesReportPage; - } - /** * Search in sales report grid * diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php new file mode 100644 index 00000000000..84b3af9d291 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php @@ -0,0 +1,72 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Reports\Test\Constraint; + +use Magento\Sales\Test\Fixture\OrderInjectable; + +/** + * Class AssertInvoiceReportIntervalResult + * Assert that invoice info in report grid is actual + */ +class AssertInvoiceReportIntervalResult extends AbstractAssertInvoiceReportResult +{ + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert that sales info in report grid is actual + * + * @param OrderInjectable $order + * @param array $invoiceReport + * @param array $initialInvoiceResult + * @return void + */ + public function processAssert(OrderInjectable $order, array $invoiceReport, array $initialInvoiceResult) + { + $this->order = $order; + $this->searchInInvoiceReportGrid($invoiceReport); + $invoiceResult = $this->salesInvoiceReport->getGridBlock()->getLastResult(); + $prepareInitialResult = $this->prepareExpectedResult($initialInvoiceResult); + \PHPUnit_Framework_Assert::assertEquals( + $prepareInitialResult, + $invoiceResult, + "Invoice report interval result not contains actual data." + ); + } + + /** + * Returns a string representation of the object + * + * @return string + */ + public function toString() + { + return 'Invoice report interval result contains actual data.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php new file mode 100644 index 00000000000..d1bd37b6477 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php @@ -0,0 +1,72 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Reports\Test\Constraint; + +use Magento\Sales\Test\Fixture\OrderInjectable; + +/** + * Class AssertInvoiceReportTotalResult + * Assert that total invoice info in report grid is actual + */ +class AssertInvoiceReportTotalResult extends AbstractAssertInvoiceReportResult +{ + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert that total invoice info in report grid is actual + * + * @param OrderInjectable $order + * @param array $invoiceReport + * @param array $initialInvoiceTotalResult + * @return void + */ + public function processAssert(OrderInjectable $order, array $invoiceReport, array $initialInvoiceTotalResult) + { + $this->order = $order; + $this->searchInInvoiceReportGrid($invoiceReport); + $invoiceResult = $this->salesInvoiceReport->getGridBlock()->getTotalResult(); + $prepareInitialResult = $this->prepareExpectedResult($initialInvoiceTotalResult); + \PHPUnit_Framework_Assert::assertEquals( + $prepareInitialResult, + $invoiceResult, + "Grand total Invoice result is not correct." + ); + } + + /** + * Returns a string representation of the object + * + * @return string + */ + public function toString() + { + return 'Invoice report grand total result contains actual data.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php new file mode 100644 index 00000000000..c5f0bdda8a3 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php @@ -0,0 +1,92 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Reports\Test\Constraint; + +use Magento\Reports\Test\Page\Adminhtml\RefundsReport; +use Magento\Sales\Test\Fixture\OrderInjectable; + +/** + * Class AssertRefundReportIntervalResult + * Assert Credit Memo info in report grid + */ +class AssertRefundReportIntervalResult extends AbstractAssertSalesReportResult +{ + /** + * Constraint severeness + * + * @var string + */ + protected $severeness = 'low'; + + /** + * Assert Credit Memo info in report: Refunds Orders, Total Refunded + * + * @param OrderInjectable $order + * @param array $refundsReport + * @param array $initialRefundsResult + * @param RefundsReport $refundsReportPage + * @return void + */ + public function processAssert( + OrderInjectable $order, + array $refundsReport, + array $initialRefundsResult, + RefundsReport $refundsReportPage + ) { + $this->salesReportPage = $refundsReportPage; + $this->order = $order; + $this->searchInSalesReportGrid($refundsReport); + $salesResult = $refundsReportPage->getGridBlock()->getLastResult(); + $prepareInitialResult = $this->prepareExpectedResult($initialRefundsResult); + \PHPUnit_Framework_Assert::assertEquals( + $prepareInitialResult, + $salesResult, + "Refund total Sales result is not correct." + ); + } + + /** + * Prepare expected result + * + * @param array $expectedOrderData + * @return array + */ + protected function prepareExpectedResult(array $expectedOrderData) + { + ++$expectedOrderData['orders_count']; + $expectedOrderData['refunded'] += $this->order->getPrice()[0]['grand_order_total']; + return $expectedOrderData; + } + + /** + * Returns a string representation of the object + * + * @return string + */ + public function toString() + { + return 'Refund report interval result contains actual data.'; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php index cc1319c0dfb..4ed42f24195 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php @@ -24,6 +24,7 @@ namespace Magento\Reports\Test\Constraint; +use Magento\Reports\Test\Page\Adminhtml\SalesReport; use Magento\Sales\Test\Fixture\OrderInjectable; /** @@ -45,13 +46,19 @@ class AssertSalesReportIntervalResult extends AbstractAssertSalesReportResult * @param OrderInjectable $order * @param array $salesReport * @param array $initialSalesResult + * @param SalesReport $salesReportPage * @return void */ - public function processAssert(OrderInjectable $order, array $salesReport, array $initialSalesResult) - { + public function processAssert( + OrderInjectable $order, + array $salesReport, + array $initialSalesResult, + SalesReport $salesReportPage + ) { + $this->salesReportPage = $salesReportPage; $this->order = $order; $this->searchInSalesReportGrid($salesReport); - $salesResult = $this->salesReportPage->getGridBlock()->getLastSalesResult(); + $salesResult = $salesReportPage->getGridBlock()->getLastResult(); $prepareInitialResult = $this->prepareExpectedResult($initialSalesResult); \PHPUnit_Framework_Assert::assertEquals( $prepareInitialResult, diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php index 41f645b21fb..eefe8b19bf9 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php @@ -24,6 +24,7 @@ namespace Magento\Reports\Test\Constraint; +use Magento\Reports\Test\Page\Adminhtml\SalesReport; use Magento\Sales\Test\Fixture\OrderInjectable; /** @@ -45,13 +46,19 @@ class AssertSalesReportTotalResult extends AbstractAssertSalesReportResult * @param OrderInjectable $order * @param array $salesReport * @param array $initialSalesTotalResult + * @param SalesReport $salesReportPage * @return void */ - public function processAssert(OrderInjectable $order, array $salesReport, array $initialSalesTotalResult) - { + public function processAssert( + OrderInjectable $order, + array $salesReport, + array $initialSalesTotalResult, + SalesReport $salesReportPage + ) { + $this->salesReportPage = $salesReportPage; $this->order = $order; $this->searchInSalesReportGrid($salesReport); - $salesResult = $this->salesReportPage->getGridBlock()->getSalesTotalResult(); + $salesResult = $salesReportPage->getGridBlock()->getTotalResult(); $prepareInitialResult = $this->prepareExpectedResult($initialSalesTotalResult); \PHPUnit_Framework_Assert::assertEquals( $prepareInitialResult, diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/RefundsReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/RefundsReport.xml new file mode 100644 index 00000000000..1b183911904 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/RefundsReport.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" ?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<page mca="reports/report_sales/refunded" module="Magento_Reports"> + <blocks> + <messagesBlock> + <class>Magento\Core\Test\Block\Messages</class> + <locator>#messages .messages</locator> + <strategy>css selector</strategy> + </messagesBlock> + <filterBlock> + <class>Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form</class> + <locator>#filter_form</locator> + <strategy>css selector</strategy> + </filterBlock> + <actionBlock> + <class>Magento\Reports\Test\Block\Adminhtml\Viewed\Action</class> + <locator>.page-main-actions</locator> + <strategy>css selector</strategy> + </actionBlock> + <gridBlock> + <class>Magento\Reports\Test\Block\Adminhtml\Sales\Refunded\FilterGrid</class> + <locator>.grid</locator> + <strategy>css selector</strategy> + </gridBlock> + </blocks> +</page> diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesInvoiceReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesInvoiceReport.xml new file mode 100644 index 00000000000..7b18807bbfc --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesInvoiceReport.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" ?> +<!-- +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License (AFL 3.0) + * that is bundled with this package in the file LICENSE_AFL.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/afl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +--> +<page mca="reports/report_sales/invoiced" module="Magento_Reports"> + <blocks> + <messagesBlock> + <class>Magento\Core\Test\Block\Messages</class> + <locator>#messages .messages</locator> + <strategy>css selector</strategy> + </messagesBlock> + <filterForm> + <class>Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form</class> + <locator>#filter_form</locator> + <strategy>css selector</strategy> + </filterForm> + <actionBlock> + <class>Magento\Reports\Test\Block\Adminhtml\Viewed\Action</class> + <locator>.page-main-actions</locator> + <strategy>css selector</strategy> + </actionBlock> + <gridBlock> + <class>Magento\Reports\Test\Block\Adminhtml\Sales\Invoiced\Grid</class> + <locator>.grid</locator> + <strategy>css selector</strategy> + </gridBlock> + </blocks> +</page> diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml index aba158336cd..69b594be96b 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml @@ -31,7 +31,7 @@ <strategy>css selector</strategy> </messagesBlock> <filterBlock> - <class>Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed\Filter</class> + <class>Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form</class> <locator>#filter_form</locator> <strategy>css selector</strategy> </filterBlock> diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest.php new file mode 100644 index 00000000000..ee0b7e2ce34 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest.php @@ -0,0 +1,86 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Reports\Test\TestCase; + +use Magento\Reports\Test\Page\Adminhtml\SalesInvoiceReport; +use Magento\Sales\Test\Fixture\OrderInjectable; +use Mtf\TestCase\Injectable; + +/** + * Test Creation for SalesInvoiceReportEntity + * + * Test Flow: + * + * Preconditions: + * 1. Open Backend + * 2. Go to Reports > Sales > Invoiced + * 3. Refresh statistic + * 4. Configure filter + * 5. Click "Show Report" + * 6. Save/remember report result + * 7. Create customer + * 8. Place order + * 9. Create Invoice + * 10. Refresh statistic + * + * Steps: + * 1. Open Backend + * 2. Go to Reports > Sales > Invoiced + * 3. Configure filter + * 4. Click "Show Report" + * 5. Perform all assertions + * + * @group Reports_(MX) + * @ZephyrId MAGETWO-29216 + */ +class SalesInvoiceReportEntityTest extends Injectable +{ + /** + * Sales invoice report + * + * @param SalesInvoiceReport $salesInvoiceReport + * @param OrderInjectable $order + * @param array $invoiceReport + * @return array + */ + public function test(SalesInvoiceReport $salesInvoiceReport, OrderInjectable $order, array $invoiceReport) + { + // Preconditions + $salesInvoiceReport->open(); + $salesInvoiceReport->getMessagesBlock()->clickLinkInMessages('notice', 'here'); + $salesInvoiceReport->getFilterForm()->viewsReport($invoiceReport); + $salesInvoiceReport->getActionBlock()->showReport(); + $initialInvoiceResult = $salesInvoiceReport->getGridBlock()->getLastResult(); + $initialInvoiceTotalResult = $salesInvoiceReport->getGridBlock()->getTotalResult(); + $order->persist(); + $invoice = $this->objectManager->create('Magento\Sales\Test\TestStep\CreateInvoiceStep', ['order' => $order]); + $invoice->run(); + + return [ + 'initialInvoiceResult' => $initialInvoiceResult, + 'initialInvoiceTotalResult' => $initialInvoiceTotalResult + ]; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest/test.csv new file mode 100644 index 00000000000..4f7347373f3 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest/test.csv @@ -0,0 +1,4 @@ +"order/dataSet";"order/data/price/preset";"invoiceReport/report_type";"invoiceReport/period_type";"invoiceReport/from";"invoiceReport/to";"invoiceReport/show_order_statuses";"invoiceReport/data/order_statuses";"invoiceReport/show_empty_rows";"constraint";"issue" +"default";"full_invoice";"Order Created Date";"Year";"m/d/Y 12:00 a-2 days";"m/d/Y 12:00 a+2 days";"Any";"-";"Yes";"assertInvoiceReportIntervalResult, assertInvoiceReportTotalResult";"Bug: MAGETWO-29383" +"default";"full_invoice";"Order Created Date";"Month";"m/d/Y";"m/d/Y";"Any";"-";"No";"assertInvoiceReportIntervalResult, assertInvoiceReportTotalResult";"" +"default";"full_invoice";"Last Invoice Created Date";"Day";"m/d/Y";"m/d/Y";"Specified";"Processing";"No";"assertInvoiceReportIntervalResult, assertInvoiceReportTotalResult";"" diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.php index f3bba647870..8081f1ee8d9 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.php @@ -89,8 +89,8 @@ class SalesOrderReportEntityTest extends Injectable $this->salesReport->getMessagesBlock()->clickLinkInMessages('notice', 'here'); $this->salesReport->getFilterBlock()->viewsReport($salesReport); $this->salesReport->getActionBlock()->showReport(); - $initialSalesResult = $this->salesReport->getGridBlock()->getLastSalesResult(); - $initialSalesTotalResult = $this->salesReport->getGridBlock()->getSalesTotalResult(); + $initialSalesResult = $this->salesReport->getGridBlock()->getLastResult(); + $initialSalesTotalResult = $this->salesReport->getGridBlock()->getTotalResult(); $order->persist(); $invoice = $this->objectManager->create('Magento\Sales\Test\TestStep\CreateInvoiceStep', ['order' => $order]); diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest/test.csv index 6d76088f899..e5dab82b29e 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest/test.csv +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest/test.csv @@ -1,4 +1,4 @@ -"order/dataSet";"order/data/price/preset";"salesReport/report_type";"salesReport/report_period";"salesReport/from";"salesReport/to";"salesReport/show_order_statuses";"salesReport/order_statuses";"salesReport/show_empty_rows";"salesReport/show_actual_columns";"constraint" -"default";"full_invoice";"Order Created Date";"Year";"m/d/Y 12:00 a-2 days";"m/d/Y 12:00 a+2 days";"Any";"-";"Yes";"Yes";"assertSalesReportIntervalResult, assertSalesReportTotalResult" -"default";"full_invoice";"Order Created Date";"Month";"m/d/Y";"m/d/Y";"Any";"-";"No";"No";"assertSalesReportIntervalResult, assertSalesReportTotalResult" -"default";"full_invoice";"Order Updated Date";"Day";"m/d/Y";"m/d/Y";"Specified";"Processing";"No";"No";"assertSalesReportIntervalResult, assertSalesReportTotalResult" +"order/dataSet";"order/data/price/preset";"salesReport/report_type";"salesReport/period_type";"salesReport/from";"salesReport/to";"salesReport/show_order_statuses";"salesReport/order_statuses";"salesReport/show_empty_rows";"salesReport/show_actual_columns";"constraint";"issue" +"default";"full_invoice";"Order Created Date";"Year";"m/d/Y 12:00 a-2 days";"m/d/Y 12:00 a+2 days";"Any";"-";"Yes";"Yes";"assertSalesReportIntervalResult, assertSalesReportTotalResult";";"Bug: MAGETWO-29383" +"default";"full_invoice";"Order Created Date";"Month";"m/d/Y";"m/d/Y";"Any";"-";"No";"No";"assertSalesReportIntervalResult, assertSalesReportTotalResult";"" +"default";"full_invoice";"Order Updated Date";"Day";"m/d/Y";"m/d/Y";"Specified";"Processing";"No";"No";"assertSalesReportIntervalResult, assertSalesReportTotalResult";"" diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.php new file mode 100644 index 00000000000..f0b0037c23b --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.php @@ -0,0 +1,104 @@ +<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +namespace Magento\Reports\Test\TestCase; + +use Magento\Reports\Test\Page\Adminhtml\RefundsReport; +use Magento\Sales\Test\Fixture\OrderInjectable; +use Mtf\TestCase\Injectable; + +/** + * Test Creation for SalesRefundsReportEntity + * + * Test Flow: + * + * Preconditions: + * 1. Open Backend + * 2. Go to Reports > Sales > Refunds + * 3. Refresh statistic + * 4. Configure filter + * 5. Click "Show Report" + * 6. Save/remember report result + * 7. Place order + * 8. Create Invoice + * 9. Refresh statistic + * + * Steps: + * 1. Go to backend + * 2. Go to Reports > Sales > Refunds + * 3. Fill data from dataSet + * 4. Click button Show Report + * 5. Perform Asserts + * + * @group Reports_(MX) + * @ZephyrId MAGETWO-29348 + */ +class SalesRefundsReportEntityTest extends Injectable +{ + /** + * Refunds report page + * + * @var RefundsReport + */ + protected $refundsReport; + + /** + * Inject pages + * + * @param RefundsReport $refundsReport + * @return void + */ + public function __inject(RefundsReport $refundsReport) + { + $this->refundsReport = $refundsReport; + } + + /** + * Refunds report + * + * @param OrderInjectable $order + * @param array $refundsReport + * @return array + */ + public function test(OrderInjectable $order, array $refundsReport) + { + // Preconditions + $this->refundsReport->open(); + $this->refundsReport->getMessagesBlock()->clickLinkInMessages('notice', 'here'); + $this->refundsReport->getFilterBlock()->viewsReport($refundsReport); + $this->refundsReport->getActionBlock()->showReport(); + $initialRefundsResult = $this->refundsReport->getGridBlock()->getLastResult(); + + $order->persist(); + $invoice = $this->objectManager->create('Magento\Sales\Test\TestStep\CreateInvoiceStep', ['order' => $order]); + $invoice->run(); + $creditMemo = $this->objectManager->create( + 'Magento\Sales\Test\TestStep\CreateCreditMemoStep', + ['order' => $order] + ); + $creditMemo->run(); + + return ['initialRefundsResult' => $initialRefundsResult]; + } +} diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest/test.csv new file mode 100644 index 00000000000..f25229d7843 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest/test.csv @@ -0,0 +1,4 @@ +"description";"order/dataSet";"order/data/price/preset";"refundsReport/report_type";"refundsReport/period_type";"refundsReport/from";"refundsReport/to";"refundsReport/show_order_statuses";"refundsReport/show_empty_rows";"constraint";"issue" +"assert refunds year report";"default";"full_invoice";"Order Created Date";"Year";"m/d/Y 12:00 a-2 days";"m/d/Y 12:00 a+2 days";"Any";"Yes";"assertRefundReportIntervalResult";"MAGETWO-29383" +"assert refunds month report";"default";"full_invoice";"Order Created Date";"Month";"m/d/Y";"m/d/Y";"Any";"No";"assertRefundReportIntervalResult";"" +"assert refund Daily report";"default";"full_invoice";"Last Credit Memo Created Date";"Day";"m/d/Y";"m/d/Y";"Specified";"No";"assertRefundReportIntervalResult";"" diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml index a750afef7c4..1018321f1e4 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml @@ -90,4 +90,13 @@ <assertSalesReportTotalResult module="Magento_Reports"> <severeness>low</severeness> </assertSalesReportTotalResult> + <assertInvoiceReportIntervalResult module="Magento_Reports"> + <severeness>low</severeness> + </assertInvoiceReportIntervalResult> + <assertInvoiceReportTotalResult module="Magento_Reports"> + <severeness>low</severeness> + </assertInvoiceReportTotalResult> + <assertRefundReportIntervalResult module="Magento_Reports"> + <severeness>low</severeness> + </assertRefundReportIntervalResult> </constraint> diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/etc/page.xml index ff9733f3969..bdb1a2f89de 100644 --- a/dev/tests/functional/tests/app/Magento/Reports/Test/etc/page.xml +++ b/dev/tests/functional/tests/app/Magento/Reports/Test/etc/page.xml @@ -104,4 +104,14 @@ <area>adminhtml</area> <class>Magento\Reports\Test\Page\Adminhtml\SalesReport</class> </salesReport> + <salesInvoiceReport> + <mca>reports/report_sales/invoiced</mca> + <area>adminhtml</area> + <class>Magento\Reports\Test\Page\Adminhtml\SalesInvoiceReport</class> + </salesInvoiceReport> + <refundsReport> + <mca>reports/report_sales/refunded</mca> + <area>adminhtml</area> + <class>Magento\Reports\Test\Page\Adminhtml\RefundsReport</class> + </refundsReport> </page> diff --git a/dev/tests/unit/phpunit.xml.dist b/dev/tests/unit/phpunit.xml.dist index 9f9822b2e47..3e9dd33a61b 100644 --- a/dev/tests/unit/phpunit.xml.dist +++ b/dev/tests/unit/phpunit.xml.dist @@ -48,6 +48,9 @@ <!--coverage_html_placeholder <log type="coverage-html" target="{{coverage_dir}}/test-reports/coverage" charset="UTF-8" yui="true" highlight="true"/> coverage_html_placeholder--> + <!--coverage_cov_placeholder + <log type="coverage-php" target="{{coverage_dir}}/test-reports/coverage.cov"/> + coverage_cov_placeholder--> <!--coverage_clover_placeholder <log type="coverage-clover" target="{{coverage_dir}}/test-reports/phpunit.coverage.xml"/> coverage_clover_placeholder--> diff --git a/lib/internal/Magento/Framework/AppInterface.php b/lib/internal/Magento/Framework/AppInterface.php index 2424d2f5d21..6880c2c9546 100644 --- a/lib/internal/Magento/Framework/AppInterface.php +++ b/lib/internal/Magento/Framework/AppInterface.php @@ -35,7 +35,7 @@ interface AppInterface /** * Magento version */ - const VERSION = '0.1.0-alpha99'; + const VERSION = '0.1.0-alpha100'; /** * Launch application diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index cbdc9d20d6f..24101895903 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -2,7 +2,7 @@ "name": "magento/framework", "description": "N/A", "type": "magento2-library", - "version": "0.1.0-alpha99", + "version": "0.1.0-alpha100", "require": { "php": "~5.4.11|~5.5.0", "ext-spl": "*", -- GitLab