Skip to content

Commit ea36628

Browse files
author
Roman Ganin
committed
Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into develop
Conflicts: composer.lock
2 parents 53b2f14 + 8876c93 commit ea36628

File tree

109 files changed

+1201
-822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+1201
-822
lines changed

‎CHANGELOG.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,53 @@
1+
0.42.0-beta6
2+
=============
3+
* Various improvements:
4+
* Implemented caching for WebAPI configuration
5+
* Improved tests coverage of the CurrencySymbol module
6+
* Table catalogsearch_fulltext is setting up with ENGINE=InnoDB
7+
* Improved unit test coverage of the Catalog related functionality
8+
* Optimized JS dependencies
9+
* Refactored controller actions in the Sales module
10+
* Refactored controller actions in the Customer module
11+
* Removed the assertion for the exact number of attributes in API-functional tests for customer metadata.
12+
* Refactored API code for the CheckoutAgreements module
13+
* Refactored API code for the GiftMessage module
14+
* Refactored API for the Checkout module
15+
* Fixed bugs:
16+
* Fixed an where issue were WebAPI generated the wrong WSDL
17+
* Fixed an issue where Catalog, Checkout, Customer API ACLs did not support AJAX use case(s)
18+
* Fixed an issue where SOAP tests failed after upgrading to ZF 1.12.9
19+
* Fixed an issue where the 'There is no data for export' message was displayed permanently after invalid search
20+
* Fixed an issue where there was no ability to set category position during creation it
21+
* Fixed a CSS issue where certain images were absent on banners ()
22+
* Fixed an issue where the 'Date Of Birth' value was i reset to current date on the customer form)
23+
* Fixed an issue where the behavior of the "Terms and Conditions" validation on multiple address checkout was different from the one for the onepage checkout
24+
* Fixed an issue where it was impossible to checkout with multiple addresses
25+
* Fixed an issue where the 'This is a required field ' message was not displayed for "Terms and Conditions" if the latter was not selected
26+
* GitHub Requests:
27+
* [#963](https://github.com/magento/magento2/pull/963) -- Default Accept header
28+
* [#995](https://github.com/magento/magento2/pull/995) -- Prevent a warning in activated developer mode when 'plugins' is no array
29+
* [#866](https://github.com/magento/magento2/issues/866) -- Configurable product attribute scope
30+
* [#965](https://github.com/magento/magento2/pull/965) -- extra tests for current interception behavior
31+
* Service Contracts:
32+
* The Downloadable module basic implementation
33+
* Framework improvements:
34+
* Refactored and covered with tests the classes with high CRAP value (>50)
35+
* Moved Theme Management changes, Design changes, Design\Backend modules, and Observer components from the Core module to the Theme module
36+
* Moved Debug Hints models from the Core module to the newly added Developer module
37+
* Moved URL components, Factory, and EntityFactory from the Core module to the Magento Framework
38+
* UI improvements:
39+
* Compressed and resized images
40+
* Added new base styles for the Admin re-design
41+
* Added the WAI-ARIA attributes are to the Search Autocomplete on the storefront
42+
* Added visual style for the 'skip to content' attribute on the storefront
43+
* Fixed the style of persistent login messages on the storefront for all themes
44+
* Fixed the style of scrolling for Categories with long names in the Admin
45+
* Fixed the "css/print.css" file path on the storefront pages for all themes
46+
* Tests improvements:
47+
* Converted all fixtures/repositories for functional tests to .xml files
48+
* Improved interaction between webdriver and the new Magento JS forms
49+
* Increased unit and integration tests coverage
50+
151
0.42.0-beta5
252
=============
353
* UI improvements:

‎Gruntfile.js

Lines changed: 55 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,22 @@
44

55
// For performance use one level down: 'name/{,*/}*.js'
66
// If you want to recursively match all subfolders, use: 'name/**/*.js'
7-
8-
'use strict';
9-
107
module.exports = function (grunt) {
8+
'use strict';
119

1210
// Required plugins
1311
// _____________________________________________
12+
var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt);
1413

1514
require('./dev/tools/grunt/tasks/mage-minify')(grunt);
1615

1716
// Time how long tasks take. Can help when optimizing build times
1817
require('time-grunt')(grunt);
1918

2019
// Load grunt tasks automatically
21-
require('load-grunt-tasks')(grunt);
20+
require('load-grunt-tasks')(grunt, {
21+
pattern: ['grunt-*', '!grunt-template-jasmine-requirejs']
22+
});
2223

2324
var svgo = require('imagemin-svgo');
2425

@@ -42,7 +43,8 @@ module.exports = function (grunt) {
4243
uglify: {
4344
legacy: 'lib/web/legacy-build.min.js'
4445
},
45-
doc: 'lib/web/css/docs'
46+
doc: 'lib/web/css/docs',
47+
spec: 'dev/tests/js/spec'
4648
};
4749

4850
// Define Themes
@@ -459,8 +461,38 @@ module.exports = function (grunt) {
459461
'<%= path.doc %>': '<%= path.doc %>/source'
460462
}
461463
}
462-
}
464+
},
465+
466+
specRunner: {
467+
options: {
468+
shareDir: 'base'
469+
},
470+
backend: {
471+
options: {
472+
port: 8000,
473+
areaDir: 'adminhtml',
474+
theme: 'backend'
475+
}
476+
},
477+
frontend: {
478+
options: {
479+
port: 3000,
480+
areaDir: 'frontend',
481+
theme: 'blank'
482+
}
483+
}
484+
},
463485

486+
jasmine: {
487+
'options': {
488+
template: require('grunt-template-jasmine-requirejs'),
489+
ignoreEmpty: true
490+
},
491+
'backend-unit': specRunner.configure('unit', 'adminhtml', 8000),
492+
'backend-integration': specRunner.configure('integration', 'adminhtml', 8000),
493+
'frontend-unit': specRunner.configure('unit', 'frontend', 3000),
494+
'frontend-integration': specRunner.configure('integration', 'frontend', 3000)
495+
}
464496
});
465497

