Merge branch 'salticus-master'

This commit is contained in:
Gregg Van Hove 2015-10-28 12:09:21 -07:00
commit 920f8e7771
3 changed files with 16 additions and 0 deletions

View File

@ -477,6 +477,9 @@ getJasmineRequireObj().MockAjax = function($ajax) {
};
this.uninstall = function() {
if (global.XMLHttpRequest !== mockAjaxFunction) {
throw "MockAjax not installed.";
}
global.XMLHttpRequest = realAjaxFunction;
this.stubs.reset();

View File

@ -26,6 +26,16 @@ describe("mockAjax", function() {
expect(sequentialInstalls).not.toThrow();
});
it("does throw an error if uninstalled without a current install", function() {
var fakeXmlHttpRequest = jasmine.createSpy('fakeXmlHttpRequest'),
fakeGlobal = { XMLHttpRequest: fakeXmlHttpRequest },
mockAjax = new window.MockAjax(fakeGlobal);
expect(function() {
mockAjax.uninstall();
}).toThrow();
});
it("does not replace XMLHttpRequest until it is installed", function() {
var fakeXmlHttpRequest = jasmine.createSpy('fakeXmlHttpRequest'),
fakeGlobal = { XMLHttpRequest: fakeXmlHttpRequest },

View File

@ -15,6 +15,9 @@ getJasmineRequireObj().MockAjax = function($ajax) {
};
this.uninstall = function() {
if (global.XMLHttpRequest !== mockAjaxFunction) {
throw "MockAjax not installed.";
}
global.XMLHttpRequest = realAjaxFunction;
this.stubs.reset();