Fingertips-on-test-spec 0.2.2 → 0.2.3

data/.gitignore

@@ -0,0 +1 @@
+pkg/

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:major: 0
 :minor: 2
-:patch: 2
+:patch: 3
+:major: 0

data/dot.autotest

@@ -0,0 +1,93 @@
+Autotest.add_hook :initialize do |at|
+  at.unit_diff = 'cat'
+  at.failed_results_re = /^\s+\d+\) (?:Failure|Error):\n(.*?)\((.*?)\)\n\[([^:]*):.*\]/
+  
+  at.add_exception %r%^\./(?:db|doc|log|public|script|tmp|vendor|data|content|config)%
+  at.add_exception %r%\.svn%
+  
+  at.clear_mappings
+  
+  # Add your custom mappings:
+  #
+  # at.add_mapping %r%^app/(concerns)/(.*)\.rb$% do |_, match|
+  #   "test/unit/#{match[1]}/#{match[2]}_test.rb"
+  # end
+  # 
+  # at.add_mapping %r%^test/unit/(concerns)/.*rb$% do |filename, _|
+  #   filename
+  # end
+  # 
+  # at.add_mapping %r%^lib/(.*).rb% do |_, match|
+  #   sqwat = match[1].gsub('/', '_')
+  #   "test/lib/#{sqwat}_test.rb"
+  # end
+  # 
+  # at.add_mapping %r%^test/lib/.*rb$% do |filename, _|
+  #   filename
+  # end
+  
+  # Standard Rails
+  
+  at.add_mapping %r%^test/fixtures/(.*)s.yml% do |_, m|
+    ["test/unit/#{m[1]}_test.rb",
+     "test/controllers/#{m[1]}_controller_test.rb",
+     "test/views/#{m[1]}_view_test.rb",
+     "test/functional/#{m[1]}_controller_test.rb"]
+  end
+  
+  at.add_mapping %r%^test/(unit|integration|controllers|views|functional|helpers)/.*rb$% do |filename, _|
+    filename
+  end
+  
+  at.add_mapping %r%^app/models/(.*)\.rb$% do |_, m|
+    "test/unit/#{m[1]}_test.rb"
+  end
+  
+  at.add_mapping %r%^app/helpers/application_helper.rb% do
+    ["test/helpers/applications_helper_test.rb"] + at.files_matching(%r%^test/(views|functional)/.*_test\.rb$%)
+  end
+  
+  at.add_mapping %r%^app/helpers/(.*)_helper.rb% do |_, m|
+    if m[1] == "application" then
+      at.files_matching %r%^test/(views|functional)/.*_test\.rb$%
+    else
+      ["test/helpers/#{m[1]}_helper_test.rb",
+       "test/views/#{m[1]}_view_test.rb",
+       "test/functional/#{m[1]}_controller_test.rb"]
+    end
+  end
+  
+  at.add_mapping %r%^app/views/(.*)/% do |_, m|
+    ["test/views/#{m[1]}_view_test.rb",
+     "test/functional/#{m[1]}_controller_test.rb"]
+  end
+  
+  at.add_mapping %r%^app/controllers/(.*)\.rb$% do |_, m|
+    if m[1] == "application" then
+      at.files_matching %r%^test/(controllers|views|functional)/.*_test\.rb$%
+    else
+      ["test/controllers/#{m[1]}_test.rb",
+       "test/functional/#{m[1]}_test.rb"]
+    end
+  end
+  
+  at.add_mapping %r%^app/views/layouts/% do
+    "test/views/layouts_view_test.rb"
+  end
+  
+  at.add_mapping %r%^config/routes.rb$% do
+    at.files_matching %r%^test/(controllers|views|functional)/.*_test\.rb$%
+  end
+  
+  at.add_mapping %r%^test/test_helper.rb|config/((boot|environment(s/test)?).rb|database.yml)% do
+    at.files_matching %r%^test/(unit|controllers|views|functional)/.*_test\.rb$%
+  end
+  
+  class << at
+    def consolidate_failures(failed)
+      failed.inject(new_hash_of_arrays) do |filters, (method, klass, filename)|
+        filters[File.expand_path(filename)] << method; filters
+      end
+    end
+  end
+end

