Import URL from XPCOM code instead of relying on window for Proxy code
Also fix other failing proxy tests. Closes #2928
This commit is contained in:
parent
b561aff94f
commit
f98ab3b0a6
2 changed files with 8 additions and 16 deletions
|
@ -11,20 +11,20 @@ describe("Zotero.Proxies", function(){
|
|||
});
|
||||
|
||||
it("should return the provided url and deproxied url", function() {
|
||||
let url = "https://www.example.com.proxy.example.com";
|
||||
let url = "https://www.example.com.proxy.example.com/";
|
||||
let proxies = Zotero.Proxies.getPotentialProxies(url);
|
||||
let expectedProxies = {};
|
||||
expectedProxies[url] = null;
|
||||
expectedProxies["https://www.example.com"] = {scheme: "https://%h.proxy.example.com/%p"};
|
||||
expectedProxies["https://www.example.com/"] = {scheme: "https://%h.proxy.example.com/%p"};
|
||||
assert.deepEqual(proxies, expectedProxies);
|
||||
});
|
||||
|
||||
it("should return the provided url and deproxied url with replaced hyphens", function() {
|
||||
let url = "https://www-example-com.proxy.example.com";
|
||||
let url = "https://www-example-com.proxy.example.com/";
|
||||
let proxies = Zotero.Proxies.getPotentialProxies(url);
|
||||
let expectedProxies = {};
|
||||
expectedProxies[url] = null;
|
||||
expectedProxies["https://www.example.com"] = {scheme: "https://%h.proxy.example.com/%p"};
|
||||
expectedProxies["https://www.example.com/"] = {scheme: "https://%h.proxy.example.com/%p"};
|
||||
assert.deepEqual(proxies, expectedProxies);
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue