mosquito 0.1.3 → 0.1.4

data/CHANGELOG

@@ -1,3 +1,12 @@
+== 0.1.4 - The glass slipper release
+
+* Compatibility with Camping 2.0 (development version) and Camping 1.5
+* Fix that newer Rails assert_select wants to know content_type
+* Final solution to the fixture problems. We now setup and teardown properly.
+* Fixed a bug that would occur when using an absolute URL (with scheme and host) 
+  and query strings.
+* Do not use eval for running the application because it fumbles the backtrace
+
 == 0.1.3 - The little fairy release
 
 * You can use an absolute URL with scheme and all instead of path-only abbreviation
@@ -15,7 +24,8 @@
   * for querystrings
   * for postvars
   * and yes, for uploads too
-* On that note, added a Mosquito::MockUpload to quickly simulate an uploaded file. The file will be filled with random text, so roll your own if you need concrete file content.
+* On that note, added a Mosquito::MockUpload to quickly simulate an uploaded file. The file will be filled with random text,
+  so roll your own if you need concrete file content.
 * We are Camping 1.5 compatible
 * You can now do 'test "should do this"' and pass a block of assertions.
 * More tests for better coverage of mosquito.rb

data/Manifest.txt

@@ -18,3 +18,5 @@ test/test_blog.rb
 test/test_helpers.rb
 test/test_mock_request.rb
 test/test_mock_upload.rb
+test/test_fixtures.rb
+

data/Rakefile

@@ -1,4 +1,5 @@
 $: << 'lib'
+$:.reject! { |e| e.include? 'TextMate' }
 
 require 'rubygems'
 require 'hoe'
@@ -16,6 +17,10 @@ Hoe.new('Mosquito', Mosquito::VERSION) do |p|
   p.summary = "A Camping test library."
   p.changes = p.paragraphs_of('CHANGELOG', 0..1).join("\n\n")
   p.url = "http://mosquito.rubyforge.org"
+  p.remote_rdoc_dir = '' # Release to root on rubyforge
+  # We need that so that Hoe does not grab Camping's own distro tests
+  p.test_globs = ['test/test_*.rb']
+  p.rsync_args << ' --exclude=statsvn/'
   p.rdoc_pattern = /README|CHANGELOG|mosquito/
   p.clean_globs = ['**.log', 'coverage', 'coverage.data', 'test/test.log', 'email.txt']
   p.extra_deps = ['activerecord', 'activesupport', 'camping']
@@ -38,3 +43,22 @@ begin
   end
 rescue LoadError
 end
+
+require 'rake/testtask'
+
+
+multicamp_tasks = Dir.glob(File.dirname(__FILE__) + '/test/camping-dist/camping-*/lib').sort.map do | path |
+  distname = File.basename(File.dirname(path))
+  libs = path[(File.dirname(__FILE__) + '/').length..-1]
+  
+  desc "Run tests with #{distname}"
+  Rake::TestTask.new("test-with-#{distname}") do |t|
+    t.libs << "test" << libs
+    t.pattern = 'test/test_*.rb'
+    t.verbose = true
+  end
+  "test-with-#{distname}"
+end
+
+desc "Run with multiple Camping versions"
+task :multicamp => multicamp_tasks

data/lib/mosquito.rb

@@ -11,7 +11,7 @@ stringio
 ).each { |lib| require lib }
 
 module Mosquito
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
   
   # For various methods that need to generate random text
   def self.garbage(amount) #:nodoc:
@@ -23,6 +23,9 @@ module Mosquito
     str.join
   end
 
+  # URL escape on both Camping versions
+  def self.esc(t); Camping.escape(t.to_s) rescue Rack::Utils.escape(t.to_s); end
+  
   # Will be raised if you try to test for something Camping does not support.
   # Kind of a safeguard in the deep ocean of metaified Ruby goodness.
   class SageAdvice < RuntimeError; end
@@ -36,60 +39,44 @@ module Mosquito
   end
 
   def self.unstash #:nodoc:
-    x, @stashed = @stashed, nil; x
+    (x, @stashed = @stashed, nil).shift
+  end
+  
+  module Dusty
+    ##
+    # From Jay Fields.
+    #
+    # Allows tests to be specified as a block.
+    #
+    #   test "should do this and that" do
+    #     ...
+    #   end
+
+    def test(name, &block)
+      test_name = :"test_#{name.gsub(' ','_')}"
+      raise ArgumentError, "#{test_name} is already defined" if self.instance_methods.include? test_name.to_s
+      define_method test_name, &block
+    end
   end
 end
 
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ":memory:")
+returning(:adapter => 'sqlite3', :database => ":memory:") do | config |
+  ActiveRecord::Base.establish_connection config
+  ActiveRecord::Base.configurations['test'] = config.stringify_keys
+end
+
 ActiveRecord::Base.logger = Logger.new("test/test.log") rescue Logger.new("test.log")
 
 # This needs to be set relative to the file where the test comes from, NOT relative to the
 # mosquito itself
 Test::Unit::TestCase.fixture_path = "test/fixtures/"
 
-class Test::Unit::TestCase #:nodoc:
-  def create_fixtures(*table_names)
-    if block_given?
-      self.class.fixtures(*table_names) { |*anything| yield(*anything) }
-    else
-      self.class.fixtures(*table_names)
-    end
-  end
-  
-  def self.fixtures(*table_names)
-    if block_given?
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
-    else
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
-    end
-  end
-
-  ##
-  # From Jay Fields.
-  #
-  # Allows tests to be specified as a block.
-  #
-  #   test "should do this and that" do
-  #     ...
-  #   end
-  
-  def self.test(name, &block)
-    test_name = :"test_#{name.gsub(' ','_')}"
-    raise ArgumentError, "#{test_name} is already defined" if self.instance_methods.include? test_name.to_s
-    define_method test_name, &block
-  end
-
-  # Turn off transactional fixtures if you're working with MyISAM tables in MySQL
-  self.use_transactional_fixtures = true
-  # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david)
-  self.use_instantiated_fixtures  = false
-end
-
 # Mock request is used for composing the request body and headers
 class Mosquito::MockRequest
   # Should be a StringIO. However, you got some assignment methods that will
   # stuff it with encoded parameters for you
   attr_accessor :body
+  attr_reader :headers
   
   DEFAULT_HEADERS = {
     'SERVER_NAME' => 'test.host',
@@ -114,10 +101,11 @@ class Mosquito::MockRequest
     'HTTP_CONNECTION' => 'keep-alive',
     'REQUEST_METHOD' => 'GET',
   }
-
+  
+  
   def initialize
     @headers = DEFAULT_HEADERS.with_indifferent_access # :-)
-    @body = StringIO.new('hello Camping')
+    @body = StringIO.new('')
   end
   
   # Returns the hash of headers  
@@ -203,9 +191,27 @@ class Mosquito::MockRequest
      "msqto-" + Mosquito::garbage(16)
   end
   
+  # Return a hash that can be used as a Rack request
+  def to_rack_request
+    returning({}) do | inp |
+      inp.merge! @headers
+      inp.merge! 'rack.input' => @body, 
+        'rack.version' => [0,1], 
+        'rack.errors' => STDERR, 
+        'rack.url_scheme' => 'http',
+        'CONTENT_LENGTH' => @body.string.length.to_s # Rack throws an error when it does not proper clen
+    end
+  end
+  
+  # Return an array of Camping arguments
+  def to_camping_args
+    [@body, self]
+  end
+  
   private
+    
     # Quickly URL-escape something
-    def esc(t); Camping.escape(t.to_s);end
+    def esc(t); Mosquito.esc(t); end
   
     # Extracts an array of values from a deeply-nested hash
     def extract_values(hash_or_a)
@@ -243,7 +249,7 @@ class Mosquito::MockRequest
     def uploaded_file_segment(key, upload_io, boundary)
       <<-EOF
 --#{boundary}\r
-Content-Disposition: form-data; name="#{key}"; filename="#{Camping.escape(upload_io.original_filename)}"\r
+Content-Disposition: form-data; name="#{key}"; filename="#{Mosquito.esc(upload_io.original_filename)}"\r
 Content-Type: #{upload_io.content_type}\r
 Content-Length: #{upload_io.size}\r
 \r
@@ -365,11 +371,16 @@ module Mosquito::Proboscis #:nodoc:
 end
 
 module Camping
