ref: refs/heads/master
commit ce4ceedfaac6ab6fa1eccf33d62718c24a116daf
Author: Martin Vidner
Date: Wed Sep 30 12:28:50 2009 +0200
One more place for SystemTime.
---
.../test/functional/systemtime_controller_test.rb | 52 ++++++++++++++++++++
.../test/functional/systemtimes_controller_test.rb | 52 --------------------
2 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/plugins/time/test/functional/systemtime_controller_test.rb b/plugins/time/test/functional/systemtime_controller_test.rb
new file mode 100644
index 0000000..5df555d
--- /dev/null
+++ b/plugins/time/test/functional/systemtime_controller_test.rb
@@ -0,0 +1,52 @@
+require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
+require 'test/unit'
+require 'rubygems'
+require 'systemtime'
+require "scr"
+require 'mocha'
+require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.parent )
+
+class SystemtimeControllerTest < ActionController::TestCase
+ fixtures :accounts
+
+ DATA = {:time => {
+ :timezone => "Europe/Prague",
+ :utcstatus => "true"
+ }}
+
+ def setup
+ @model_class = Systemtime
+
+ Systemtime.stubs(:find).returns(Systemtime.new)
+
+ @controller = SystemtimeController.new
+ @request = ActionController::TestRequest.new
+ # http://railsforum.com/viewtopic.php?id=1719
+ @request.session[:account_id] = 1 # defined in fixtures
+ @data = DATA
+ end
+
+ include PluginBasicTests
+
+ def test_update
+ mock_save
+ put :update, DATA
+ assert_response :success
+ end
+
+ def test_create
+ mock_save
+ put :create, DATA
+ assert_response :success
+ end
+
+ def mock_save
+ YastService.stubs(:Call).with {
+ |params,settings|
+ params == "YaPI::TIME::Write" and
+ settings["timezone"] == DATA[:time][:timezone] and
+ settings["utcstatus"] == DATA[:time][:utcstatus] and
+ ! settings.include?("currenttime")
+ }
+ end
+end
diff --git a/plugins/time/test/functional/systemtimes_controller_test.rb b/plugins/time/test/functional/systemtimes_controller_test.rb
deleted file mode 100644
index c231af1..0000000
--- a/plugins/time/test/functional/systemtimes_controller_test.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
-require 'test/unit'
-require 'rubygems'
-require 'systemtime'
-require "scr"
-require 'mocha'
-require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.parent )
-
-class SystemtimesControllerTest < ActionController::TestCase
- fixtures :accounts
-
- DATA = {:time => {
- :timezone => "Europe/Prague",
- :utcstatus => "true"
- }}
-
- def setup
- @model_class = Systemtime
-
- Systemtime.stubs(:find).returns(Systemtime.new)
-
- @controller = SystemtimesController.new
- @request = ActionController::TestRequest.new
- # http://railsforum.com/viewtopic.php?id=1719
- @request.session[:account_id] = 1 # defined in fixtures
- @data = DATA
- end
-
- include PluginBasicTests
-
- def test_update
- mock_save
- put :update, DATA
- assert_response :success
- end
-
- def test_create
- mock_save
- put :create, DATA
- assert_response :success
- end
-
- def mock_save
- YastService.stubs(:Call).with {
- |params,settings|
- params == "YaPI::TIME::Write" and
- settings["timezone"] == DATA[:time][:timezone] and
- settings["utcstatus"] == DATA[:time][:utcstatus] and
- ! settings.include?("currenttime")
- }
- end
-end
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
Martin Vidner