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

Support 'successful' property in upload response

Browse source 
Save uploaded data to cache, and update local object if necessary (which
it mostly shouldn't be except for invalid characters and HTML filtering
in notes)

Also add some upload and JSON tests
This commit is contained in:
Dan Stillman 2015-07-22 05:21:32 -04:00
parent 70d9b9870c
commit 4600318ad7
12 changed files with 578 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

44
test/content/support.js
View file

@ -260,12 +260,24 @@ var createGroup = Zotero.Promise.coroutine(function* (props) {
//
// Data objects
//
function createUnsavedDataObject(objectType, params) {
/**
* @param {String} objectType - 'collection', 'item', 'search'
* @param {Object} [params]
* @param {Integer} [params.libraryID]
* @param {String} [params.itemType] - Item type
* @param {String} [params.title] - Item title
* @param {Boolean} [params.setTitle] - Assign a random item title
* @param {String} [params.name] - Collection/search name
* @param {Integer} [params.parentID]
* @param {String} [params.parentKey]
* @param {Boolean} [params.synced]
* @param {Integer} [params.version]
*/
function createUnsavedDataObject(objectType, params = {}) {
if (!objectType) {
throw new Error("Object type not provided");
}
params = params || {};
if (objectType == 'item') {
var param = params.itemType || 'book';
}
@ -275,14 +287,14 @@ function createUnsavedDataObject(objectType, params) {
}
switch (objectType) {
case 'item':
if (params.title) {
obj.setField('title', params.title);
if (params.title !== undefined || params.setTitle) {
obj.setField('title', params.title !== undefined ? params.title : Zotero.Utilities.randomString());
}
break;
case 'collection':
case 'search':
obj.name = params.name !== undefined ? params.name : "Test";
obj.name = params.name !== undefined ? params.name : Zotero.Utilities.randomString();
break;
}
var allowedParams = ['parentID', 'parentKey', 'synced', 'version'];
@ -294,12 +306,32 @@ function createUnsavedDataObject(objectType, params) {
return obj;
}
var createDataObject = Zotero.Promise.coroutine(function* (objectType, params, saveOptions) {
var createDataObject = Zotero.Promise.coroutine(function* (objectType, params = {}, saveOptions) {
var obj = createUnsavedDataObject(objectType, params);
yield obj.saveTx(saveOptions);
return obj;
});
function getNameProperty(objectType) {
return objectType == 'item' ? 'title' : 'name';
}
var modifyDataObject = Zotero.Promise.coroutine(function* (obj, params = {}) {
switch (obj.objectType) {
case 'item':
yield obj.loadItemData();
obj.setField(
'title',
params.title !== undefined ? params.title : Zotero.Utilities.randomString()
);
break;
default:
obj.name = params.name !== undefined ? params.name : Zotero.Utilities.randomString();
}
return obj.saveTx();
});
/**
* Return a promise for the error thrown by a promise, or false if none
*/