-
+  
+  # The basic Mosquito-wielding test case with some infrastructure
   class Test < Test::Unit::TestCase
-
-    def test_dummy; end #:nodoc
-
+    class << self; include Mosquito::Dusty; end
+    
+    def test_default; end #:nodoc
+    
+    # This is needed because Rails fixtures actually try to setup twice
+    def self.use_transactional_fixtures; false; end
+    
     # The reverse of the reverse of the reverse of assert(condition)
     def deny(condition, message='')
       assert !condition, message
@@ -408,11 +419,15 @@ module Camping
   class WebTest < Test
     
     # Gives you access to the instance variables assigned by the controller 
-    attr_reader :assigns
-    
-    def test_dummy; end #:nodoc
+    def assigns(key = nil)
+      @assigns ||= Camping::H.new
+      key ? @assigns[key] : @assigns
+    end
+        
+    def test_default; end #:nodoc
     
     def setup
+      super
       @class_name_abbr = self.class.name.gsub(/^Test/, '')
       @request = Mosquito::MockRequest.new
       @cookies, @response, @assigns = {}, {}, {}
@@ -424,29 +439,29 @@ module Camping
     end
 
     # Send a POST request to a URL. All requests except GET will allow
-    # setting verbatim URL-encoded parameters as the third argument instead
+    # setting verbatim request body as the third argument instead
     # of a hash.
     def post(url, post_vars={})
       send_request url, post_vars, 'POST'
     end
 
     # Send a DELETE request to a URL. All requests except GET will allow
-    # setting verbatim URL-encoded parameters as the third argument instead
+    # setting verbatim request body as the third argument instead
     # of a hash.
     def delete(url, vars={})
       send_request url, vars, 'DELETE'
     end
 
     # Send a PUT request to a URL. All requests except GET will allow
-    # setting verbatim URL-encoded parameters as the third argument instead
+    # setting verbatim request body as the third argument instead
     # of a hash.
     def put(url, vars={})
       send_request url, vars, 'PUT'
     end
 
-    # Send any request. We will try to guess what you meant - if there are uploads to be
+    # Send the request. We will try to guess what you meant - if there are uploads to be
     # processed it's not going to be a GET, that's for sure.
-    def send_request(url, post_vars, method)
+    def send_request(composite_url, post_vars, method)
       
       if method.to_s.downcase == "get"
         @request.query_string_params = post_vars
@@ -455,41 +470,56 @@ module Camping
       end
       
       # If there is some stuff in the URL to be used as a query string, why ignore it?
-      url, qs_from_url = url.split(/\?/)
-      
-      relativize_url!(url)
+      relative_url, qs_from_url = relativize_url(composite_url)
       
       @request.append_to_query_string(qs_from_url) if qs_from_url
       
       # We do allow the user to override that one
       @request['REQUEST_METHOD'] = method
       
+      # Make the Camping app route our request
       @request['SCRIPT_NAME'] = '/' + @class_name_abbr.downcase
-      @request['PATH_INFO'] = '/' + url
       
+      # PATH_INFO is used for internal routing by Camping. We have to always pass
+      # the leading slash
+      @request['PATH_INFO'] = ensure_one_leading_slash(relative_url)
+      
+      # We need to munge this because the PATH_INFO has changed
       @request['REQUEST_URI'] = [@request.SCRIPT_NAME, @request.PATH_INFO].join('').squeeze('/')
       unless @request['QUERY_STRING'].blank?
         @request['REQUEST_URI'] += ('?' + @request['QUERY_STRING']) 
       end
       
       if @cookies
-        @request['HTTP_COOKIE'] = @cookies.map {|k,v| "#{k}=#{Camping.escape(v)}" }.join('; ')
+        @request['HTTP_COOKIE'] = @cookies.map {|k,v| "#{k}=#{Mosquito.esc(v)}" }.join('; ')
       end
       
+      # Get the Camping app
+      app_module = Kernel.const_get(@class_name_abbr)
+      
       # Inject the proboscis if we haven't already done so
