summaryrefslogtreecommitdiffstats
path: root/js/tests
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-22 18:24:31 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-22 18:24:31 +0200
commitdf18314b32b05f10720936831ed43573e1792ae6 (patch)
treea2b8e28e165727e7a88d7ac3529f64d5f6b938e2 /js/tests
parent366c1b15545b4da69bc8e236ba4350c28ad24e77 (diff)
added import from google reader, fix #80
Diffstat (limited to 'js/tests')
-rw-r--r--js/tests/services/businesslayer/feedbusinesslayerSpec.coffee19
-rw-r--r--js/tests/services/persistenceSpec.coffee3
2 files changed, 20 insertions, 2 deletions
diff --git a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
index 4f7e8f8b3..833af6da8 100644
--- a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
+++ b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
@@ -365,8 +365,25 @@ describe 'FeedBusinessLayer', ->
it 'should create an import google reader request', =>
+ returned =
+ data:
+ feeds: [
+ {id: 3, url: 'hi'}
+ ]
+ @persistence.getItems = jasmine.createSpy('importGoogleReader')
@persistence.importGoogleReader = jasmine.createSpy('importGoogleReader')
+ @persistence.importGoogleReader.andCallFake (data, onSuccess) =>
+ @FeedModel.handle(returned.data.feeds)
+ onSuccess(returned)
+
json = {"test": "hi"}
@FeedBusinessLayer.importGoogleReader(json)
- expect(@persistence.importGoogleReader).toHaveBeenCalledWith(json) \ No newline at end of file
+ expect(@persistence.importGoogleReader).toHaveBeenCalledWith(json,
+ jasmine.any(Function))
+ expect(@persistence.getItems).toHaveBeenCalledWith(
+ @FeedType.Feed, returned.data.feeds[0].id, 0
+ )
+ expect(@ActiveFeed.getId()).toBe(returned.data.feeds[0].id)
+ expect(@ActiveFeed.getType()).toBe(@FeedType.Feed)
+
diff --git a/js/tests/services/persistenceSpec.coffee b/js/tests/services/persistenceSpec.coffee
index 70bcf824f..90bd82783 100644
--- a/js/tests/services/persistenceSpec.coffee
+++ b/js/tests/services/persistenceSpec.coffee
@@ -252,8 +252,9 @@ describe 'Persistence', ->
params =
data:
json: {"some": "json"}
+ onSuccess: ->
- @Persistence.importGoogleReader(params.data.json)
+ @Persistence.importGoogleReader(params.data.json, params.onSuccess)
expect(@req.post).toHaveBeenCalledWith('news_feeds_import_googlereader',