@@ -10,5 +10,3 @@ Camping::S << SOURCE Camping::Apps.each do |app| eval(SOURCE.gsub("Camping", app.to_s)) end - -Test::Unit::TestCase.fixture_path = "test/fixtures/" if Test::Unit::TestCase.respond_to?(:fixture_path) \ No newline at end of file lib/camping/test.rb @@ -1,5 +1,6 @@ module Camping TestUtils = Object.const_get("Cam\ping").const_get(:TestUtils) unless defined?(TestUtils) + include TestUtils module Tests # Checks if models have been loaded @@ -49,10 +50,13 @@ module Camping end class Web < Test + attr_reader :state, :cookies include Assertions def setup super + @state = Camping::H.new + @cookies = Camping::H.new @app = C @app = Server::XSendfile.new(@app) @request = Rack::MockRequest.new(@app) @@ -62,6 +66,8 @@ module Camping method = method.to_s.upcase opts = FormBuilder.new(method, input).build path << "?#{opts[:query]}" if opts[:query] + opts[STATE] = @state + opts[COOKIES] = @cookies @response = @request.request(method, path, opts) @assigns = @response.original_headers.delete(ASSIGNS) @@ -92,6 +98,21 @@ module Camping end end - include TestUtils::AssignStealer + Base.class_eval do + service = Base.instance_method(:service) + define_method(:service) do |*a| + @cookies.update(@env[COOKIES]) + @state.update(@env[STATE]) if @state + begin + service.bind(self).call(*a) + ensure + @headers[ASSIGNS] = instance_variables.inject({}) do |assigns, ivar| + assigns[ivar[1..-1].to_sym] = instance_variable_get(ivar) + assigns + end + end + end + end + create if respond_to?(:create) end \ No newline at end of file lib/camping/test/base.rb @@ -1,19 +1,9 @@ # Camping::TestUtils contains various classes and modules needed by camping/test module Camping::TestUtils - ASSIGNS = "Camping.assigns" - Server = Camping::Server - - # A service overload which saves the cookies and sessions in the headers. - module AssignStealer - def service(*a) - super - ensure - @headers[ASSIGNS] = instance_variables.inject({}) do |assigns, ivar| - assigns[ivar[1..-1].to_sym] = instance_variable_get(ivar) - assigns - end - end - end + ASSIGNS = "camping.assigns" + COOKIES = "camping.cookies" + STATE = "camping.state" + Server = Camping::Server # Used for mocking file-uploads. You will probably use it through # the Tests::Web#upload helper. lib/camping/test/utils.rb fb44e9c98cc02eaca7c530a3396535b0682a6d9f Magnus Holm judofyr@gmail.com http://github.com/judofyr/camping-test/commit/d1974290e75a995c241574d5b13c471e2dca3c1e d1974290e75a995c241574d5b13c471e2dca3c1e 2009-05-07T07:43:40-07:00 2009-05-07T07:43:40-07:00 Allow setting @state and @cookies before requests 637f3ef901e124cfe6904f9d5021b23f2404147f Magnus Holm judofyr@gmail.com