summaryrefslogtreecommitdiffstats
path: root/js/tests
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2016-04-08 19:34:45 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2016-04-08 19:34:45 +0200
commit1c4c9992417ccadf51a7425d70cafb12f0405a21 (patch)
tree906f4df89a4190c199096c56b12b637b1fd9583c /js/tests
parenta9d463a1313f0beb23c7e7653e5bbdfa1fbe167f (diff)
Fix #924
Diffstat (limited to 'js/tests')
-rw-r--r--js/tests/unit/controller/SettingsControllerSpec.js12
1 files changed, 9 insertions, 3 deletions
diff --git a/js/tests/unit/controller/SettingsControllerSpec.js b/js/tests/unit/controller/SettingsControllerSpec.js
index 4214f9d81..19973860e 100644
--- a/js/tests/unit/controller/SettingsControllerSpec.js
+++ b/js/tests/unit/controller/SettingsControllerSpec.js
@@ -112,7 +112,13 @@ describe('SettingsController', function () {
OPMLParser) {
var queue = 4;
- OPMLParser.parse = jasmine.createSpy('parse').and.returnValue(2);
+ var opml = {
+ feeds: [
+ {name: 'hi'}
+ ],
+ folders: []
+ };
+ OPMLParser.parse = jasmine.createSpy('parse').and.returnValue(opml);
OPMLImporter.importFolders = jasmine.createSpy('importFolders')
.and.returnValue({
@@ -133,12 +139,12 @@ describe('SettingsController', function () {
OPMLParser: OPMLParser
});
- var content = '{"test":1}';
+ var content = '{"folders":[{name:"b"}]}';
ctrl.importOPML(content);
expect(OPMLParser.parse).toHaveBeenCalledWith(content);
- expect(OPMLImporter.importFolders).toHaveBeenCalledWith(2);
+ expect(OPMLImporter.importFolders).toHaveBeenCalledWith(opml);
expect(OPMLImporter.importFeedQueue).toHaveBeenCalledWith(4, 5);
expect(ctrl.isOPMLImporting).toBe(false);
expect(ctrl.opmlImportError).toBe(false);