-      pr = Mosquito::Proboscis
-      eval("#{@class_name_abbr}.send(:include, pr) unless #{@class_name_abbr}.ancestors.include?(pr)")
+      app_module.send(:include, Mosquito::Proboscis) unless app_module.ancestors.include?(Mosquito::Proboscis)
+      
+      # Run the request. 
+      @response = if app_module.respond_to?(:run) # Camping < 2.0
+        app_module.run(*@request.to_camping_args)
+      else # Camping 2.0
+        app_module.call(@request.to_rack_request).pop # Serve a Rack::Response object
+      end
+        
+      # Add content_type accessor for Rails assert_select
+      eval("class << @response; def content_type; @headers['Content-Type']; end; end")
       
-      # Run the request
-      @response = eval("#{@class_name_abbr}.run @request.body, @request")
+      # Downgrade the disguised Mab into a string
+      @response.body = @response.body.to_s
       @assigns = Mosquito::unstash
       
       # We need to restore the cookies separately so that the app
       # restores our session on the next request. We retrieve cookies and
       # the session in their assigned form instead of parsing the headers and
       # doing a deserialization cycle 
-      @cookies = @assigns[:cookies] || H[{}]
-      @state = @assigns[:state] || H[{}]
+      @cookies = @assigns.cookies || H[{}]
+      @state = @assigns.state || H[{}]
       
       if @response.headers['X-Sendfile']
         @response.body = File.read(@response.headers['X-Sendfile'])
@@ -547,8 +577,13 @@ module Camping
     
     # Checks that Camping sent us a cookie to attach a session
     def assert_session_started
-      assert_not_nil @cookies["camping_sid"], 
-        "The session ID cookie was empty although session should have started"
+      if Camping.respond_to?(:call) # Camping 2.0 prefers cookie sessions
+        assert_not_nil @cookies["camping_hash"], 
+          "The session hash cookie was empty although session should have started"
+      else
+        assert_not_nil @cookies["camping_sid"], 
+          "The session ID cookie was empty although session should have started"
+      end
     end
     
     # The reverse of +assert_session_started+
@@ -558,26 +593,33 @@ module Camping
     end
     
     private
+      # Ensure that we have a URL with one leading slash
+      def ensure_one_leading_slash(url)
+        ['/', url.to_s].join.gsub(/^(\/+)/, '/')
+      end
+      
       def extract_redirection_url
