From f0523f72b46db14e2f50c8347a8708734c650f84 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Mon, 15 Feb 2010 21:44:30 +0700
Subject: Rename Rails::Subscriber to Rails::LogSubscriber

---
 actionpack/test/controller/log_subscriber_test.rb | 172 ++++++++++++++++++++++
 actionpack/test/controller/subscriber_test.rb     | 172 ----------------------
 2 files changed, 172 insertions(+), 172 deletions(-)
 create mode 100644 actionpack/test/controller/log_subscriber_test.rb
 delete mode 100644 actionpack/test/controller/subscriber_test.rb

(limited to 'actionpack/test/controller')

diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
new file mode 100644
index 0000000000..182f343b2f
--- /dev/null
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -0,0 +1,172 @@
+require "abstract_unit"
+require "rails/log_subscriber/test_helper"
+require "action_controller/railties/log_subscriber"
+
+module Another
+  class LogSubscribersController < ActionController::Base
+    def show
+      render :nothing => true
+    end
+
+    def redirector
+      redirect_to "http://foo.bar/"
+    end
+
+    def data_sender
+      send_data "cool data", :filename => "file.txt"
+    end
+
+    def xfile_sender
+      send_file File.expand_path("company.rb", FIXTURE_LOAD_PATH), :x_sendfile => true
+    end
+
+    def file_sender
+      send_file File.expand_path("company.rb", FIXTURE_LOAD_PATH)
+    end
+
+    def with_fragment_cache
+      render :inline => "<%= cache('foo'){ 'bar' } %>"
+    end
+
+    def with_page_cache
+      cache_page("Super soaker", "/index.html")
+      render :nothing => true
+    end
+  end
+end
+
+class ACLogSubscriberTest < ActionController::TestCase
+  tests Another::LogSubscribersController
+  include Rails::LogSubscriber::TestHelper
+
+  def setup
+    @old_logger = ActionController::Base.logger
+
+    @cache_path = File.expand_path('../temp/test_cache', File.dirname(__FILE__))
+    ActionController::Base.page_cache_directory = @cache_path
+    ActionController::Base.cache_store = :file_store, @cache_path
+
+    Rails::LogSubscriber.add(:action_controller, ActionController::Railties::LogSubscriber.new)
+    super
+  end
+
+  def teardown
+    super
+    Rails::LogSubscriber.log_subscribers.clear
+    FileUtils.rm_rf(@cache_path)
+    ActionController::Base.logger = @old_logger
+  end
+
+  def set_logger(logger)
+    ActionController::Base.logger = logger
+  end
+
+  def test_start_processing
+    get :show
+    wait
+    assert_equal 2, logs.size
+    assert_equal "Processing by Another::LogSubscribersController#show as HTML", logs.first
+  end
+
+  def test_process_action
+    get :show
+    wait
+    assert_equal 2, logs.size
+    assert_match /Completed/, logs.last
+    assert_match /200 OK/, logs.last
+  end
+
+  def test_process_action_without_parameters
+    get :show
+    wait
+    assert_nil logs.detect {|l| l =~ /Parameters/ }
+  end
+
+  def test_process_action_with_parameters
+    get :show, :id => '10'
+    wait
+
+    assert_equal 3, logs.size
+    assert_equal 'Parameters: {"id"=>"10"}', logs[1]
+  end
+
+  def test_process_action_with_view_runtime
+    get :show
+    wait
+    assert_match /\(Views: [\d\.]+ms\)/, logs[1]
+  end
+
+  def test_process_action_with_filter_parameters
+    @request.env["action_dispatch.parameter_filter"] = [:lifo, :amount]
+
+    get :show, :lifo => 'Pratik', :amount => '420', :step => '1'
+    wait
+
+    params = logs[1]
+    assert_match /"amount"=>"\[FILTERED\]"/, params
+    assert_match /"lifo"=>"\[FILTERED\]"/, params
+    assert_match /"step"=>"1"/, params
+  end
+
+  def test_redirect_to
+    get :redirector
+    wait
+
+    assert_equal 3, logs.size
+    assert_equal "Redirected to http://foo.bar/", logs[1]
+  end
+
+  def test_send_data
+    get :data_sender
+    wait
+
+    assert_equal 3, logs.size
+    assert_match /Sent data file\.txt/, logs[1]
+  end
+
+  def test_send_file
+    get :file_sender
+    wait
+
+    assert_equal 3, logs.size
+    assert_match /Sent file/, logs[1]
+    assert_match /test\/fixtures\/company\.rb/, logs[1]
+  end
+
+  def test_send_xfile
+    get :xfile_sender
+    wait
+
+    assert_equal 3, logs.size
+    assert_match /Sent X\-Sendfile header/, logs[1]
+    assert_match /test\/fixtures\/company\.rb/, logs[1]
+  end
+
+  def test_with_fragment_cache
+    ActionController::Base.perform_caching = true
+    get :with_fragment_cache
+    wait
+
+    assert_equal 4, logs.size
+    assert_match /Exist fragment\? views\/foo/, logs[1]
+    assert_match /Write fragment views\/foo/, logs[2]
+  ensure
+    ActionController::Base.perform_caching = true
+  end
+
+  def test_with_page_cache
+    ActionController::Base.perform_caching = true
+    get :with_page_cache
+    wait
+
+    assert_equal 3, logs.size
+    assert_match /Write page/, logs[1]
+    assert_match /\/index\.html/, logs[1]
+  ensure
+    ActionController::Base.perform_caching = true
+  end
+
+  def logs
+    @logs ||= @logger.logged(:info)
+  end
+end
diff --git a/actionpack/test/controller/subscriber_test.rb b/actionpack/test/controller/subscriber_test.rb
deleted file mode 100644
index d7c1166f14..0000000000
--- a/actionpack/test/controller/subscriber_test.rb
+++ /dev/null
@@ -1,172 +0,0 @@
-require "abstract_unit"
-require "rails/subscriber/test_helper"
-require "action_controller/railties/subscriber"
-
-module Another
-  class SubscribersController < ActionController::Base
-    def show
-      render :nothing => true
-    end
-
-    def redirector
-      redirect_to "http://foo.bar/"
-    end
-
-    def data_sender
-      send_data "cool data", :filename => "file.txt"
-    end
-
-    def xfile_sender
-      send_file File.expand_path("company.rb", FIXTURE_LOAD_PATH), :x_sendfile => true
-    end
-
-    def file_sender
-      send_file File.expand_path("company.rb", FIXTURE_LOAD_PATH)
-    end
-
-    def with_fragment_cache
-      render :inline => "<%= cache('foo'){ 'bar' } %>"
-    end
-
-    def with_page_cache
-      cache_page("Super soaker", "/index.html")
-      render :nothing => true
-    end
-  end
-end
-
-class ACSubscriberTest < ActionController::TestCase
-  tests Another::SubscribersController
-  include Rails::Subscriber::TestHelper
-
-  def setup
-    @old_logger = ActionController::Base.logger
-
-    @cache_path = File.expand_path('../temp/test_cache', File.dirname(__FILE__))
-    ActionController::Base.page_cache_directory = @cache_path
-    ActionController::Base.cache_store = :file_store, @cache_path
-
-    Rails::Subscriber.add(:action_controller, ActionController::Railties::Subscriber.new)
-    super
-  end
-
-  def teardown
-    super
-    Rails::Subscriber.subscribers.clear
-    FileUtils.rm_rf(@cache_path)
-    ActionController::Base.logger = @old_logger
-  end
-
-  def set_logger(logger)
-    ActionController::Base.logger = logger
-  end
-
-  def test_start_processing
-    get :show
-    wait
-    assert_equal 2, logs.size
-    assert_equal "Processing by Another::SubscribersController#show as HTML", logs.first
-  end
-
-  def test_process_action
-    get :show
-    wait
-    assert_equal 2, logs.size
-    assert_match /Completed/, logs.last
-    assert_match /200 OK/, logs.last
-  end
-
-  def test_process_action_without_parameters
-    get :show
-    wait
-    assert_nil logs.detect {|l| l =~ /Parameters/ }
-  end
-
-  def test_process_action_with_parameters
-    get :show, :id => '10'
-    wait
-
-    assert_equal 3, logs.size
-    assert_equal 'Parameters: {"id"=>"10"}', logs[1]
-  end
-
-  def test_process_action_with_view_runtime
-    get :show
-    wait
-    assert_match /\(Views: [\d\.]+ms\)/, logs[1]
-  end
-
-  def test_process_action_with_filter_parameters
-    @request.env["action_dispatch.parameter_filter"] = [:lifo, :amount]
-
-    get :show, :lifo => 'Pratik', :amount => '420', :step => '1'
-    wait
-
-    params = logs[1]
-    assert_match /"amount"=>"\[FILTERED\]"/, params
-    assert_match /"lifo"=>"\[FILTERED\]"/, params
-    assert_match /"step"=>"1"/, params
-  end
-
-  def test_redirect_to
-    get :redirector
-    wait
-
-    assert_equal 3, logs.size
-    assert_equal "Redirected to http://foo.bar/", logs[1]
-  end
-
-  def test_send_data
-    get :data_sender
-    wait
-
-    assert_equal 3, logs.size
-    assert_match /Sent data file\.txt/, logs[1]
-  end
-
-  def test_send_file
-    get :file_sender
-    wait
-
-    assert_equal 3, logs.size
-    assert_match /Sent file/, logs[1]
-    assert_match /test\/fixtures\/company\.rb/, logs[1]
-  end
-
-  def test_send_xfile
-    get :xfile_sender
-    wait
-
-    assert_equal 3, logs.size
-    assert_match /Sent X\-Sendfile header/, logs[1]
-    assert_match /test\/fixtures\/company\.rb/, logs[1]
-  end
-
-  def test_with_fragment_cache
-    ActionController::Base.perform_caching = true
-    get :with_fragment_cache
-    wait
-
-    assert_equal 4, logs.size
-    assert_match /Exist fragment\? views\/foo/, logs[1]
-    assert_match /Write fragment views\/foo/, logs[2]
-  ensure
-    ActionController::Base.perform_caching = true
-  end
-
-  def test_with_page_cache
-    ActionController::Base.perform_caching = true
-    get :with_page_cache
-    wait
-
-    assert_equal 3, logs.size
-    assert_match /Write page/, logs[1]
-    assert_match /\/index\.html/, logs[1]
-  ensure
-    ActionController::Base.perform_caching = true
-  end
-
-  def logs
-    @logs ||= @logger.logged(:info)
-  end
-end
-- 
cgit v1.2.3