From bce3b5cb72e61d855cdc924038a09b258bfcdf0c Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 23 Jan 2012 10:18:36 -0800
Subject: moved the `get` testing method to a module

---
 actionpack/test/abstract_unit.rb           | 15 +++++++++++++++
 actionpack/test/controller/routing_test.rb | 13 ++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 0a25d7ba47..b1a5356ddd 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -344,6 +344,21 @@ module ActionDispatch
   end
 end
 
+module ActionDispatch
+  module RoutingVerbs
+    def get(uri_or_host, path = nil, port = nil)
+      host = uri_or_host.host unless path
+      path ||= uri_or_host.path
+
+      params = {'PATH_INFO'      => path,
+                'REQUEST_METHOD' => 'GET',
+                'HTTP_HOST'      => host}
+
+      routes.call(params)[2].join
+    end
+  end
+end
+
 module RoutingTestHelpers
   def url_for(set, options, recall = nil)
     set.send(:url_for, options.merge(:only_path => true, :_path_segments => recall))
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index bec9eb16f3..add238fcb0 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -73,25 +73,16 @@ end
 
 class LegacyRouteSetTests < ActiveSupport::TestCase
   include RoutingTestHelpers
+  include ActionDispatch::RoutingVerbs
 
   attr_reader :rs
+  alias :routes :rs
 
   def setup
     @rs       = ::ActionDispatch::Routing::RouteSet.new
     @response = nil
   end
 
-  def get(uri_or_host, path = nil, port = nil)
-    host = uri_or_host.host unless path
-    path ||= uri_or_host.path
-
-    params = {'PATH_INFO'      => path,
-              'REQUEST_METHOD' => 'GET',
-              'HTTP_HOST'      => host}
-
-    @rs.call(params)[2].join
-  end
-
   def test_regexp_precidence
     @rs.draw do
       match '/whois/:domain', :constraints => {
-- 
cgit v1.2.3