improve bonfires and js coursewares

This commit is contained in:
Quincy Larson
2015-05-10 21:59:55 -07:00
parent 40a58ec7e7
commit d63b8f01be
10 changed files with 24 additions and 18 deletions

View File

@@ -56,7 +56,7 @@ var allTests = '';
});
})();
var otherTestsForNow = "<script src='/js/lib/coursewares/iFrameScripts.js'></script>";
var otherTestsForNow = "<script src='/js/lib/coursewares/iFrameScripts_.0.0.1.js'></script>";
var delay;
// Initialize CodeMirror editor with a nice html5 canvas demo.

View File

@@ -182,11 +182,11 @@ var createTestDisplay = function() {
if (test.err != null) {
console.log('Should be displaying bad tests');
$(testDoc)
.html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-output wrappable'>" + test.text + "</div><div class='col-xs-10 test-output wrappable'>" + test.err + "</div></div><div class='ten-pixel-break'/>")
.html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-output wrappable grayed-out-test-output'>" + test.text + "</div><div class='col-xs-10 test-output wrappable'>" + test.err + "</div></div><div class='ten-pixel-break'/>")
.prependTo($('#testSuite'))
} else {
$(testDoc)
.html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable'>" + test.text + "</div></div><div class='ten-pixel-break'/>")
.html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable grayed-out-test-output'>" + test.text + "</div></div><div class='ten-pixel-break'/>")
.appendTo($('#testSuite'));
}
};
@@ -218,7 +218,7 @@ var runTests = function(err, data) {
}
} catch(error) {
allTestsPassed = false;
arr[ix].err = error.name + ":" + error.message;
arr[ix].err = error.message;
} finally {
if (!test) {
createTestDisplay();
@@ -243,4 +243,4 @@ function showCompletion() {
$('#next-courseware-button').click();
}
});
}
}

View File

@@ -9,11 +9,11 @@
} catch (err) {
allTestsGood = false;
thisTest = false;
parent.postError(JSON.stringify(tests[i]));
parent.postError(JSON.stringify(tests[i].message));
} finally {
if (thisTest) {
parent.postSuccess(JSON.stringify(tests[i]));
}
}
}
})();
})();