Sign up
This repository

public / rails Octocat-spinner-32

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Remove controller assertions from Test::Unit::TestCase. Use ActionCon… 

…troller::TestCase.
  • Loading branch information...
commit d355921709c6b21af3710de6f7b61a5b9c39314e 1 parent 00f72cf
Jeremy Kemper authored

Showing 3 changed files with 58 additions and 71 deletions. Show Diff Stats Hide Diff Stats

  1. 69  actionpack/lib/action_controller/assertions.rb
  2. 59  actionpack/lib/action_controller/test_case.rb
  3. 1  actionpack/lib/action_controller/test_process.rb
69  actionpack/lib/action_controller/assertions.rb
View
... ... 
@@ -1,69 +0,0 @@
1   
-require 'test/unit/assertions'
2   
-
3   
-module ActionController #:nodoc:
4   
-  # In addition to these specific assertions, you also have easy access to various collections that the regular test/unit assertions
5   
-  # can be used against. These collections are:
6   
-  #
7   
-  # * assigns: Instance variables assigned in the action that are available for the view.
8   
-  # * session: Objects being saved in the session.
9   
-  # * flash: The flash objects currently in the session.
10   
-  # * cookies: Cookies being sent to the user on this request.
11   
-  #
12   
-  # These collections can be used just like any other hash:
13   
-  #
14   
-  #   assert_not_nil assigns(:person) # makes sure that a @person instance variable was set
15   
-  #   assert_equal "Dave", cookies[:name] # makes sure that a cookie called :name was set as "Dave"
16   
-  #   assert flash.empty? # makes sure that there's nothing in the flash
17   
-  #
18   
-  # For historic reasons, the assigns hash uses string-based keys. So assigns[:person] won't work, but assigns["person"] will. To
19   
-  # appease our yearning for symbols, though, an alternative accessor has been devised using a method call instead of index referencing.
20   
-  # So assigns(:person) will work just like assigns["person"], but again, assigns[:person] will not work.
21   
-  #
22   
-  # On top of the collections, you have the complete url that a given action redirected to available in redirect_to_url.
23   
-  #
24   
-  # For redirects within the same controller, you can even call follow_redirect and the redirect will be followed, triggering another
25   
-  # action call which can then be asserted against.
26   
-  #
27   
-  # == Manipulating the request collections
28   
-  #
29   
-  # The collections described above link to the response, so you can test if what the actions were expected to do happened. But
30   
-  # sometimes you also want to manipulate these collections in the incoming request. This is really only relevant for sessions
31   
-  # and cookies, though. For sessions, you just do:
32   
-  #
33   
-  #   @request.session[:key] = "value"
34   
-  #
35   
-  # For cookies, you need to manually create the cookie, like this:
36   
-  #
37   
-  #   @request.cookies["key"] = CGI::Cookie.new("key", "value")
38   
-  #
39   
-  # == Testing named routes
40   
-  #
41   
-  # If you're using named routes, they can be easily tested using the original named routes' methods straight in the test case.
42   
-  # Example:
43   
-  #
44   
-  #  assert_redirected_to page_url(:title => 'foo')
45   
-  module Assertions
46   
-    def self.included(klass)
47   
-      %w(response selector tag dom routing model).each do |kind|
48   
-        require "action_controller/assertions/#{kind}_assertions"
49   
-        klass.module_eval { include const_get("#{kind.camelize}Assertions") }
50   
-      end
51   
-    end
52   
-
53   
-    def clean_backtrace(&block)
54   
-      yield
55   
-    rescue Test::Unit::AssertionFailedError => error
56   
-      framework_path = Regexp.new(File.expand_path("#{File.dirname(__FILE__)}/assertions"))
57   
-      error.backtrace.reject! { |line| File.expand_path(line) =~ framework_path }
58   
-      raise
59   
-    end
60   
-  end
61   
-end
62   
-
63   
-module Test #:nodoc:
64   
-  module Unit #:nodoc:
65   
-    class TestCase #:nodoc:
66   
-      include ActionController::Assertions
67   
-    end
68   
-  end
69   
-end
59  actionpack/lib/action_controller/test_case.rb
View 
@@ -74,7 +74,56 @@ def inferred_controller_name
74 74 
   #   class SpecialEdgeCaseWidgetsControllerTest < ActionController::TestCase
