Skip to content

Commit 68a1662

Browse files
committed
Merge pull request #915 from jnizet/feat/serve-assets-in-unit-tests
feat: serve assets in unit tests
2 parents e6e5c40 + 9c90a98 commit 68a1662

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

generators/app/templates/_karma.conf.js

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function listFiles() {
2121
devDependencies: true
2222
});
2323

24-
return wiredep(wiredepOptions).js
24+
var patterns = wiredep(wiredepOptions).js
2525
.concat([
2626
<% if (props.jsPreprocessor.key === 'noJsPrepro') { -%>
2727
path.join(conf.paths.src, '/app/**/*.module.js'),
@@ -38,6 +38,19 @@ function listFiles() {
3838
<% } -%>
3939
])
4040
.concat(pathSrcHtml);
41+
42+
var files = patterns.map(function(pattern) {
43+
return {
44+
pattern: pattern
45+
};
46+
});
47+
files.push({
48+
pattern: path.join(conf.paths.src, '/assets/**/*'),
49+
included: false,
50+
served: true,
51+
watched: false
52+
});
53+
return files;
4154
}
4255

4356
module.exports = function(config) {
@@ -97,7 +110,11 @@ module.exports = function(config) {
97110
dir : 'coverage/'
98111
},
99112

100-
reporters: ['progress']
113+
reporters: ['progress'],
114+
115+
proxies: {
116+
'/assets/': path.join('/base/', conf.paths.src, '/assets/')
117+
}
101118
};
102119

103120
// This is the default preprocessors configuration for a usage with Karma cli

0 commit comments

Comments
 (0)