Skip to content

Commit acda2f4

Browse files
author
Mykhailo Miroshnikov
committed
MAGETWO-35118: JavaScript Unit Test Framework supports theme feature
- Add copyrights etc.
1 parent e7098fb commit acda2f4

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

dev/tests/js/jasmine/assets/text/config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ define(function () {
88
return {
99
local: {
1010
path: 'text!tests/assets/text/local.html',
11-
result: '<span>Local Template</span>'
11+
result: '<!--\n/**\n * Copyright © 2015 Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n-->\n<span>Local Template</span>'
1212
},
1313
external: {
1414
path: 'text!tests/assets/text/external.html',
15-
result: '<span>External Template</span>'
15+
result: '<!--\n/**\n * Copyright © 2015 Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n-->\n<span>External Template</span>'
1616
}
1717
};
1818
});
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1+
<!--
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
-->
17
<span>External Template</span>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1+
<!--
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
-->
17
<span>Local Template</span>

dev/tools/grunt/tasks/deploy.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* @copyright Copyright (c) 2015 X.commerce, Inc. (http://www.magentocommerce.com)
2+
* Copyright © 2015 Magento. All rights reserved.
3+
* See COPYING.txt for license details.
34
*/
4-
55
module.exports = function (grunt) {
66
'use strict';
77

@@ -11,9 +11,8 @@ module.exports = function (grunt) {
1111
ok = grunt.log.ok,
1212
error = grunt.log.error;
1313

14-
grunt.registerTask('deploy', function (grunt) {
15-
var deployLog,
16-
deploy,
14+
grunt.registerTask('deploy', function () {
15+
var deploy,
1716
done = this.async();
1817

1918
log('Cleaning "pub/static"...');
@@ -22,7 +21,7 @@ module.exports = function (grunt) {
2221

2322
log('Deploying Magento application...');
2423
deploy = spawn('php', ['dev/tools/Magento/Tools/View/deploy.php']);
25-
24+
2625
deploy.stdout.on('data', function (data) {
2726
log(data);
2827
});
@@ -33,4 +32,4 @@ module.exports = function (grunt) {
3332

3433
deploy.on('close', done);
3534
});
36-
}
35+
};

0 commit comments

Comments
 (0)