summaryrefslogtreecommitdiffstats
path: root/js/tests/controllers/settingscontrollerSpec.coffee
diff options
context:
space:
mode:
Diffstat (limited to 'js/tests/controllers/settingscontrollerSpec.coffee')
-rw-r--r--js/tests/controllers/settingscontrollerSpec.coffee21
1 files changed, 10 insertions, 11 deletions
diff --git a/js/tests/controllers/settingscontrollerSpec.coffee b/js/tests/controllers/settingscontrollerSpec.coffee
index 4f028975f..beb404261 100644
--- a/js/tests/controllers/settingscontrollerSpec.coffee
+++ b/js/tests/controllers/settingscontrollerSpec.coffee
@@ -30,13 +30,14 @@ describe 'SettingsController', ->
$provide.value 'Persistence', @persistence
return
- beforeEach inject ($controller, @FeedBusinessLayer, @FolderBusinessLayer,
- @ShowAll) =>
+ beforeEach inject ($controller, @ShowAll) =>
@scope = {}
@replace =
'$scope': @scope
'FolderBusinessLayer':
import: jasmine.createSpy('import')
+ 'FeedBusinessLayer':
+ importArticles: jasmine.createSpy('import')
@controller = $controller('SettingsController', @replace)
@@ -63,29 +64,27 @@ describe 'SettingsController', ->
expect(@ShowAll.getShowAll()).toBe(true)
- it 'should set showall to true if importing json', =>
+ it 'should set loading to true if importing json', =>
json = "[\"test\"]"
- @scope.importGoogleReader(json)
-
- expect(@ShowAll.getShowAll()).toBe(true)
+ @scope.importArticles(json)
+ expect(@scope.loading).toBe(true)
it 'should show an error if the json import failed', =>
json = 'test'
- @scope.importGoogleReader(json)
+ @scope.importArticles(json)
expect(@scope.jsonError).toBe(true)
it 'should import json', =>
- @FeedBusinessLayer.importGoogleReader = jasmine.createSpy('googlereader')
json = "{\"test\": \"abc\"}"
- @scope.importGoogleReader(json)
+ @scope.importArticles(json)
expected = JSON.parse(json)
- expect(@FeedBusinessLayer.importGoogleReader).toHaveBeenCalledWith(
- expected
+ expect(@replace.FeedBusinessLayer.importArticles).toHaveBeenCalledWith(
+ expected, jasmine.any(Function)
)