Skip to content

Commit d8521ef

Browse files
committed
fix(init): fix test-main.(js/coffee) generation
The `pathToModule` function sets a project up such that your spec directory must be within your src directory. This approach directly contradicts the example describing how to use RequireJS with Karma in the documentation. Fixes #1120, fixes #896
1 parent 7b1ef5e commit d8521ef

3 files changed

Lines changed: 3 additions & 13 deletions

File tree

docs/plus/01-requirejs.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,10 @@ The `test/test-main.js` file ends up looking like this:
117117
var allTestFiles = [];
118118
var TEST_REGEXP = /test\.js$/;
119119

120-
var pathToModule = function(path) {
121-
return path.replace(/^\/base\//, '').replace(/\.js$/, '');
122-
};
123-
124120
Object.keys(window.__karma__.files).forEach(function(file) {
125121
if (TEST_REGEXP.test(file)) {
126122
// Normalize paths to RequireJS module names.
127-
allTestFiles.push(pathToModule(file));
123+
allTestFiles.push(file);
128124
}
129125
});
130126

requirejs.config.tpl.coffee

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
allTestFiles = []
22
TEST_REGEXP = /(spec|test)(\.coffee)?(\.js)?$/i
3-
pathToModule = (path) ->
4-
path.replace(/^\/base\//, "").replace(/\.js$/, "").replace(/\.cofee$/, "")
53

64
Object.keys(window.__karma__.files).forEach (file) ->
75
# Normalize paths to RequireJS module names.
8-
allTestFiles.push pathToModule(file) if TEST_REGEXP.test(file)
6+
allTestFiles.push file if TEST_REGEXP.test(file)
97
return
108

119
require.config

requirejs.config.tpl.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
var allTestFiles = [];
22
var TEST_REGEXP = /(spec|test)\.js$/i;
33

4-
var pathToModule = function(path) {
5-
return path.replace(/^\/base\//, '').replace(/\.js$/, '');
6-
};
7-
84
Object.keys(window.__karma__.files).forEach(function(file) {
95
if (TEST_REGEXP.test(file)) {
106
// Normalize paths to RequireJS module names.
11-
allTestFiles.push(pathToModule(file));
7+
allTestFiles.push(file);
128
}
139
});
1410

0 commit comments

Comments
 (0)