diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-13 17:28:33 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-13 17:28:38 +0200 |
| commit | ee9e17ef17cb212e8a89175fccfa4f44b6da8ad5 (patch) | |
| tree | 7e2c8bb470a1b920030c93c320d95131ba888e9b /js/tests | |
| parent | 38e4b6d7e973bc99811139066a7a047b4bd76a4c (diff) | |
implement opml import, fix #23
Diffstat (limited to 'js/tests')
| -rw-r--r-- | js/tests/controllers/settingscontrollerSpec.coffee | 10 | ||||
| -rw-r--r-- | js/tests/services/bl/folderblSpec.coffee | 9 |
2 files changed, 17 insertions, 2 deletions
diff --git a/js/tests/controllers/settingscontrollerSpec.coffee b/js/tests/controllers/settingscontrollerSpec.coffee index cedf5eb44..ec2df410c 100644 --- a/js/tests/controllers/settingscontrollerSpec.coffee +++ b/js/tests/controllers/settingscontrollerSpec.coffee @@ -25,7 +25,7 @@ describe 'SettingsController', -> beforeEach module 'News' - beforeEach inject ($controller, @FeedBl, @FolderBl) => + beforeEach inject ($controller, @FeedBl, @FolderBl, @ShowAll) => @scope = {} @replace = '$scope': @scope @@ -42,4 +42,12 @@ describe 'SettingsController', -> @scope.import(xml) expect(@scope.error).toBe(true) + + + it 'should set showall to true if importing', => + xml = 'test' + + @scope.import(xml) + + expect(@ShowAll.getShowAll()).toBe(true)
\ No newline at end of file diff --git a/js/tests/services/bl/folderblSpec.coffee b/js/tests/services/bl/folderblSpec.coffee index ba7e94de5..8bb40033d 100644 --- a/js/tests/services/bl/folderblSpec.coffee +++ b/js/tests/services/bl/folderblSpec.coffee @@ -30,6 +30,7 @@ describe 'FolderBl', -> @persistence = createFolder: -> createFeed: -> + openFolder: -> beforeEach inject (@FolderBl, @FolderModel, @FeedModel, @ShowAll, @ActiveFeed, @FeedType, @_ExistsError) => @@ -155,6 +156,7 @@ describe 'FolderBl', -> it 'should create a folder before theres a response from the server', => @FolderBl.create('johns') expect(@FolderModel.size()).toBe(1) + expect(@FolderModel.getByName('johns').opened).toBe(true) it 'should make a create folder request', => @@ -363,8 +365,10 @@ describe 'FolderBl', -> it 'should use an existing folder when importing a folder', => @persistence.createFolder = jasmine.createSpy('create folder') @persistence.createFeed = jasmine.createSpy('create feed') + @persistence.openFolder = jasmine.createSpy('open folder') - @FolderModel.add({id: 2, name: 'design'}) + folder = {id: 2, name: 'design', opened: false} + @FolderModel.add(folder) xml = '<?xml version="1.0" ?> <opml version="1.1"> <!--Generated by NewsBlur - www.newsblur.com--> @@ -395,6 +399,9 @@ describe 'FolderBl', -> expect(@persistence.createFolder).not.toHaveBeenCalled() expect(@persistence.createFeed).toHaveBeenCalledWith( 'http://worrydream.com/feed.xml', 2, jasmine.any(Function)) + expect(folder.opened).toBe(true) + expect(@persistence.openFolder).toHaveBeenCalled() + it 'should not import a feed if it already exists', => |