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

Remove "Error:" expected in error messages.

Browse source 
* "Error:" seems to have been injected into the message by Bluebird,
  but that's no longer the case
This commit is contained in:
Tom Najdek 2017-05-31 16:52:06 +01:00 • committed by Dan Stillman
parent 063e13ef22
commit 4ec6925220
4 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
test/tests/feedTest.js
View file

@ -12,7 +12,7 @@ describe("Zotero.Feed", function() {
describe("#constructor()", function() {
it("should accept required fields as arguments", function* () {
let feed = new Zotero.Feed();
yield assert.isRejected(feed.saveTx(), /^Error: Feed name not set$/);
yield assert.isRejected(feed.saveTx(), /^Feed name not set$/);
feed = new Zotero.Feed({
name: 'Test ' + Zotero.randomString(),
@ -93,28 +93,28 @@ describe("Zotero.Feed", function() {
});
it("should throw if name or url are missing", function *() {
let feed = new Zotero.Feed();
yield assert.isRejected(feed.saveTx(), /^Error: Feed name not set$/);
yield assert.isRejected(feed.saveTx(), /^Feed name not set$/);
feed.name = 'Test ' + Zotero.randomString();
yield assert.isRejected(feed.saveTx(), /^Error: Feed URL not set$/);
yield assert.isRejected(feed.saveTx(), /^Feed URL not set$/);
feed = new Zotero.Feed();
feed.url = 'http://' + Zotero.randomString() + '.com';
yield assert.isRejected(feed.saveTx(), /^Error: Feed name not set$/);
yield assert.isRejected(feed.saveTx(), /^Feed name not set$/);
});
it("should not allow saving a feed with the same url", function *() {
let url = 'http://' + Zotero.randomString() + '.com';
let feed1 = yield createFeed({ url });
let feed2 = new Zotero.Feed({ name: 'Test ' + Zotero.randomString(), url });
yield assert.isRejected(feed2.saveTx(), /^Error: Feed for URL already exists: /);
yield assert.isRejected(feed2.saveTx(), /^Feed for URL already exists: /);
// Perform check with normalized URL
feed2.url = url + '/';
yield assert.isRejected(feed2.saveTx(), /^Error: Feed for URL already exists: /);
yield assert.isRejected(feed2.saveTx(), /^Feed for URL already exists: /);
feed2.url = url.toUpperCase();
yield assert.isRejected(feed2.saveTx(), /^Error: Feed for URL already exists: /);
yield assert.isRejected(feed2.saveTx(), /^Feed for URL already exists: /);
});
it("should allow saving a feed with the same name", function *() {
let name = 'Test ' + Zotero.randomString();
@ -405,11 +405,11 @@ describe("Zotero.Feed", function() {
})
it("should not allow adding collections", function* () {
let collection = new Zotero.Collection({ name: 'test', libraryID: feed.libraryID });
yield assert.isRejected(collection.saveTx({ skipEditCheck: true }), /^Error: Cannot add /);
yield assert.isRejected(collection.saveTx({ skipEditCheck: true }), /^Cannot add /);
});
it("should not allow adding saved search", function* () {
let search = new Zotero.Search({ name: 'test', libraryID: feed.libraryID });
yield assert.isRejected(search.saveTx({ skipEditCheck: true }), /^Error: Cannot add /);
yield assert.isRejected(search.saveTx({ skipEditCheck: true }), /^Cannot add /);
});
it("should allow adding feed item", function* () {
let feedItem = new Zotero.FeedItem('book', { guid: Zotero.randomString() });