chylex/Nextcloud-News
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-News.git synced 2025-04-25 20:15:47 +02:00
Code

Fix tests

Browse Source
This commit is contained in:
Daniel Schaal 2017-06-08 05:15:16 +02:00
parent 7cebc63def
commit 1fbb81e469
2 changed files with 17 additions and 28 deletions

37
js/tests/unit/controller/ContentControllerSpec.js
View File

@ -361,18 +361,14 @@ describe('ContentController', function () {
ItemResource.autoPage = jasmine.createSpy('autoPage')
.and.callFake(function () {
return {
success: function (callback) {
then: function (callback) {
callback({
'items': []
data: {'items': []}
});
return {
error: function () {
return {
finally: function (callback) {
callback();
}
};
finally: function (callback) {
callback();
}
};
}
@ -431,17 +427,15 @@ describe('ContentController', function () {
ItemResource.autoPage = jasmine.createSpy('autoPage')
.and.callFake(function () {
return {
success: function (callback) {
then: function (callback) {
callback({
'items': [{items: [{id: 3, fingerprint: 'a'}]}]
data: {
'items': [
{items: [{id: 3, fingerprint: 'a'}]}]}
});
return {
error: function () {
return {
finally: function () {
}
};
finally: function () {
}
};
}
@ -490,18 +484,13 @@ describe('ContentController', function () {
ItemResource.autoPage = jasmine.createSpy('autoPage')
.and.callFake(function () {
return {
success: function (callback) {
then: function (callback, errorCallback) {
callback({
'items': []
});
data: {'items': []}
}, errorCallback({}));
return {
error: function (callback) {
callback();
return {
finally: function () {
}
};
finally: function () {
}
};
}

8
js/tests/unit/controller/SettingsControllerSpec.js
View File

@ -62,12 +62,12 @@ describe('SettingsController', function () {
it('should import articles', inject(function ($controller, ItemResource,
Publisher) {
var data = 1;
var response = {data: 1};
ItemResource.importArticles = jasmine.createSpy('importArticles')
.and.callFake(function () {
return {
success: function (callback) {
callback(data);
then: function (callback) {
callback(response.data);
return {
finally: function (finalCallback) {
finalCallback();
@ -89,7 +89,7 @@ describe('SettingsController', function () {
expect(ItemResource.importArticles)
.toHaveBeenCalledWith(JSON.parse(content));
expect(Publisher.publishAll).toHaveBeenCalledWith(data);
expect(Publisher.publishAll).toHaveBeenCalledWith(response.data);
expect(ctrl.isArticlesImporting).toBe(false);
expect(ctrl.articleImportError).toBe(false);
}));