Merge pull request #3 from sedge/browserify
removed browser attribute from package.json r=@modeswitch
This commit is contained in:
commit
8fac316052
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -48,6 +48,5 @@
|
|||
"mocha": "~1.18.2",
|
||||
"semver": "^2.3.0"
|
||||
},
|
||||
"main": "./src/index.js",
|
||||
"browser": "./dist/filer.min.js"
|
||||
"main": "./src/index.js"
|
||||
}
|
||||
|
|
|
@ -1,107 +0,0 @@
|
|||
/**
|
||||
* Add spec files to the list in test-manifest.js
|
||||
*/
|
||||
|
||||
// Dynamically figure out which source to use (dist/ or src/) based on
|
||||
// query string:
|
||||
//
|
||||
// ?filer-dist/filer.js --> use dist/filer.js
|
||||
// ?filer-dist/filer.min.js --> use dist/filer.min.js
|
||||
// ?filer-src/filer.js --> use src/filer.js with require
|
||||
// ?<default> --> (default) use dist/filer-test.js with require
|
||||
var filerArgs = window.filerArgs = {};
|
||||
var config = (function() {
|
||||
var query = window.location.search.substring(1);
|
||||
query.split('&').forEach(function(pair) {
|
||||
pair = pair.split('=');
|
||||
var key = decodeURIComponent(pair[0]);
|
||||
var value = decodeURIComponent(pair[1]);
|
||||
if(key.indexOf('filer-') === 0) {
|
||||
filerArgs[ key.replace(/^filer-/, '') ] = value;
|
||||
}
|
||||
});
|
||||
|
||||
// Support dist/filer.js
|
||||
if(filerArgs['filer-dist/filer.js']) {
|
||||
return {
|
||||
paths: {
|
||||
"tests": "../tests",
|
||||
"spec": "../tests/spec",
|
||||
"bugs": "../tests/bugs",
|
||||
"util": "../tests/lib/test-utils",
|
||||
"Filer": "../dist/filer"
|
||||
},
|
||||
baseUrl: "../lib",
|
||||
optimize: "none"
|
||||
};
|
||||
}
|
||||
|
||||
// Support dist/filer.min.js
|
||||
if(filerArgs['filer-dist/filer.min.js']) {
|
||||
return {
|
||||
paths: {
|
||||
"tests": "../tests",
|
||||
"spec": "../tests/spec",
|
||||
"bugs": "../tests/bugs",
|
||||
"util": "../tests/lib/test-utils",
|
||||
"Filer": "../dist/filer.min"
|
||||
},
|
||||
baseUrl: "../lib",
|
||||
optimize: "none"
|
||||
};
|
||||
}
|
||||
|
||||
// Support src/ filer via require
|
||||
if(filerArgs['filer-src/filer.js']) {
|
||||
return {
|
||||
paths: {
|
||||
"tests": "../tests",
|
||||
"src": "../src",
|
||||
"spec": "../tests/spec",
|
||||
"bugs": "../tests/bugs",
|
||||
"util": "../tests/lib/test-utils",
|
||||
"Filer": "../src/index"
|
||||
},
|
||||
baseUrl: "../lib",
|
||||
optimize: "none",
|
||||
shim: {
|
||||
// TextEncoder and TextDecoder shims. encoding-indexes must get loaded first,
|
||||
// and we use a fake one for reduced size, since we only care about utf8.
|
||||
"encoding": {
|
||||
deps: ["encoding-indexes-shim"]
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
// Support dist/filer-test.js
|
||||
return {
|
||||
paths: {
|
||||
"tests": "../tests",
|
||||
"spec": "../tests/spec",
|
||||
"bugs": "../tests/bugs",
|
||||
"src": "../src",
|
||||
"util": "../tests/lib/test-utils",
|
||||
"Filer": "../dist/filer-test"
|
||||
},
|
||||
baseUrl: "../lib",
|
||||
optimize: "none"
|
||||
};
|
||||
}());
|
||||
|
||||
require.config(config);
|
||||
|
||||
// Intentional globals
|
||||
assert = chai.assert;
|
||||
expect = chai.expect;
|
||||
|
||||
// We need to setup describe() support before loading tests.
|
||||
// Use a test timeout of 5s and a slow-test warning of 250ms
|
||||
mocha.setup("bdd").timeout(5000).slow(250);
|
||||
|
||||
require(["tests/test-manifest"], function() {
|
||||
window.onload = function() {
|
||||
mocha.checkLeaks();
|
||||
mocha.run();
|
||||
};
|
||||
});
|
Loading…
Reference in New Issue