on-test-spec 0.2.4 → 0.2.5

data/VERSION.yml

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

data/lib/test/spec/add_allow_switch.rb

@@ -11,9 +11,9 @@ class Class
       alias_method "original_#{method}", method
       
       eval %{
-        def #{method}(*args)
+        def #{method}(*args, &block)
           if allow_#{method}
-            original_#{method}(*args)
+            original_#{method}(*args, &block)
           else
             raise RuntimeError, "You're trying to call `#{method}' on `#{self}', which you probably don't want in a test."
           end
@@ -40,9 +40,9 @@ class Module
       alias_method "original_#{method}", method
       
       eval %{
-        def #{method}(*args)
+        def #{method}(*args, &block)
           if allow_#{method}
-            original_#{method}(*args)
+            original_#{method}(*args, &block)
           else
             raise RuntimeError, "You're trying to call `#{method}' on `#{self}', which you probably don't want in a test."
           end

data/lib/test/spec/rails.rb

@@ -18,9 +18,12 @@ module Test
   module Spec
     module Rails
       def self.extract_test_case_args(args)
-        name          = args.map { |a| a.to_s }.join(' ')
         class_to_test = args.find { |a| a.is_a?(Module) }
         superclass    = test_case_for_class(class_to_test)
+
+        args.delete(class_to_test) if superclass == class_to_test
+        name          = args.map { |a| a.to_s }.join(' ')
+
         [name, class_to_test, superclass]
       end
       
@@ -30,6 +33,8 @@ module Test
             ActiveRecord::TestCase
           elsif klass.ancestors.include?(ActionController::Base)
             ActionController::TestCase
+          elsif klass.ancestors.include?(ActiveSupport::TestCase)
+            klass
           elsif !klass.is_a?(Class) && klass.to_s.ends_with?('Helper')
             ActionView::TestCase
           end
@@ -55,6 +60,10 @@ module Kernel
   # will be used. In the latter two cases, the test case will be setup for the
   # class that's to be tested.
   #
+  # If the class inherits from ActiveSupport::TestCase, it will be used as both
+  # the class to be tested and as the test case superclass (this is how test-spec
+  # works without on-test-spec).
+  #
   # In all other cases the test case superclass will be ActiveSupport::TestCase.
   #
   # Examples:
@@ -70,6 +79,10 @@ module Kernel
   #   describe 'The', MembersHelper, ', concerning dates' do # "The MembersHelper, concerning dates"
   #     ...
   #   end
+  #
+  #   describe 'Creating an account and posting a comment', ActiveSupport::IntegrationTest do # Creating an account and posting a comment ActionController::IntegrationTest
+  #     ...
+  #   end
   def context(*args, &block)
     name, class_to_test, superclass = Test::Spec::Rails.extract_test_case_args(args)
     spec = context_before_on_test_spec(name, superclass) { tests class_to_test if respond_to?(:tests) }
@@ -86,4 +99,4 @@ module Kernel
   
   alias :describe :context
   alias :xdescribe :xcontext
-end
+end

data/on-test-spec.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{on-test-spec}
-  s.version = "0.2.3"
+  s.version = "0.2.5"
 
   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.date = %q{2010-05-27}
   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 = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/test/spec/rails/expectations.rb",
      "lib/test/spec/rails/macros.rb",
      "lib/test/spec/rails/macros/authorization.rb",
+     "lib/test/spec/rails/macros/response.rb",
      "lib/test/spec/rails/request_helpers.rb",
      "lib/test/spec/rails/response_helpers.rb",
      "lib/test/spec/rails/spec_responder.rb",
@@ -40,6 +41,7 @@ Gem::Specification.new do |s|
      "test/expectations_test.rb",
      "test/macros/authorization_test.rb",
      "test/macros/base_test.rb",
+     "test/macros/response_test.rb",
      "test/rails_test.rb",
      "test/share_test.rb",
      "test/test_helper.rb",
@@ -56,6 +58,7 @@ Gem::Specification.new do |s|
      "test/expectations_test.rb",
      "test/macros/authorization_test.rb",
      "test/macros/base_test.rb",
+     "test/macros/response_test.rb",
      "test/rails_test.rb",
      "test/share_test.rb",
      "test/test_helper.rb",
@@ -72,3 +75,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/test/add_allow_switch_test.rb

@@ -5,8 +5,13 @@ module Factory
   def self.run
     true
   end
+  
+  def self.ran(name, &block)
+    block.call("#{name} was run")
+  end
 end
 Factory.add_allow_switch :run, :default => true
+Factory.add_allow_switch :ran
 
 describe "Factory with an allow switch on run" do
   it "should alias the original method" do
@@ -31,13 +36,25 @@ describe "Factory with an allow switch on run" do
       Factory.run.should == true
     }.should.not.raise
   end
+  
+  it "should forward passed blocks and arguments" do
+    Factory.allow_ran = true
+    Factory.ran('Machine') do |name|
+      name + '!'
+    end.should == 'Machine was run!'
+  end
 end
 
 class Bunny
+  def hip(name, &block)
+    block.call("#{name} is hip")
+  end
+  
   def hop
     'Hop hop!'
   end
 end
+Bunny.add_allow_switch :hip
 Bunny.add_allow_switch :hop
 
 describe "Bunny with an allow switch on hop" do
@@ -67,9 +84,15 @@ describe "Bunny with an allow switch on hop" do
       @bunny.hop.should == 'Hop hop!'
     }.should.not.raise
   end
+  
+  it "should forward passed blocks and arguments" do
+    Bunny.allow_hip = true
+    @bunny.hip('Bunny') do |name|
+      name + '!'
+    end.should == 'Bunny is hip!'
+  end
 end
 
-
 Kernel.add_allow_switch :system
 
 describe "Kernel with an allow switch on system" do

data/test/rails_test.rb

@@ -4,6 +4,7 @@ require "test/spec/rails"
 class RegularClass; end
 class ActiveRecordModel < ActiveRecord::Base; end
 class ActionControllerClass < ActionController::Base; end
+class ActiveSupportTestCaseClass < ActiveSupport::TestCase; end
 module ViewModuleHelper; end
 
 CLASS_TO_TESTCASE_MAPPINGS = {
@@ -35,6 +36,20 @@ describe "A test case for an", ActionControllerClass do
   end
 end
 
+describe "A test case for an ActiveSupport::TestCase descendant", ActiveSupportTestCaseClass do
+  test_case = self
+
+  it "should have itself assigned as the class to test and as the superclass" do
+    test_case.ancestors.should.include ActiveSupportTestCaseClass
+    test_case.superclass.should.be ActiveSupportTestCaseClass
+  end
+
+  it "should not include itself in the description" do
+    test_case.name.should ==
+      "A test case for an ActiveSupport::TestCase descendant"
+  end
+end
+
 describe "A test case for a", ViewModuleHelper do
   test_case = self
   
@@ -97,4 +112,4 @@ CLASS_TO_TESTCASE_MAPPINGS.each do |test_class, expected_test_case|
     end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: on-test-spec
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Manfred Stienstra
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 +01:00
+date: 2010-05-27 00:00:00 +02:00
 default_executable: 
 dependencies: []