Skip to content

Commit 78c3b12

Browse files
author
Mykhailo Miroshnikov
committed
MAGETWO-35118: JavaScript Unit Test Framework supports theme feature
- Change dev/tests/js test file structure - Remove old spec tasks
1 parent f65cbac commit 78c3b12

File tree

98 files changed

+150
-73
lines changed

Some content is hidden

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

98 files changed

+150
-73
lines changed

Gruntfile.js

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,20 @@ module.exports = function (grunt) {
1010
var _ = require('underscore'),
1111
path = require('path');
1212

13-
require('./dev/tools/grunt/tasks/mage-minify')(grunt);
14-
require('time-grunt')(grunt);
13+
[
14+
'./dev/tools/grunt/tasks/mage-minify',
15+
'./dev/tools/grunt/tasks/deploy',
16+
'time-grunt'
17+
].forEach(function (task) {
18+
require(task)(grunt);
19+
});
1520

1621
require('load-grunt-config')(grunt, {
1722
configPath: path.join(process.cwd(), 'dev/tools/grunt/configs'),
1823
init: true,
1924
loadGruntTasks: {
2025
pattern: [
21-
'grunt-*',
22-
'!grunt-template-jasmine-requirejs'
26+
'grunt-*'
2327
]
2428
}
2529
});
@@ -71,24 +75,6 @@ module.exports = function (grunt) {
7175
'clean:pub'
7276
],
7377

74-
spec: [
75-
'specRunner:lib',
76-
'specRunner:backend',
77-
'specRunner:frontend'
78-
],
79-
80-
unit: [
81-
'jasmine:lib-unit',
82-
'jasmine:backend-unit',
83-
'jasmine:frontend-unit'
84-
],
85-
86-
integration: [
87-
'jasmine:lib-integration',
88-
'jasmine:backend-integration',
89-
'jasmine:frontend-integration'
90-
],
91-
9278
'legacy-build': [
9379
'mage-minify:legacy'
9480
],
@@ -97,6 +83,11 @@ module.exports = function (grunt) {
9783
'usebanner:documentationCss',
9884
'usebanner:documentationLess',
9985
'usebanner:documentationHtml'
86+
],
87+
88+
spec: [
89+
'connect:frontend',
90+
'jasmine:frontend'
10091
]
10192
}, function (task, name) {
10293
grunt.registerTask(name, task);
File renamed without changes.

0 commit comments

Comments
 (0)