test/test_zena.rb in zena-0.15.2 vs test/test_zena.rb in zena-0.16.0

@@ -5,48 +5,48 @@
 # We use transactional fixtures with a single load for ALL tests (this is not the default rails implementation). Tests are now 5x-10x faster.
 module Zena
   module Test
 
     # functional tests
-    module TestController
-      include Zena::Use::Fixtures
-      include Zena::Use::TestHelper
+    # module TestController
+    #       include Zena::Use::Fixtures
+    #       include Zena::Use::TestHelper
+    #
+    #       def init_controller
+    #         $_test_site ||= 'zena'
+    #         @request    ||= ActionController::TestRequest.new
+    #         @response   ||= ActionController::TestResponse.new
+    #         @request.host = sites_host($_test_site)
+    #         @controller.instance_eval { @params = {}; @url = ActionController::UrlRewriter.new( @request, {} )}
+    #         @controller.instance_variable_set(:@response, @response)
+    #         @controller.send(:request=, @request)
+    #         @controller.instance_variable_set(:@session, @request.session)
+    #       end
+    #
+    #       def logout
+    #         reset_session
+    #       end
+    #
+    #       def session
+    #         @controller.send(:session)
+    #       end
+    #
+    #       def flash
+    #         session['flash']
+    #       end
+    #
+    #       def err(obj)
+    #         obj.errors.each_error do |er,msg|
+    #           puts "[#{er}] #{msg}"
+    #         end
+    #       end
+    #
+    #       def method_missing(meth,*args, &block)
+    #         @controller.send(meth, *args, &block)
+    #       end
+    #     end
 
-      def init_controller
-        $_test_site ||= 'zena'
-        @request    ||= ActionController::TestRequest.new
-        @response   ||= ActionController::TestResponse.new
-        @request.host = sites_host($_test_site)
-        @controller.instance_eval { @params = {}; @url = ActionController::UrlRewriter.new( @request, {} )}
-        @controller.instance_variable_set(:@response, @response)
-        @controller.send(:request=, @request)
-        @controller.instance_variable_set(:@session, @request.session)
-      end
-
-      def logout
-        reset_session
-      end
-
-      def session
-        @controller.send(:session)
-      end
-
-      def flash
-        session['flash']
-      end
-
-      def err(obj)
-        obj.errors.each_error do |er,msg|
-          puts "[#{er}] #{msg}"
-        end
-      end
-
-      def method_missing(meth,*args, &block)
-        @controller.send(meth, *args, &block)
-      end
-    end
-
     module Integration
       include Zena::Acts::Secure
     end
 
     module HelperSetup
@@ -130,9 +130,9 @@
   attr_accessor :visitor
   include Zena::Test::TestHelper
 end
 
 class ZenaTestController < ActionController::TestCase
-  include Zena::Test::TestController
+  #include Zena::Test::TestController
 end
 
 NodeQuery.insert_zero_link(Link)
\ No newline at end of file