data/lib/test/spec/rails/expectations.rb

@@ -8,8 +8,6 @@ module Test
       end
       
       module ShouldExpectations
-        include ActiveSupport::Testing::Assertions
-        
         # Test that we were redirected somewhere:
         #   should.redirect
         #
@@ -19,9 +17,9 @@ module Test
         #   should.redirect_to :controller => 'foo', :action => 'bar', :secure => true
         def redirect(*args)
           if args.empty?
-            assert_response @object.response.redirected_to, :redirect
+            test_case.assert_response @object.response.redirected_to, :redirect
           elsif args.length == 1 and args.first.is_a?(String)
-            assert_equal args.first, @object.response.redirected_to
+            test_case.assert_equal args.first, @object.response.redirected_to
           else
             options = args.extract_options!
             if secure = options.delete(:secure)
@@ -30,11 +28,11 @@ module Test
               end
             end
             
-            @object.instance_eval { assert_redirected_to *args }
+            @object.instance_eval { test_case.assert_redirected_to *args }
             if secure == true
-              assert @object.response.redirected_to.starts_with?('https:')
+              test_case.assert @object.response.redirected_to.starts_with?('https:')
             elsif secure == false
-              assert @object.response.redirected_to.starts_with?('http:')
+              test_case.assert @object.response.redirected_to.starts_with?('http:')
             end
           end
         end
@@ -57,7 +55,7 @@ module Test
         
         # Test that the object is valid
         def validate
-          assert_valid @object
+          test_case.assert_valid @object
         end
         
         # Tests whether the evaluation of the expression changes.
@@ -79,7 +77,7 @@ module Test
           expected.in_groups_of(2).each_with_index do |(expression, difference), index|
             difference = 1 if difference.nil?
             error = "#{expression.inspect} didn't change by #{difference}"
-            assert_equal(before[index] + difference, eval(expression, block_binding), error)
+            test_case.assert_equal(before[index] + difference, eval(expression, block_binding), error)
           end
           
           block_result
@@ -100,12 +98,12 @@ module Test
           files = Dir.glob("#{cache_dir}/**/*").map do |filename|
             filename[cache_dir.length..-1]
           end
-          assert pages.all? { |page| files.include?(page) }
+          test_case.assert pages.all? { |page| files.include?(page) }
         end
         
         # Test two HTML strings for equivalency (e.g., identical up to reordering of attributes)
         def dom_equal(expected)
-          assert_dom_equal expected, @object
+          test_case.assert_dom_equal expected, @object
         end
         
         # Tests if the array of records is the same, order may vary
@@ -115,7 +113,7 @@ module Test
           left = @object.map(&:id).sort
           right = expected.map(&:id).sort
           
-          assert(left == right, message)
+          test_case.assert(left == right, message)
         end
         
         # Tests if the array of records is the same, order must be the same
@@ -125,16 +123,14 @@ module Test
           left = @object.map(&:id)
           right = expected.map(&:id)
           
-          assert(left == right, message)
+          test_case.assert(left == right, message)
         end
       end
       
       module ShouldNotExpectations
-        include ActiveSupport::Testing::Assertions
-        
         # Test that an object is not valid
         def validate
-          assert !@object.valid?
+          test_case.assert !@object.valid?
         end
         
         # Tests that the evaluation of the expression shouldn't change
@@ -155,7 +151,7 @@ module Test
           expected.each_with_index do |expression, index|
             difference = eval(expression, block_binding) - before[index]
             error = "#{expression.inspect} changed by #{difference}, expected no change"
-            assert_equal(0, difference, error)
+            test_case.assert_equal(0, difference, error)
           end
           
           block_result
@@ -165,7 +161,7 @@ module Test
         
         # Test that two HTML strings are not equivalent
         def dom_equal(expected)
-          assert_dom_not_equal expected, @object
+          test_case.assert_dom_not_equal expected, @object
         end
         
         # Tests if the array of records is not the same, order may vary
