File tree Expand file tree Collapse file tree 4 files changed +20
-9
lines changed
tests/js/jasmine/assets/text Expand file tree Collapse file tree 4 files changed +20
-9
lines changed Original file line number Diff line number Diff line change @@ -8,11 +8,11 @@ define(function () {
8
8
return {
9
9
local : {
10
10
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>'
12
12
} ,
13
13
external : {
14
14
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>'
16
16
}
17
17
} ;
18
18
} ) ;
Original file line number Diff line number Diff line change
1
+ <!--
2
+ /**
3
+ * Copyright © 2015 Magento. All rights reserved.
4
+ * See COPYING.txt for license details.
5
+ */
6
+ -->
1
7
< span > External Template</ span >
Original file line number Diff line number Diff line change
1
+ <!--
2
+ /**
3
+ * Copyright © 2015 Magento. All rights reserved.
4
+ * See COPYING.txt for license details.
5
+ */
6
+ -->
1
7
< span > Local Template</ span >
Original file line number Diff line number Diff line change 1
1
/**
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.
3
4
*/
4
-
5
5
module . exports = function ( grunt ) {
6
6
'use strict' ;
7
7
@@ -11,9 +11,8 @@ module.exports = function (grunt) {
11
11
ok = grunt . log . ok ,
12
12
error = grunt . log . error ;
13
13
14
- grunt . registerTask ( 'deploy' , function ( grunt ) {
15
- var deployLog ,
16
- deploy ,
14
+ grunt . registerTask ( 'deploy' , function ( ) {
15
+ var deploy ,
17
16
done = this . async ( ) ;
18
17
19
18
log ( 'Cleaning "pub/static"...' ) ;
@@ -22,7 +21,7 @@ module.exports = function (grunt) {
22
21
23
22
log ( 'Deploying Magento application...' ) ;
24
23
deploy = spawn ( 'php' , [ 'dev/tools/Magento/Tools/View/deploy.php' ] ) ;
25
-
24
+
26
25
deploy . stdout . on ( 'data' , function ( data ) {
27
26
log ( data ) ;
28
27
} ) ;
@@ -33,4 +32,4 @@ module.exports = function (grunt) {
33
32
34
33
deploy . on ( 'close' , done ) ;
35
34
} ) ;
36
- }
35
+ } ;
You can’t perform that action at this time.
0 commit comments