added javascript for uploading google reader json files

3 files changed, 72 insertions, 3 deletions

diff --git a/js/tests/controllers/settingscontrollerSpec.coffee b/js/tests/controllers/settingscontrollerSpec.coffee
index 88e16c969..dca53ff4b 100644
--- a/js/tests/controllers/settingscontrollerSpec.coffee
+++ b/js/tests/controllers/settingscontrollerSpec.coffee
@@ -56,4 +56,31 @@ describe 'SettingsController', ->
 		@scope.import(xml)
 
 		expect(@ShowAll.getShowAll()).toBe(true)
-		
\ No newline at end of file
+
+
+	it 'should set showall to true if importing json', =>
+		json = "[\"test\"]"
+
+		@scope.importGoogleReader(json)
+
+		expect(@ShowAll.getShowAll()).toBe(true)
+
+
+	it 'should show an error if the json import failed', =>
+		json = 'test'
+
+		@scope.importGoogleReader(json)
+
+		expect(@scope.jsonError).toBe(true)
+
+
+	it 'should import json', =>
+		@FeedBusinessLayer.importGoogleReader = jasmine.createSpy('googlereader')
+		json = "{\"test\": \"abc\"}"
+
+		@scope.importGoogleReader(json)
+
+		expected = JSON.parse(json)
+		expect(@FeedBusinessLayer.importGoogleReader).toHaveBeenCalledWith(
+			expected
+		)
diff --git a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
index f867443c7..5ac93f25e 100644
--- a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
+++ b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee
@@ -344,4 +344,35 @@ describe 'FeedBusinessLayer', ->
 
 		@FeedBusinessLayer.updateFeeds()
 
-		expect(@persistence.updateFeed).not.toHaveBeenCalled()
\ No newline at end of file
+		expect(@persistence.updateFeed).not.toHaveBeenCalled()
+
+
+	it 'should not import google reader json', =>
+		@persistence.importGoogleReader = jasmine.createSpy('importGoogleReader')
+
+		json = {"test": "hi"}
+		@FeedBusinessLayer.importGoogleReader(json)
+
+		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', =>
+		@persistence.importGoogleReader = jasmine.createSpy('importGoogleReader')
+		json = {"test": "hi"}
+		@FeedBusinessLayer.importGoogleReader(json)
+
+		expect(@persistence.importGoogleReader).toHaveBeenCalledWith(json)
\ No newline at end of file
diff --git a/js/tests/services/persistenceSpec.coffee b/js/tests/services/persistenceSpec.coffee
index 3fca95cc2..98bd96531 100644
--- a/js/tests/services/persistenceSpec.coffee
+++ b/js/tests/services/persistenceSpec.coffee
@@ -237,6 +237,17 @@ describe 'Persistence', ->
 		expect(@req.post).toHaveBeenCalledWith('news_feeds_create', params)
 
 
+	it 'should do a proper import google reader request', =>
+		params =
+			data:
+				json: {"some": "json"}
+
+		@Persistence.importGoogleReader(params.data.json)
+
+
+		expect(@req.post).toHaveBeenCalledWith('news_feeds_import_googlereader',
+			params)
+
 
 	###
 		FOLDER CONTROLLER
@@ -367,4 +378,4 @@ describe 'Persistence', ->
 			onFailure: jasmine.any(Function)
 
 		expect(@req.get).toHaveBeenCalledWith('news_usersettings_language',
-			expected)
\ No newline at end of file
+			expected)