@@ -175,7 +171,7 @@ module Test
           left = @object.map(&:id).sort
           right = expected.map(&:id).sort
           
-          assert(left != right, message)
+          test_case.assert(left != right, message)
         end
         
         # Tests if the array of records is not the same, order may vary
@@ -185,7 +181,7 @@ module Test
           left = @object.map(&:id)
           right = expected.map(&:id)
           
-          assert(left != right, message)
+          test_case.assert(left != right, message)
         end
       end
     end

data/lib/test/spec/rails/test_spec_ext.rb

@@ -21,3 +21,17 @@ class Test::Spec::ShouldNot
     @object.respond_to?(:should_not_equal) ? @object.should_not_equal(*args) : _test_spec_be(*args)
   end
 end
+
+module Test
+  module Spec
+    module ExpectationExt
+      # Returns the current test case instance. Use this to call assert methods on.
+      def test_case
+        $TEST_SPEC_TESTCASE
+      end
+    end
+    
+    Should.send(:include, ExpectationExt)
+    ShouldNot.send(:include, ExpectationExt)
+  end
+end

data/on-test-spec.gemspec

@@ -0,0 +1,74 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{on-test-spec}
+  s.version = "0.2.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Manfred Stienstra", "Eloy Duran", "Cristi Balan"]
+  s.date = %q{2009-09-24}
+  s.description = %q{Rails plugin to make testing Rails on test/spec easier.}
+  s.email = %q{eloy.de.enige@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE",
+     "README",
+     "Rakefile",
+     "VERSION.yml",
+     "dot.autotest",
+     "lib/test/spec/add_allow_switch.rb",
+     "lib/test/spec/rails.rb",
+     "lib/test/spec/rails/controller_helpers.rb",
+     "lib/test/spec/rails/expectations.rb",
+     "lib/test/spec/rails/macros.rb",
+     "lib/test/spec/rails/macros/authorization.rb",
+     "lib/test/spec/rails/request_helpers.rb",
+     "lib/test/spec/rails/response_helpers.rb",
+     "lib/test/spec/rails/spec_responder.rb",
+     "lib/test/spec/rails/test_spec_ext.rb",
+     "lib/test/spec/share.rb",
+     "on-test-spec.gemspec",
+     "test/add_allow_switch_test.rb",
+     "test/controller_helpers_test.rb",
+     "test/expectations_test.rb",
+     "test/macros/authorization_test.rb",
+     "test/macros/base_test.rb",
+     "test/rails_test.rb",
+     "test/share_test.rb",
+     "test/test_helper.rb",
+     "test/test_spec_ext_test.rb"
+  ]
+  s.homepage = %q{http://github.com/Fingertips/on-test-spec}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Rails plugin to make testing Rails on test/spec easier.}
+  s.test_files = [
+    "test/add_allow_switch_test.rb",
+     "test/controller_helpers_test.rb",
+     "test/expectations_test.rb",
+     "test/macros/authorization_test.rb",
+     "test/macros/base_test.rb",
+     "test/rails_test.rb",
+     "test/share_test.rb",
+     "test/test_helper.rb",
+     "test/test_spec_ext_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/test/expectations_test.rb

@@ -3,29 +3,25 @@ require 'test/spec/rails'
 
 module TestingAssertionsThemselves
   class << self
+    def setup
+      $TEST_SPEC_TESTCASE = TestingAssertionsThemselves
+      TestingAssertionsThemselves.assertions = []
+    end
+    
     attr_accessor :assertions
+    
+    def assert(*args)
+      TestingAssertionsThemselves.assertions << [:assert, args]
+    end
+    
+    def assert_equal(*args)
+      TestingAssertionsThemselves.assertions << [:assert_equal, args]
+    end
+    
+    def last_assertion
+      TestingAssertionsThemselves.assertions.last
+    end
   end
-  @assertions = []
-  
-  def assert(*args)
-    TestingAssertionsThemselves.assertions << [:assert, args]
-  end
-  
-  def assert_equal(*args)
-    TestingAssertionsThemselves.assertions << [:assert_equal, args]
-  end
-  
-  def self.last_assertion
-    TestingAssertionsThemselves.assertions.last
-  end
-end
-
-class Test::Spec::Should
-  include TestingAssertionsThemselves
-end
-
-class Test::Spec::ShouldNot
-  include TestingAssertionsThemselves
 end
 
 module AssertionAssertions
@@ -73,7 +69,7 @@ describe "Differ expectations" do
   attr_accessor :controller
   
   before do
-    TestingAssertionsThemselves.assertions = []
+    TestingAssertionsThemselves.setup
   end
   
   it "should succeed when the expected difference occurs on a local variable" do
@@ -186,7 +182,7 @@ describe "NotDiffer expectations" do
   attr_accessor :controller
   
   before do
-    TestingAssertionsThemselves.assertions = []
+    TestingAssertionsThemselves.setup
   end
   
   it "should succeed when no difference occurs on a local variable" do
@@ -279,7 +275,7 @@ describe "Record expectations" do
   attr_accessor :controller
   
   before do
-    TestingAssertionsThemselves.assertions = []
+    TestingAssertionsThemselves.setup
   end
   
   it "should succeed when equal_set assertions are correct" do
@@ -416,7 +412,7 @@ describe "Redirection expectations" do
   attr_accessor :controller
   
   before do
-    TestingAssertionsThemselves.assertions = []
+    TestingAssertionsThemselves.setup
     
     @controller = TestController.new
     @controller.stubs(:url_for).returns(@url)

data/test/macros/authorization_test.rb

@@ -86,7 +86,7 @@ describe "Macros::Authorization" do
     generator.should.is_a(Test::Spec::Rails::Macros::Authorization::TestGenerator)
     generator.test_case.should == @test_case
     generator.validation_method.should == :access_denied?
-    generator.message.should == 'Expected access to be denied'
+    generator.message.should == 'Expected access to be allowed'
     generator.expected.should == false
   end
   

data/test/test_spec_ext_test.rb

@@ -0,0 +1,26 @@
+require File.expand_path('../test_helper', __FILE__)
+
+module SomeIncludableAssertions
+  def assert_foo
+    assert true
+  end
+end
+
+ActionView::TestCase.send(:include, SomeIncludableAssertions)
+
+module SomeIncludableExpectations
+  def foo
+    test_case.assert_foo
+  end
+end
+
+Test::Spec::Should.send(:include, SomeIncludableExpectations)
+
+module AViewHelper
+end
+
+describe "Test::Spec::ExpectationExt, for", AViewHelper do
+  it "should call assert methods directly on the test case instance" do
+    lambda { Object.new.should.foo }.should.not.raise
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Fingertips-on-test-spec
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Manfred Stienstra
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 -07:00
+date: 2009-09-24 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,10 +25,12 @@ extra_rdoc_files:
 - LICENSE
 - README
 files: 
+- .gitignore
 - LICENSE
 - README
 - Rakefile
 - VERSION.yml
+- dot.autotest
 - lib/test/spec/add_allow_switch.rb
 - lib/test/spec/rails.rb
 - lib/test/spec/rails/controller_helpers.rb
@@ -40,6 +42,7 @@ files:
 - lib/test/spec/rails/spec_responder.rb
 - lib/test/spec/rails/test_spec_ext.rb
 - lib/test/spec/share.rb
+- on-test-spec.gemspec
 - test/add_allow_switch_test.rb
 - test/controller_helpers_test.rb
 - test/expectations_test.rb
@@ -48,7 +51,8 @@ files:
 - test/rails_test.rb
 - test/share_test.rb
 - test/test_helper.rb
-has_rdoc: true
+- test/test_spec_ext_test.rb
+has_rdoc: false
 homepage: http://github.com/Fingertips/on-test-spec
 licenses: 
 post_install_message: 
@@ -73,7 +77,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Rails plugin to make testing Rails on test/spec easier.
 test_files: 
 - test/add_allow_switch_test.rb
@@ -84,3 +88,4 @@ test_files:
 - test/rails_test.rb
 - test/share_test.rb
 - test/test_helper.rb
+- test/test_spec_ext_test.rb