-        loc = @response.headers['Location']
-        path_seg = @response.headers['Location'].path.gsub(%r!/#{@class_name_abbr.downcase}!, '')
+        # We parse once more because Camping 2 sends a String (Rack does not want a URI) and 1.5 sends URI
+        loc = URI.parse(@response.headers['Location'].to_s)
+        path_seg = loc.path.gsub(%r!/#{@class_name_abbr.downcase}!, '')
         loc.query ? (path_seg + "?" + loc.query).to_s : path_seg.to_s
       end
       
-      def relativize_url!(url)
-        return unless url =~ /^([a-z]+):\//
-        p = URI.parse(url)
-        unless p.host == @request.domain
+      def relativize_url(url)
+        parsed = URI.parse(url)
+        if !parsed.scheme.blank? && parsed.host != @request.domain
           raise ::Mosquito::NonLocalRequest, 
-          "You tried to callout to #{p} which is outside of the test domain"
+            "You tried to callout to '#{parsed}' which is outside of the test domain (#{@request.domain})"
         end
-        url.replace(p.path + (p.query.blank ? '' : "?#{p.query}"))
+        # Now remove the path
+        parsed.path.gsub!(/^\/#{@class_name_abbr.downcase}\//, '/')
+        [parsed.path, parsed.query]
       end
   end
   
   # Used to test the models - no infrastructure will be created for running the request
   class ModelTest < Test
-    def test_dummy; end #:nodoc
+    def test_default; end #:nodoc
   end
   
   # Deprecated but humane

data/public/bare.rb

@@ -1,5 +1,4 @@
 #!/usr/local/bin/ruby -rubygems
-require 'camping'
 
 Camping.goes :Bare
 

data/public/blog.rb

@@ -1,15 +1,19 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-gem 'camping', '>=1.4'
-require 'camping'
-require 'camping/session'
+begin
+  if Camping.respond_to?(:call) # Camping 2
+    require 'camping/ar/session'
+  else
+    require 'camping/session'
+  end
+end
   
 Camping.goes :Blog
 
-require File.dirname(__FILE__) + '/blog/models'
-require File.dirname(__FILE__) + '/blog/views'
-require File.dirname(__FILE__) + '/blog/controllers'
+$:.unshift File.dirname(__FILE__)
+require 'blog/models'
+require 'blog/views'
+require 'blog/controllers'
 
 Blog::Models.schema do
     create_table :blog_posts, :force => true do |t|

data/public/blog/controllers.rb

@@ -152,6 +152,10 @@ module Blog::Controllers
   end
 
   class Restafarian < R('/rest')
+    def get
+      return 'Called get'
+    end
+    
     def delete
       return "Called delete"
     end

data/public/blog/views.rb

@@ -17,6 +17,7 @@ module Blog::Views
   end
 
   def index
+    h1 "Welcome to the blog"
     if @posts.empty?
       p 'No posts found.'
       p { a 'Add', :href => R(Add) }

data/test/sage_advice_cases/parsing_arrays.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'camping'
-
 Camping.goes :ParsingArrays
 
 class ParsingArrays::Controllers::Klonk < ParsingArrays::Controllers::R('/')

data/test/test_bare.rb

@@ -1,3 +1,4 @@
+require File.dirname(__FILE__) + "/switcher"
 require File.dirname(__FILE__) + "/../lib/mosquito"
 require File.dirname(__FILE__) + "/../public/bare"
 
@@ -19,14 +20,14 @@ class TestBare < Camping::FunctionalTest
     assert_match_body %r!Charles!
   end
 
-  test "should get page with success" do
+  test "should get sample page with success" do
     get '/sample'
     assert_response :success
     assert_no_session
     assert_match_body %r!<p>A sample page</p>!
   end
 
-  def test_request_uri_preserves_query_vars
+  test "should place the passed query params in the querystring" do
     get '/sample', :somevar => 10
     assert_equal '/bare/sample?somevar=10', @request['REQUEST_URI']
   end
@@ -36,27 +37,47 @@ class TestBare < Camping::FunctionalTest
     assert_no_match_body /Rubber\s+Bubblegum\s+Burt Reynolds\s+Hippopotamus/
   end
 
+  test "should ensure single leading slash" do
+    assert_equal '/foo', self.send(:ensure_one_leading_slash, "foo")
+    assert_equal '/foo', self.send(:ensure_one_leading_slash, "//////foo")
+    assert_equal '/foo/bar', self.send(:ensure_one_leading_slash, "//////foo/bar")
+    assert_equal '/', self.send(:ensure_one_leading_slash, nil)
+  end
+  
   test "should return error" do
-    get '/error'
-    assert_response :error
+    if Camping.respond_to?(:call)
+      # Camping on Rack reraises the errors which are caught by Rack's exception displayer
+      assert_raise(RuntimeError) { get '/error' }
+    else
+      assert_nothing_raised { get '/error' }
+      assert_response :error
+    end
   end
 
   test "should return 404 error" do
     get '/error404'
     assert_response 404
   end
-
-  def test_assigning_verbatim_post_payload
+  
+  test "should be able to assign verbatim POST payload" do
     post '/sample', 'foo=bar&plain=flat'
     @request.body.rewind
     assert_equal 'foo=bar&plain=flat', @request.body.read
+    assert_equal( {"foo"=>"bar", "plain"=>"flat"}, @assigns.input)
   end
-
+  
   test "should redirect" do
     get '/redirect'
     assert_redirected_to '/faq'
   end
 
+  test "should coerce Mab in response to a String" do
+    assert_nothing_raised { get '/non-existing-something-something' }
+    assert_nothing_raised do
+      assert_kind_of String,  @response.body
+    end
+  end
+
   # test "should send file" do
   #   get '/file'
   #   assert_response :success

data/test/test_blog.rb

@@ -1,3 +1,4 @@
+require File.dirname(__FILE__) + "/switcher"
 require File.dirname(__FILE__) + "/../lib/mosquito"
 require File.dirname(__FILE__) + "/../public/blog"
 Blog.create
@@ -19,7 +20,7 @@ class TestBlog < Camping::FunctionalTest
     end
   end
 
-  def test_cookies
+  def test_cookies_should_be_stored_and_loaded
     get '/cookies'
     assert_cookie 'awesome_cookie', 'camping for good'
     assert_equal @state.awesome_data, 'camping for good'
@@ -27,7 +28,7 @@ class TestBlog < Camping::FunctionalTest
     assert_equal @state.awesome_data, 'camping for good'
   end
 
-  def test_cookies_persisted_across_requests_and_escaping_properly_handled
+  def test_cookies_should_be_persisted_across_requests_with_proper_escaping
     @cookies["asgård"] = 'Wøbble'
     get '/cookies'
     assert_equal 'asgård=W%C3%B8bble', @request['HTTP_COOKIE'], "The cookie val shouldbe escaped"
@@ -39,27 +40,25 @@ class TestBlog < Camping::FunctionalTest
     assert_equal 'Wøbble', @cookies["asgård"]
   end
 
-  def test_index
+  def test_get_without_arguments_should_just_call_the_app_index
     get
     assert_response :success
-    assert_match_body %r!>blog<!
+    assert_match_body /Welcome to the blog/
     assert_not_equal @state.awesome_data, 'camping for good'
-    assert_kind_of Array, @assigns[:posts]
-    assert_kind_of Post, assigns[:posts].first
   end
 
-  def test_view
+  def test_calling_view_should_fetch_view
     get '/view/1'
     assert_response :success
     assert_match_body %r!The quick fox jumped over the lazy dog!
   end
 
-  def test_styles
-    get 'styles.css'
+  def test_calling_styles_should_give_us_the_CSS
+    get '/styles.css'
     assert_match_body %r!Utopia!
   end
 
-  def test_edit_should_require_login
+  def test_calling_edit_should_render_login
     get '/edit/1'
     assert_response :success
     assert_match_body 'login'
@@ -139,7 +138,7 @@ class TestBlog < Camping::FunctionalTest
     assert_equal 'Called put', @response.body
   end
 
-  def calling_with_an_absolute_url_should_relativize
+  def test_calling_with_an_absolute_url_should_relativize
     assert_equal 'test.host', @request.domain
     put 'http://test.host/blog/rest'
     assert_nothing_raised do
@@ -147,11 +146,21 @@ class TestBlog < Camping::FunctionalTest
     end
   end
 
+  def test_calling_with_an_absolute_url_and_querystring_should_relativize_and_pass_parameters
+    assert_equal 'test.host', @request.domain
+    get 'http://test.host/blog/rest?one=2&foo=bar'
+    assert_nothing_raised do
+      assert_equal 'Called get', @response.body
+    end
+    assert_equal({"one"=>'2', "foo"=>"bar"}, @assigns.input)
+  end
+
   def test_calling_with_an_absolute_url_outside_of_the_default_test_host_must_raise
     assert_equal 'test.host', @request.domain
-    assert_raise(Mosquito::NonLocalRequest) do
-      put 'http://yahoo.com/blog/rest'
+    non_local = assert_raise(Mosquito::NonLocalRequest) do
+      get 'http://yahoo.com/blog/rest'
     end
+    assert_equal "You tried to callout to 'http://yahoo.com/blog/rest' which is outside of the test domain (test.host)", non_local.message
   end
 
   def test_calling_with_an_absolute_url_outside_of_the_custom_test_host_must_raise

data/test/test_fixtures.rb

@@ -0,0 +1,72 @@
+require File.dirname(__FILE__) + "/switcher"
+require File.dirname(__FILE__) + '/test_helpers'
+require File.dirname(__FILE__) + '/../public/blog'
+
+Blog.create
+include Blog::Models
+
+class SomeTest < Camping::Test
+  fixtures :blog_posts
+  def setup
+    super
+    @parent_done = true
+  end
+  
+  def test_setup_has_ran
+    assert_not_nil @parent_done, "This variable is set in setup"
+  end
+end
+
+module FixtureReloadingTests
+  def test_fixtures_reloaded_after_run_say_a
+    assert_equal 2, Post.count, "The test should start with 2 preloaded Posts"
+    Post.delete_all
+  end
+
+  def test_fixtures_reloaded_after_run_say_b
+    assert_equal 2, Post.count, "The test should start with 2 preloaded Posts"
+    Post.delete_all
+  end
+end
+
+class Sec < SomeTest; end
+class Third < SomeTest; end
+class Fourth < SomeTest
+  include FixtureReloadingTests
+end
+
+# This exploits something that Rails considers an edge case but what is essential for us
+# - inheriting test cases with setup that also use fixtures
+class FixturedTest < Camping::WebTest
+  def setup
+    super
+    @setup_in_parent = true
+  end
+end
+
+class InheritedFixturedTest < FixturedTest
+  fixtures :blog_posts
+  def setup
+    super
+    @setup_in_child = true
+  end
+end
+
+class ThirdInheritedFixturedTest < InheritedFixturedTest
+  def setup
+    super
+    @setup_in_third = true
+  end
+  include FixtureReloadingTests
+end
+
+class FourthInherited < ThirdInheritedFixturedTest
+  include FixtureReloadingTests
+  
+  def test_case_setup_properly
+    assert_not_nil @request, "The setup for Mosquito web test should have been done"
+    assert_not_nil @setup_in_parent, "The first setup in the chain should have happened"
+    assert_not_nil @setup_in_child, "The second setup in the chain should have happsened"
+    assert_not_nil @setup_in_third, "The third setup in the chain should have happened"
+  end
+end

data/test/test_helpers.rb

@@ -1,9 +1,10 @@
+require File.dirname(__FILE__) + "/switcher"
 require File.dirname(__FILE__) + "/../lib/mosquito"
 
 class TestHelpers < Camping::ModelTest
   # http://rubyforge.org/tracker/index.php?func=detail&aid=8921&group_id=351&atid=1416
   def test_supports_old_style_and_new_style_fixture_generation
-    assert self.respond_to?(:create_fixtures), "Oldstyle method should work"
+    assert !self.respond_to?(:create_fixtures), "Oldstyle method is removed"
     assert self.class.respond_to?(:fixtures), "Newstyle method should work"
   end
   

data/test/test_mock_request.rb

@@ -1,3 +1,4 @@
+require File.dirname(__FILE__) + "/switcher"
 require File.dirname(__FILE__) + "/../lib/mosquito"
 
 $KCODE = 'u'
@@ -39,6 +40,11 @@ class TestMockRequest < Test::Unit::TestCase
     assert_equal 'test.host', @req.to_hash['SERVER_NAME']
     assert_equal 'test.host', @req.to_hash['HTTP_HOST']
   end
+  
+  def test_headers_mirrors_to_hash
+    assert_respond_to @req, :headers
+    assert_equal @req.headers, @req.to_hash
+  end
 
   def test_envars_translate_to_readers
     %w( server_name path_info accept_encoding user_agent 
@@ -206,9 +212,9 @@ class TestMockRequest < Test::Unit::TestCase
     ]
 
     ref_segments.each_with_index do | ref, idx |
-      if ref == String
+      if ref === String
         assert_equal ref, output[idx], "The segment #{idx} should be #{ref}"
-      elsif ref == Regexp
+      elsif ref === Regexp
         assert_match ref, output[idx], "The segment #{idx} should match #{ref}"
       end
     end    
@@ -240,10 +246,13 @@ class TestMockRequestWithRoundtrip < Test::Unit::TestCase
 
     assert_equal "john", @parsed_input["name"]
     assert_kind_of Hash, @parsed_input["somefile"]
-    assert_equal "somefile", @parsed_input["somefile"]["name"]
-    assert_equal "pic.jpg", @parsed_input["somefile"]["filename"]
-    assert_equal "image/jpeg", @parsed_input["somefile"]["type"]
-    assert_kind_of Tempfile, @parsed_input["somefile"]["tempfile"]
+
+    ef = @parsed_input["somefile"].with_indifferent_access
+    
+    assert_equal "somefile", ef["name"]
+    assert_equal "pic.jpg", ef["filename"]
+    assert_equal "image/jpeg", ef["type"]
+    assert_kind_of Tempfile, ef["tempfile"]
     
     
     @req.post_params = {:hello => "welcome", :name => "john", :arrayed => [1, 2, 3], :somefile => "instead" }
@@ -280,11 +289,28 @@ class TestMockRequestWithRoundtrip < Test::Unit::TestCase
     ref = {"name"=>"john", "hello"=>"welæcome", "data"=>{"values"=>["1", "2", "3"]}}
     assert_equal ref, @parsed_input, "Camping should have parsed our input like so"
   end
+  
+  
+  def test_to_rack_request
+    @req.post_params = {:hello => "welæcome", :name => "john", :data => {:values => [1,2,3] } }
+    rack_r = @req.to_rack_request
+    
+    assert_kind_of Hash, rack_r
+    assert_equal "http", rack_r['rack.url_scheme']
+    assert_kind_of StringIO, rack_r['rack.input']
+    assert_equal [0,1], rack_r['rack.version']
+    assert_equal '74', rack_r['CONTENT_LENGTH']
+  end
+  
   private
     def run_request!
       @req.body.rewind
       begin
-        Sniffer.run(@req.body, @req.to_hash)
+        if Sniffer.respond_to?(:call)
+          Sniffer.call(@req.to_rack_request) 
+        else
+          Sniffer.run(@req.body, @req.to_hash)
+        end
       rescue Sniffer::Controllers::ParamPeeker::Messenger => e
         @parsed_input = e.packet
       end

data/test/test_mock_upload.rb

@@ -1,3 +1,4 @@
+require File.dirname(__FILE__) + "/switcher"
 require File.dirname(__FILE__) + "/../lib/mosquito"
 
 class TestMockUpload < Test::Unit::TestCase

metadata

@@ -1,106 +1,119 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: mosquito
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2007-09-24 00:00:00 -07:00
-summary: A Camping test library.
-require_paths: 
-- lib
-email: boss@topfunky.com
-homepage: http://mosquito.rubyforge.org
-rubyforge_project: mosquito
-description: A library for writing tests for your Camping app.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.1.4
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Geoffrey Grosenbach
-files: 
-- CHANGELOG
-- MIT-LICENSE
-- Manifest.txt
-- README.txt
-- Rakefile
-- lib/mosquito.rb
-- public/bare.rb
-- public/blog.rb
-- public/blog/controllers.rb
-- public/blog/models.rb
-- public/blog/views.rb
-- test/fixtures/blog_comments.yml
-- test/fixtures/blog_posts.yml
-- test/fixtures/blog_users.yml
-- test/sage_advice_cases/parsing_arrays.rb
-- test/test_bare.rb
-- test/test_blog.rb
-- test/test_helpers.rb
-- test/test_mock_request.rb
-- test/test_mock_upload.rb
-test_files: 
-- test/test_bare.rb
-- test/test_blog.rb
-- test/test_helpers.rb
-- test/test_mock_request.rb
-- test/test_mock_upload.rb
-rdoc_options: 
-- --main
-- README.txt
-extra_rdoc_files: 
-- Manifest.txt
-- README.txt
-executables: []
-
-extensions: []
-
-requirements: []
+autorequire: 
+bindir: bin
+cert_chain: []
 
+date: 2008-11-17 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: camping
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.8.2
     version: 
+description: A library for writing tests for your Camping app.
+email: boss@topfunky.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- Manifest.txt
+- README.txt
+files: 
+- CHANGELOG
+- MIT-LICENSE
+- Manifest.txt
+- README.txt
+- Rakefile
+- lib/mosquito.rb
+- public/bare.rb
+- public/blog.rb
+- public/blog/controllers.rb
+- public/blog/models.rb
+- public/blog/views.rb
+- test/fixtures/blog_comments.yml
+- test/fixtures/blog_posts.yml
+- test/fixtures/blog_users.yml
+- test/sage_advice_cases/parsing_arrays.rb
+- test/test_bare.rb
+- test/test_blog.rb
+- test/test_helpers.rb
+- test/test_mock_request.rb
+- test/test_mock_upload.rb
+- test/test_fixtures.rb
+has_rdoc: true
+homepage: http://mosquito.rubyforge.org
+post_install_message: 
+rdoc_options: 
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: mosquito
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: A Camping test library.
+test_files: 
+- test/test_bare.rb
+- test/test_blog.rb
+- test/test_fixtures.rb
+- test/test_helpers.rb
+- test/test_mock_request.rb
+- test/test_mock_upload.rb