Remove index.js and just enumerate the files in the test directory
This commit is contained in:
parent
4c45685331
commit
8253b98134
3 changed files with 35 additions and 23 deletions
|
@ -8,7 +8,6 @@
|
|||
<script src="chrome://zotero/content/include.js"></script>
|
||||
<script src="resource://zotero-unit/chai/chai.js"></script>
|
||||
<script src="resource://zotero-unit/mocha/mocha.js"></script>
|
||||
<script src="resource://zotero-unit-tests/index.js"></script>
|
||||
<script src="support.js" version="application/javascript;version=1.8"></script>
|
||||
<script src="runtests.js" version="application/javascript;version=1.8"></script>
|
||||
</body>
|
||||
|
|
|
@ -71,24 +71,43 @@ var assert = chai.assert,
|
|||
expect = chai.expect;
|
||||
|
||||
// Set up tests to run
|
||||
var run = true;
|
||||
if(ZoteroUnit.tests) {
|
||||
document.body.appendChild(document.createTextNode("Running tests..."));
|
||||
var torun = ZoteroUnit.tests == "all" ? Object.keys(TESTS) : ZoteroUnit.tests.split(",");
|
||||
var testDirectory = getTestDataDirectory().parent,
|
||||
testFiles = [];
|
||||
if(ZoteroUnit.tests == "all") {
|
||||
var enumerator = testDirectory.directoryEntries;
|
||||
while(enumerator.hasMoreElements()) {
|
||||
var file = enumerator.getNext().QueryInterface(Components.interfaces.nsIFile);
|
||||
if(file.leafName.endsWith(".js")) {
|
||||
testFiles.push(file.leafName);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
var specifiedTests = ZoteroUnit.tests.split(",");
|
||||
for(var test of specifiedTests) {
|
||||
var fname = test+".js",
|
||||
file = testDirectory.clone();
|
||||
file.append(fname);
|
||||
if(!file.exists()) {
|
||||
dump("Invalid test file "+test+"\n");
|
||||
run = false;
|
||||
quit(true);
|
||||
}
|
||||
testFiles.push(fname);
|
||||
}
|
||||
}
|
||||
|
||||
for(var key of torun) {
|
||||
if(!TESTS[key]) {
|
||||
dump("Invalid test set "+torun+"\n");
|
||||
quit(true);
|
||||
}
|
||||
for(var test of TESTS[key]) {
|
||||
var el = document.createElement("script");
|
||||
el.type = "application/javascript;version=1.8";
|
||||
el.src = "resource://zotero-unit-tests/"+test;
|
||||
document.body.appendChild(el);
|
||||
}
|
||||
for(var fname of testFiles) {
|
||||
var el = document.createElement("script");
|
||||
el.type = "application/javascript;version=1.8";
|
||||
el.src = "resource://zotero-unit-tests/"+fname;
|
||||
document.body.appendChild(el);
|
||||
}
|
||||
}
|
||||
|
||||
window.onload = function() {
|
||||
mocha.run();
|
||||
};
|
||||
if(run) {
|
||||
window.onload = function() {
|
||||
mocha.run();
|
||||
};
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
var TESTS = {
|
||||
"support":["support.js"],
|
||||
"utilities":["utilities.js"],
|
||||
"lookup":["lookup.js"],
|
||||
"recognizePDF":["recognizePDF.js"]
|
||||
};
|
Loading…
Reference in a new issue