get language from server and save it in a language object, dont use a seperate file for instantiating controllers

4 files changed, 65 insertions, 11 deletions

diff --git a/js/tests/controllers/feedcontrollerSpec.coffee b/js/tests/controllers/feedcontrollerSpec.coffee
index b5216db60..e3ecb357b 100644
--- a/js/tests/controllers/feedcontrollerSpec.coffee
+++ b/js/tests/controllers/feedcontrollerSpec.coffee
@@ -30,13 +30,14 @@ describe '_FeedController', ->
 			@persistence = {}
 
 
-	beforeEach inject (@_FeedController, @FolderBl, @FeedBl, $rootScope,
+	beforeEach inject ($controller, @FolderBl, @FeedBl, $rootScope,
 		               @unreadCountFormatter, @SubscriptionsBl, @StarredBl) =>
 		@scope = $rootScope.$new()
+		replace =
+			$scope: @scope
+			Persistence: @persistence
 
-		@controller = new @_FeedController(@scope, @persistence, @FolderBl,
-		                                   @FeedBl, @SubscriptionsBl, @StarredBl,
-		                                   @unreadCountFormatter)
+		@controller = $controller('FeedController', replace)
 
 
 
diff --git a/js/tests/controllers/itemcontrollerSpec.coffee b/js/tests/controllers/itemcontrollerSpec.coffee
index f95f4a459..d6a33b68e 100644
--- a/js/tests/controllers/itemcontrollerSpec.coffee
+++ b/js/tests/controllers/itemcontrollerSpec.coffee
@@ -21,20 +21,21 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
 
-describe '_ItemController', ->
+describe 'ItemController', ->
 
 
 	beforeEach module 'News'
 
-	beforeEach inject (@_ItemController, @ActiveFeed, @ShowAll, @FeedType,
-		               @StarredCount, @FeedModel, @FolderModel, @ItemModel,
-		               @ItemBl, @FeedBl, @FeedLoading) =>
+	beforeEach inject ($controller, @ItemBl, @FeedBl) =>
 		@scope = {}
 		@persistence = {
 			getItems: ->
 		}
-		@controller = new @_ItemController(@scope, @ItemBl, @FeedModel,
-		                                   @FeedLoading, @FeedBl)
+
+		replace =
+			$scope: @scope
+			Persistence: @persistence
+		@controller = $controller('ItemController', replace)
 
 
 	it 'should make ItemBl availabe', =>
@@ -43,3 +44,6 @@ describe '_ItemController', ->
 
 	it 'should make FeedBl availabe', =>
 		expect(@scope.feedBl).toBe(@FeedBl)
+
+
+	it 'should '
diff --git a/js/tests/services/languageSpec.coffee b/js/tests/services/languageSpec.coffee
new file mode 100644
index 000000000..526d4ecbc
--- /dev/null
+++ b/js/tests/services/languageSpec.coffee
@@ -0,0 +1,40 @@
+###
+
+ownCloud - News
+
+@author Bernhard Posselt
+@copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+License as published by the Free Software Foundation; either
+version 3 of the License, or any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+
+You should have received a copy of the GNU Affero General Public
+License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+###
+
+
+describe 'Language', ->
+
+	beforeEach module 'News'
+
+	beforeEach inject (@Language, @FeedType) =>
+		@data =
+			language: 'de'
+
+
+	it 'should be en by default', =>
+		expect(@Language.getLanguage()).toBe('en')
+
+
+	it 'should set the correct feed id', =>
+		@Language.handle(@data)
+		expect(@Language.getLanguage()).toBe('de')
+
diff --git a/js/tests/services/persistenceSpec.coffee b/js/tests/services/persistenceSpec.coffee
index 28c13b06d..80a95c758 100644
--- a/js/tests/services/persistenceSpec.coffee
+++ b/js/tests/services/persistenceSpec.coffee
@@ -354,7 +354,6 @@ describe '_Persistence', ->
 			params)
 
 
-
 	it 'should do a proper user settings read hide request', =>
 		pers = new @_Persistence(@req, @loading, @config, @active, @$rootScope)
 		params =
@@ -362,4 +361,14 @@ describe '_Persistence', ->
 		pers.userSettingsReadHide(params.onSuccess)
 
 		expect(@req.post).toHaveBeenCalledWith('news_usersettings_read_hide',
+			params)
+
+
+	it 'should do a proper user settings language request', =>
+		pers = new @_Persistence(@req, @loading, @config, @active, @$rootScope)
+		params =
+			onSuccess: ->
+		pers.userSettingsLanguage(params.onSuccess)
+
+		expect(@req.get).toHaveBeenCalledWith('news_usersettings_language',
 			params)
\ No newline at end of file