fix #342

3 files changed, 22 insertions, 56 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)
 		)
diff --git a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
index 92bbe4b2d..26e5a2973 100644
--- a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
+++ b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
@@ -332,49 +332,16 @@ describe 'FeedBusinessLayer', ->
 		expect(@FeedModel.getByUrl('john')).toBe(undefined)
 
 
-	it 'should not import google reader json', =>
-		@persistence.importGoogleReader = jasmine.createSpy('importGoogleReader')
+	it 'should create an import article request', =>
+		callback = jasmine.createSpy('called')
+		@persistence.importArticles = jasmine.createSpy('importArticles')
+		@persistence.importArticles.andCallFake (data, onSuccess) =>
+			onSuccess()
 
 		json = {"test": "hi"}
-		@FeedBusinessLayer.importGoogleReader(json)
+		@FeedBusinessLayer.importArticles(json, callback)
 
-		imported = @FeedModel.getByUrl('http://owncloud/googlereader')
-		expect(imported.title).toBe('Google Reader')
-		expect(imported.folderId).toBe(0)
-		expect(imported.unreadCount).toBe(0)
-
-
-	it 'should not create a google reader feed if it already exists', =>
-		@persistence.importGoogleReader = jasmine.createSpy('importGoogleReader')
-
-		@FeedModel.add({id: 3, url: 'http://owncloud/googlereader'})
-		json = {"test": "hi"}
-		@FeedBusinessLayer.importGoogleReader(json)
-
-		imported = @FeedModel.getByUrl('http://owncloud/googlereader')
-		expect(imported.folderId).not.toBeDefined()
-
-
-	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,
+		expect(@persistence.importArticles).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)
+		expect(callback).toHaveBeenCalled()
 
diff --git a/js/tests/services/persistenceSpec.coffee b/js/tests/services/persistenceSpec.coffee
index 3a8a79050..e9f12f669 100644
--- a/js/tests/services/persistenceSpec.coffee
+++ b/js/tests/services/persistenceSpec.coffee
@@ -233,16 +233,16 @@ describe 'Persistence', ->
 		expect(@req.post).toHaveBeenCalledWith('news_feeds_create', params)
 
 
-	it 'should do a proper import google reader request', =>
+	it 'should do a proper import articles request', =>
 		params =
 			data:
 				json: {"some": "json"}
-			onSuccess: ->
+			onSuccess: jasmine.any(Function)
 
-		@Persistence.importGoogleReader(params.data.json, params.onSuccess)
+		@Persistence.importArticles(params.data.json, ->)
 
 
-		expect(@req.post).toHaveBeenCalledWith('news_feeds_import_googlereader',
+		expect(@req.post).toHaveBeenCalledWith('news_feeds_import_articles',
 			params)