rename service* to web_service*.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@668 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 10 insertions, 10 deletions

diff --git a/actionservice/test/container_test.rb b/actionservice/test/container_test.rb
index b222138087..8c66651b64 100644
--- a/actionservice/test/container_test.rb
+++ b/actionservice/test/container_test.rb
@@ -6,7 +6,7 @@ module ContainerTest
   $deferred_service = Object.new
   
   class DelegateContainer < ActionController::Base
-    service_dispatching_mode :delegated
+    web_service_dispatching_mode :delegated
   
     attr :flag
     attr :previous_flag
@@ -16,12 +16,12 @@ module ContainerTest
       @flag = true
     end
   
-    service :immediate_service, $immediate_service
-    service(:deferred_service) { @previous_flag = @flag; @flag = false; $deferred_service }
+    web_service :immediate_service, $immediate_service
+    web_service(:deferred_service) { @previous_flag = @flag; @flag = false; $deferred_service }
   end
   
   class DirectContainer < ActionController::Base
-    service_dispatching_mode :direct
+    web_service_dispatching_mode :direct
    end
 end
 
@@ -32,22 +32,22 @@ class TC_Container < Test::Unit::TestCase
   end
 
   def test_registration
-    assert(ContainerTest::DelegateContainer.has_service?(:immediate_service))
-    assert(ContainerTest::DelegateContainer.has_service?(:deferred_service))
-    assert(!ContainerTest::DelegateContainer.has_service?(:fake_service))
+    assert(ContainerTest::DelegateContainer.has_web_service?(:immediate_service))
+    assert(ContainerTest::DelegateContainer.has_web_service?(:deferred_service))
+    assert(!ContainerTest::DelegateContainer.has_web_service?(:fake_service))
   end
 
   def test_service_object
     assert(@delegate_container.flag == true)
-    assert(@delegate_container.service_object(:immediate_service) == $immediate_service)
+    assert(@delegate_container.web_service_object(:immediate_service) == $immediate_service)
     assert(@delegate_container.previous_flag.nil?)
     assert(@delegate_container.flag == true)
-    assert(@delegate_container.service_object(:deferred_service) == $deferred_service)
+    assert(@delegate_container.web_service_object(:deferred_service) == $deferred_service)
     assert(@delegate_container.previous_flag == true)
     assert(@delegate_container.flag == false)
   end
 
   def test_direct_container
-    assert(ContainerTest::DirectContainer.service_dispatching_mode == :direct)
+    assert(ContainerTest::DirectContainer.web_service_dispatching_mode == :direct)
   end
 end