75 75 
   #     tests WidgetController
76 76 
   #   end
  77 
+  #
  78 
+  # == Testing controller internals
  79 
+  #
  80 
+  # In addition to these specific assertions, you also have easy access to various collections that the regular test/unit assertions
  81 
+  # can be used against. These collections are:
  82 
+  #
  83 
+  # * assigns: Instance variables assigned in the action that are available for the view.
  84 
+  # * session: Objects being saved in the session.
  85 
+  # * flash: The flash objects currently in the session.
  86 
+  # * cookies: Cookies being sent to the user on this request.
  87 
+  #
  88 
+  # These collections can be used just like any other hash:
  89 
+  #
  90 
+  #   assert_not_nil assigns(:person) # makes sure that a @person instance variable was set
  91 
+  #   assert_equal "Dave", cookies[:name] # makes sure that a cookie called :name was set as "Dave"
  92 
+  #   assert flash.empty? # makes sure that there's nothing in the flash
  93 
+  #
  94 
+  # For historic reasons, the assigns hash uses string-based keys. So assigns[:person] won't work, but assigns["person"] will. To
  95 
+  # appease our yearning for symbols, though, an alternative accessor has been devised using a method call instead of index referencing.
  96 
+  # So assigns(:person) will work just like assigns["person"], but again, assigns[:person] will not work.
  97 
+  #
  98 
+  # On top of the collections, you have the complete url that a given action redirected to available in redirect_to_url.
  99 
+  #
  100 
+  # For redirects within the same controller, you can even call follow_redirect and the redirect will be followed, triggering another
  101 
+  # action call which can then be asserted against.
  102 
+  #
  103 
+  # == Manipulating the request collections
  104 
+  #
  105 
+  # The collections described above link to the response, so you can test if what the actions were expected to do happened. But
  106 
+  # sometimes you also want to manipulate these collections in the incoming request. This is really only relevant for sessions
  107 
+  # and cookies, though. For sessions, you just do:
  108 
+  #
  109 
+  #   @request.session[:key] = "value"
  110 
+  #
  111 
+  # For cookies, you need to manually create the cookie, like this:
  112 
+  #
  113 
+  #   @request.cookies["key"] = CGI::Cookie.new("key", "value")
  114 
+  #
  115 
+  # == Testing named routes
  116 
+  #
  117 
+  # If you're using named routes, they can be easily tested using the original named routes' methods straight in the test case.
  118 
+  # Example:
  119 
+  #
  120 
+  #  assert_redirected_to page_url(:title => 'foo')
77 121 
   class TestCase < ActiveSupport::TestCase
  122 
+    %w(response selector tag dom routing model).each do |kind|
  123 
+      require "action_controller/assertions/#{kind}_assertions"
  124 
+      include const_get("#{kind.camelize}Assertions")
  125 
+    end
  126 
+
78 127 
     # When the request.remote_addr remains the default for testing, which is 0.0.0.0, the exception is simply raised inline
79 128 
     # (bystepping the regular exception handling from rescue_action). If the request.remote_addr is anything else, the regular
80 129 
     # rescue_action process takes place. This means you can test your rescue_action code by setting remote_addr to something else
 
@@ -143,5 +192,13 @@ def setup_controller_request_and_response
143 192 
     def rescue_action_in_public!
144 193 
       @request.remote_addr = '208.77.188.166' # example.com
145 194 
     end
146   
- end
  195 
+
  196 
+    def clean_backtrace(&block)
  197 
+      yield
  198 
+    rescue Assertion => error
  199 
+      framework_path = Regexp.new(File.expand_path("#{File.dirname(__FILE__)}/assertions"))
  200 
+      error.backtrace.reject! { |line| File.expand_path(line) =~ framework_path }
  201 
+      raise
  202 
+    end
  203 
+  end
147 204 
 end
1  actionpack/lib/action_controller/test_process.rb
View
... ... 
@@ -1,4 +1,3 @@
1   
-require 'action_controller/assertions'
2 1 
 require 'action_controller/test_case'
3 2
4 3 
 module ActionController #:nodoc:

0 notes on commit d355921

Please sign in to comment.
Something went wrong with that request. Please try again.