mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix server_connector tests broken in 69ab4b0b

Browse source 
Don't display error prompt in standalone when style install fails.
Fixes an import bug when import input is invalid.
This commit is contained in:
Adomas Venčkauskas 2016-11-30 13:53:58 +02:00
parent 1b67ed071e
commit 45c944e731
5 changed files with 88 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

78
test/tests/server_connectorTest.js
View file

@ -6,11 +6,13 @@ describe("Connector Server", function () {
var testServerPort = 16213;
before(function* () {
this.timeout(20000);
Zotero.Prefs.set("httpServer.enabled", true);
yield resetDB({
thisArg: this,
skipBundledFiles: true
});
yield Zotero.Translators.init();
win = yield loadZoteroPane();
connectorServerPath = 'http://127.0.0.1:' + Zotero.Prefs.get('httpServer.port');
@ -314,30 +316,30 @@ describe("Connector Server", function () {
});
});
describe('/connector/importStyle', function() {
describe('/connector/installStyle', function() {
var endpoint;
before(function() {
endpoint = connectorServerPath + "/connector/importStyle";
endpoint = connectorServerPath + "/connector/installStyle";
});
it('should reject application/json requests', function* () {
try {
var response = yield Zotero.HTTP.request(
'POST',
endpoint,
{
headers: { "Content-Type": "application/json" },
body: '{}'
}
);
} catch(e) {
assert.instanceOf(e, Zotero.HTTP.UnexpectedStatusException);
assert.equal(e.xmlhttp.status, 400);
}
it('should reject styles with invalid text', function* () {
var error = yield getPromiseError(Zotero.HTTP.request(
'POST',
endpoint,
{
headers: { "Content-Type": "application/json" },
body: '{}'
}
));
assert.instanceOf(error, Zotero.HTTP.UnexpectedStatusException);
assert.equal(error.xmlhttp.status, 400);
assert.equal(error.xmlhttp.responseText,
Zotero.getString("styles.installError",
Zotero.getString('styles.unknownOrigin')));
});
it('should import a style with text/x-csl content-type', function* () {
it('should import a style with application/vnd.citationstyles.style+xml content-type', function* () {
sinon.stub(Zotero.Styles, 'install', function(style) {
var parser = Components.classes["@mozilla.org/xmlextras/domparser;1"]
.createInstance(Components.interfaces.nsIDOMParser),
@ -362,7 +364,7 @@ describe("Connector Server", function () {
'POST',
endpoint,
{
headers: { "Content-Type": "text/x-csl" },
headers: { "Content-Type": "application/vnd.citationstyles.style+xml" },
body: style
}
);
@ -371,4 +373,44 @@ describe("Connector Server", function () {
Zotero.Styles.install.restore();
});
});
describe('/connector/import', function() {
var endpoint;
before(function() {
endpoint = connectorServerPath + "/connector/import";
});
it('should reject resources that do not contain import data', function* () {
var error = yield getPromiseError(Zotero.HTTP.request(
'POST',
endpoint,
{
headers: { "Content-Type": "text/plain" },
body: 'Owl'
}
));
assert.instanceOf(error, Zotero.HTTP.UnexpectedStatusException);
assert.equal(error.xmlhttp.status, 400);
});
it('should import resources (BibTeX)', function* () {
var resource = `@book{test1,
title={Test1},
author={Owl},
year={1000},
publisher={Curly Braces Publishing}
}`;
var response = yield Zotero.HTTP.request(
'POST',
endpoint,
{
headers: { "Content-Type": "application/x-bibtex" },
body: resource
}
);
assert.equal(response.status, 201);
assert.equal(JSON.parse(response.responseText)[0].title, 'Test1');
});
});
});