466498
// Assembling tasks
@@ -514,4 +546,21 @@ module.exports = function (grunt) {
514546
}
515547
});
516548

549+
// Tests
550+
// ---------------------------------------------
551+
552+
grunt.registerTask('spec', [
553+
'specRunner:backend',
554+
'specRunner:frontend'
555+
]);
556+
557+
grunt.registerTask('unit', [
558+
'jasmine:backend-unit',
559+
'jasmine:frontend-unit'
560+
]);
561+
562+
grunt.registerTask('integration', [
563+
'jasmine:backend-integration',
564+
'jasmine:frontend-integration'
565+
]);
517566
};

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Use the following table to verify you have the correct prerequisites to install
3232
<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/apache.html">Apache</a></td>
3333
</tr>
3434
<tr>
35-
<td>PHP 5.4.x (where x = 11 or later) or 5.5.x</td>
35+
<td>PHP 5.5.x or 5.6.x</td>
3636
<td><code>php -v</code></td>
3737
<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td>
3838
</tr>

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta5",
7-
"magento/module-core": "0.42.0-beta5",
8-
"magento/module-backend": "0.42.0-beta5",
9-
"magento/framework": "0.42.0-beta5",
6+
"magento/module-store": "0.42.0-beta6",
7+
"magento/module-core": "0.42.0-beta6",
8+
"magento/module-backend": "0.42.0-beta6",
9+
"magento/framework": "0.42.0-beta6",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta5",
14+
"version": "0.42.0-beta6",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Authorization/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta5",
7-
"magento/framework": "0.42.0-beta5",
6+
"magento/module-backend": "0.42.0-beta6",
7+
"magento/framework": "0.42.0-beta6",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta5",
11+
"version": "0.42.0-beta6",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/composer.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta5",
7-
"magento/module-directory": "0.42.0-beta5",
8-
"magento/module-core": "0.42.0-beta5",
9-
"magento/module-eav": "0.42.0-beta5",
10-
"magento/module-cron": "0.42.0-beta5",
11-
"magento/module-theme": "0.42.0-beta5",
12-
"magento/module-reports": "0.42.0-beta5",
13-
"magento/module-sales": "0.42.0-beta5",
14-
"magento/module-quote": "0.42.0-beta5",
15-
"magento/module-catalog": "0.42.0-beta5",
16-
"magento/module-user": "0.42.0-beta5",
17-
"magento/module-backup": "0.42.0-beta5",
18-
"magento/module-email": "0.42.0-beta5",
19-
"magento/module-customer": "0.42.0-beta5",
20-
"magento/module-translation": "0.42.0-beta5",
21-
"magento/module-require-js": "0.42.0-beta5",
22-
"magento/framework": "0.42.0-beta5",
6+
"magento/module-store": "0.42.0-beta6",
7+
"magento/module-directory": "0.42.0-beta6",
8+
"magento/module-core": "0.42.0-beta6",
9+
"magento/module-eav": "0.42.0-beta6",
10+
"magento/module-cron": "0.42.0-beta6",
11+
"magento/module-theme": "0.42.0-beta6",
12+
"magento/module-reports": "0.42.0-beta6",
13+
"magento/module-sales": "0.42.0-beta6",
14+
"magento/module-quote": "0.42.0-beta6",
15+
"magento/module-catalog": "0.42.0-beta6",
16+
"magento/module-user": "0.42.0-beta6",
17+
"magento/module-backup": "0.42.0-beta6",
18+
"magento/module-email": "0.42.0-beta6",
19+
"magento/module-customer": "0.42.0-beta6",
20+
"magento/module-translation": "0.42.0-beta6",
21+
"magento/module-require-js": "0.42.0-beta6",
22+
"magento/framework": "0.42.0-beta6",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.42.0-beta5",
26+
"version": "0.42.0-beta6",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backup/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta5",
7-
"magento/module-cron": "0.42.0-beta5",
8-
"magento/framework": "0.42.0-beta5",
6+
"magento/module-backend": "0.42.0-beta6",
7+
"magento/module-cron": "0.42.0-beta6",
8+
"magento/framework": "0.42.0-beta6",
99
"magento/magento-composer-installer": "*"
1010
},
1111
"type": "magento2-module",
12-
"version": "0.42.0-beta5",
12+
"version": "0.42.0-beta6",
1313
"license": [
1414
"OSL-3.0",
1515
"AFL-3.0"

‎app/code/Magento/Bundle/composer.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta5",
7-
"magento/module-catalog": "0.42.0-beta5",
8-
"magento/module-tax": "0.42.0-beta5",
9-
"magento/module-core": "0.42.0-beta5",
10-
"magento/module-backend": "0.42.0-beta5",
11-
"magento/module-sales": "0.42.0-beta5",
12-
"magento/module-checkout": "0.42.0-beta5",
13-
"magento/module-catalog-inventory": "0.42.0-beta5",
14-
"magento/module-customer": "0.42.0-beta5",
15-
"magento/module-catalog-rule": "0.42.0-beta5",
16-
"magento/module-eav": "0.42.0-beta5",
17-
"magento/module-gift-message": "0.42.0-beta5",
18-
"magento/framework": "0.42.0-beta5",
19-
"magento/module-webapi": "0.42.0-beta5",
20-
"magento/module-quote": "0.42.0-beta5",
6+
"magento/module-store": "0.42.0-beta6",
7+
"magento/module-catalog": "0.42.0-beta6",
8+
"magento/module-tax": "0.42.0-beta6",
9+
"magento/module-core": "0.42.0-beta6",
10+
"magento/module-backend": "0.42.0-beta6",
11+
"magento/module-sales": "0.42.0-beta6",
12+
"magento/module-checkout": "0.42.0-beta6",
13+
"magento/module-catalog-inventory": "0.42.0-beta6",
14+
"magento/module-customer": "0.42.0-beta6",
15+
"magento/module-catalog-rule": "0.42.0-beta6",
16+
"magento/module-eav": "0.42.0-beta6",
17+
"magento/module-gift-message": "0.42.0-beta6",
18+
"magento/framework": "0.42.0-beta6",
19+
"magento/module-webapi": "0.42.0-beta6",
20+
"magento/module-quote": "0.42.0-beta6",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"type": "magento2-module",
24-
"version": "0.42.0-beta5",
24+
"version": "0.42.0-beta6",
2525
"license": [
2626
"OSL-3.0",
2727
"AFL-3.0"

‎app/code/Magento/Captcha/composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta5",
7-
"magento/module-customer": "0.42.0-beta5",
8-
"magento/module-checkout": "0.42.0-beta5",
9-
"magento/module-core": "0.42.0-beta5",
10-
"magento/module-backend": "0.42.0-beta5",
11-
"magento/framework": "0.42.0-beta5",
6+
"magento/module-store": "0.42.0-beta6",
7+
"magento/module-customer": "0.42.0-beta6",
8+
"magento/module-checkout": "0.42.0-beta6",
9+
"magento/module-core": "0.42.0-beta6",
10+
"magento/module-backend": "0.42.0-beta6",
11+
"magento/framework": "0.42.0-beta6",
1212
"magento/magento-composer-installer": "*"
1313
},
1414
"type": "magento2-module",
15-
"version": "0.42.0-beta5",
15+
"version": "0.42.0-beta6",
1616
"license": [
1717
"OSL-3.0",
1818
"AFL-3.0"

‎app/code/Magento/Catalog/composer.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta5",
7-
"magento/module-eav": "0.42.0-beta5",
8-
"magento/module-cms": "0.42.0-beta5",
9-
"magento/module-indexer": "0.42.0-beta5",
10-
"magento/module-customer": "0.42.0-beta5",
11-
"magento/module-core": "0.42.0-beta5",
12-
"magento/module-theme": "0.42.0-beta5",
13-
"magento/module-checkout": "0.42.0-beta5",
14-
"magento/module-log": "0.42.0-beta5",
15-
"magento/module-backend": "0.42.0-beta5",
16-
"magento/module-widget": "0.42.0-beta5",
17-
"magento/module-wishlist": "0.42.0-beta5",
18-
"magento/module-tax": "0.42.0-beta5",
19-
"magento/module-msrp": "0.42.0-beta5",
20-
"magento/module-catalog-inventory": "0.42.0-beta5",
21-
"magento/module-directory": "0.42.0-beta5",
22-
"magento/module-catalog-rule": "0.42.0-beta5",
23-
"magento/module-product-alert": "0.42.0-beta5",
24-
"magento/module-url-rewrite": "0.42.0-beta5",
25-
"magento/module-catalog-url-rewrite": "0.42.0-beta5",
26-
"magento/module-page-cache": "0.42.0-beta5",
27-
"magento/module-quote": "0.42.0-beta5",
28-
"magento/framework": "0.42.0-beta5",
6+
"magento/module-store": "0.42.0-beta6",
7+
"magento/module-eav": "0.42.0-beta6",
8+
"magento/module-cms": "0.42.0-beta6",
9+
"magento/module-indexer": "0.42.0-beta6",
10+
"magento/module-customer": "0.42.0-beta6",
11+
"magento/module-core": "0.42.0-beta6",
12+
"magento/module-theme": "0.42.0-beta6",
13+
"magento/module-checkout": "0.42.0-beta6",
14+
"magento/module-log": "0.42.0-beta6",
15+
"magento/module-backend": "0.42.0-beta6",
16+
"magento/module-widget": "0.42.0-beta6",
17+
"magento/module-wishlist": "0.42.0-beta6",
18+
"magento/module-tax": "0.42.0-beta6",
19+
"magento/module-msrp": "0.42.0-beta6",
20+
"magento/module-catalog-inventory": "0.42.0-beta6",
21+
"magento/module-directory": "0.42.0-beta6",
22+
"magento/module-catalog-rule": "0.42.0-beta6",
23+
"magento/module-product-alert": "0.42.0-beta6",
24+
"magento/module-url-rewrite": "0.42.0-beta6",
25+
"magento/module-catalog-url-rewrite": "0.42.0-beta6",
26+
"magento/module-page-cache": "0.42.0-beta6",
27+
"magento/module-quote": "0.42.0-beta6",
28+
"magento/framework": "0.42.0-beta6",
2929
"magento/magento-composer-installer": "*"
3030
},
3131
"type": "magento2-module",
32-
"version": "0.42.0-beta5",
32+
"version": "0.42.0-beta6",
3333
"license": [
3434
"OSL-3.0",
3535
"AFL-3.0"

0 commit comments

Comments
 (0)