scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-04 02:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Allow Zotero.HTTP.request() to be mocked

Browse source 
sinon.useFakeXMLHttpRequest() doesn't work in our case, but if
Zotero.HTTP.mock is set, Zotero.HTTP.request() will create new instances of
that object instead of the built-in XMLHttpRequest, so it can be set to
FakeXMLHttpRequest:

Zotero.HTTP.mock = sinon.FakeXMLHttpRequest;
var server = sinon.fakeServer.create();
server.autoRespond = true;
server.respondWith("GET", "/users/1",
  [200, {"Content-Type": "application/json"}, '{"userID": 1}']);
var userInfo = yield getUser();
Zotero.HTTP.mock = null;
server.restore(); // probably not necessary
This commit is contained in:
Dan Stillman 2015-06-07 14:39:15 -04:00
parent 38eeab06a3
commit 16706ba481
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
chrome/content/zotero/xpcom/http.js
View file

@ -19,11 +19,13 @@ Zotero.HTTP = new function() {
// Password also shows up in channel.name (nsIRequest.name), but that's
// read-only and has to be handled in Zotero.varDump()
try {
if (xmlhttp.channel.URI.password) {
xmlhttp.channel.URI.password = "********";
}
if (xmlhttp.channel.URI.spec) {
xmlhttp.channel.URI.spec = xmlhttp.channel.URI.spec.replace(/key=[^&]+&?/, "key=********");
if (xmlhttp.channel) {
if (xmlhttp.channel.URI.password) {
xmlhttp.channel.URI.password = "********";
}
if (xmlhttp.channel.URI.spec) {
xmlhttp.channel.URI.spec = xmlhttp.channel.URI.spec.replace(/key=[^&]+&?/, "key=********");
}
}
}
catch (e) {
@ -113,8 +115,13 @@ Zotero.HTTP = new function() {
var deferred = Zotero.Promise.defer();
var xmlhttp = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"]
.createInstance();
if (!this.mock) {
var xmlhttp = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"]
.createInstance();
}
else {
var xmlhttp = new this.mock;
}
// Prevent certificate/authentication dialogs from popping up
if (!options.foreground) {
xmlhttp.mozBackgroundRequest = true;