ref: refs/heads/master
commit f6315f065e8640b27a178b2c5f0e4bb9262e78ab
Author: Josef Reidinger
Date: Tue Aug 4 10:54:28 2009 +0200
fix test suite to current state
---
.../app/controllers/language_controller.rb | 48 ++++++++++----------
plugins/language/app/views/language/index.rhtml | 4 +-
.../test/functional/language_controller_test.rb | 12 ++---
3 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/plugins/language/app/controllers/language_controller.rb b/plugins/language/app/controllers/language_controller.rb
index 43cdd7d..157367a 100644
--- a/plugins/language/app/controllers/language_controller.rb
+++ b/plugins/language/app/controllers/language_controller.rb
@@ -21,36 +21,36 @@ class LanguageController < ApplicationController
redirect_to root_path
return false
end
-
- if @language
- @valid = language.available.collect { |item| item.name } || []
- @valid.sort!
- cur = language.available.find { |avail| avail.id.size>0 && avail.id == language.current }
- @current = cur.name if cur
- @rootlocale=language.rootlocale
- @utf8 = language.utf8
- end
+
+# debugger
+ @valid = language.available.collect { |item| item.name } || []
+ @valid.sort!
+ cur = language.available.find { |avail| avail.id.size>0 && avail.id == language.current }
+ @current = cur ? cur.name : ""
+ @rootlocale=language.rootlocale
+ @utf8 = language.utf8
+
end
def commit_language
- lang = load_proxy 'org.opensuse.yast.modules.yapi.language'
+ lang = load_proxy 'org.opensuse.yast.modules.yapi.language'
- if lang
- cur = lang.available.find { |avail| params[:first_language]==avail.name }
- lang.current = cur.id if cur
+ if lang
+ cur = lang.available.find { |avail| params[:first_language]==avail.name }
+ lang.current = cur.id if cur
- lang.available = [] #not needed anymore
- lang.utf8 = (params[:utf8] && params[:utf8]=="true") ? "true" : "false"
- lang.rootlocale = params[:rootlocale]
+ lang.available = [] #not needed anymore
+ lang.utf8 = (params[:utf8] && params[:utf8]=="true") ? "true" : "false"
+ lang.rootlocale = params[:rootlocale]
- begin
- lang.save
- flash[:notice] = _("Settings have been written.")
- rescue ActiveResource::ClientError => e
- flash[:error] = YaST::ServiceResource.error(e)
- end
- end
- redirect_to :action => :index
+ begin
+ lang.save
+ flash[:notice] = _("Settings have been written.")
+ rescue ActiveResource::ClientError => e
+ flash[:error] = YaST::ServiceResource.error(e)
+ end
+ end
+ redirect_to :action => :index
end
end
diff --git a/plugins/language/app/views/language/index.rhtml b/plugins/language/app/views/language/index.rhtml
index 26f88e1..d061ed5 100644
--- a/plugins/language/app/views/language/index.rhtml
+++ b/plugins/language/app/views/language/index.rhtml
@@ -1,4 +1,4 @@
-<div class='plugin-icon'><img src='/icons/yast-language.png'/></div>
+<div class='plugin-icon'>"/></div>
<div class='plugin-content'>
<h2><%=_("Language")%></h2>
<br/>
@@ -9,7 +9,7 @@
<tr>
<td class="first"><%=_("First Language")%></td>
<td>
- <%= select_tag :first_language, options_for_select(@valid, @current),
+ <%= select_tag :first_language, options_for_select(@valid||[], @current||""),
:disabled=>!@permissions[:write] %>
</td>
</tr>
diff --git a/plugins/language/test/functional/language_controller_test.rb b/plugins/language/test/functional/language_controller_test.rb
index a8becac..decfd43 100644
--- a/plugins/language/test/functional/language_controller_test.rb
+++ b/plugins/language/test/functional/language_controller_test.rb
@@ -66,11 +66,10 @@ class LanguageControllerTest < ActionController::TestCase
#check if everything is correctly setted
assert_response :success
assert_valid_markup
- assert assigns(:permissions)
- assert assigns(:permissions)[:read]
- assert assigns(:permissions)[:write]
- assert assigns(:language)
- assert_equal assigns(:valid), ["cestina","English (US)"]
+ assert assigns(:permissions) , "Permission is not set"
+ assert assigns(:permissions)[:read], "Read permission is not set"
+ assert assigns(:permissions)[:write], "Write permission is not set"
+ assert_equal assigns(:valid), ["cestina","English (US)"].sort
assert_equal assigns(:current), "cestina"
assert_equal assigns(:utf8), @result.utf8
assert_equal assigns(:rootlocale), @result.rootlocale
@@ -121,8 +120,7 @@ class LanguageControllerTest < ActionController::TestCase
assert assigns(:permissions)
assert assigns(:permissions)[:read]
assert !assigns(:permissions)[:write]
- assert assigns(:language)
- assert_equal assigns(:valid), ["cestina","English (US)"]
+ assert_equal assigns(:valid), ["cestina","English (US)"].sort
assert_equal assigns(:current), "cestina"
assert_equal assigns(:utf8), @result.utf8
assert_equal assigns(:rootlocale), @result.rootlocale
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org