Fingertips-on-test-spec 0.1.2 → 0.2.0

data/VERSION.yml

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

data/lib/test/spec/rails.rb

@@ -1,36 +1,84 @@
 require 'test/spec'
 
+require 'active_support/test_case'
+
+require 'active_record'
+require 'active_record/test_case'
+
+require 'action_controller'
+require 'action_controller/test_case'
+
+require 'action_view'
+require 'action_view/test_case'
+
+%w(test_spec_ext spec_responder expectations).each { |lib| require "test/spec/rails/#{lib}" }
+Dir[File.dirname(__FILE__) + '/rails/**/*_helpers.rb'].each { |lib| require lib }
+
 module Test
   module Spec
     module Rails
-      module Assertions
-        include ActiveSupport::Testing::Assertions
-        include ActionController::TestCase::Assertions
+      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)
+        [name, class_to_test, superclass]
+      end
+      
+      def self.test_case_for_class(klass)
+        if klass
+          if klass.ancestors.include?(ActiveRecord::Base)
+            ActiveRecord::TestCase
+          elsif klass.ancestors.include?(ActionController::Base)
+            ActionController::TestCase
+          elsif !klass.is_a?(Class) && klass.to_s.ends_with?('Helper')
+            ActionView::TestCase
+          end
+        end || ActiveSupport::TestCase
       end
-    end
-    
-    class Should
-      include Rails::Assertions
-    end
-    
-    class ShouldNot
-      include Rails::Assertions
     end
   end
 end
 
-%w(test_spec_ext spec_responder expectations).each { |lib| require "test/spec/rails/#{lib}" }
-Dir[File.dirname(__FILE__) + '/rails/**/*_helpers.rb'].each { |lib| require lib }
-
 module Kernel
   alias :context_before_on_test_spec :context
   alias :xcontext_before_on_test_spec :xcontext
   
-  def context(name, superclass=ActiveSupport::TestCase, klass=Test::Spec::TestCase, &block)
-    context_before_on_test_spec(name, superclass, klass, &block)
+  # Creates a new test case.
+  #
+  # The description of the test case, can consist from strings and/or the class
+  # that's to be tested.
+  #
+  # If the class inherits from ActiveRecord::Base, ActiveRecord::TestCase will
+  # be used as the test case superclass. In the case of a class which inherits
+  # from ActionController::Base, ActionController::TestCase will be used. And
+  # when given a module which name ends with “Helper”, ActionView::TestCase
+  # will be used. In the latter two cases, the test case will be setup for the
+  # class that's to be tested.
+  #
+  # In all other cases the test case superclass will be ActiveSupport::TestCase.
+  #
+  # Examples:
+  #
+  #   describe Member do # "Member"
+  #     ...
+  #   end
+  #
+  #   describe 'On a', MembersController do # "On a MembersController"
+  #     ...
+  #   end
+  #
+  #   describe 'The', MembersHelper, ', concerning dates' do # "The MembersHelper, concerning dates"
+  #     ...
+  #   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) }
+    spec.testcase.class_eval(&block)
+    spec
   end
   
-  def xcontext(name, superclass=ActiveSupport::TestCase, &block)
+  def xcontext(*args, &block)
+    name, _, superclass = Test::Spec::Rails.extract_test_case_args(args)
     xcontext_before_on_test_spec(name, superclass, &block)
   end
   

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

@@ -8,4 +8,4 @@ module Test
   end
 end
 
-ActiveSupport::TestCase.send(:include, Test::Spec::Rails::RequestHelpers)
+ActionController::TestCase.send(:include, Test::Spec::Rails::RequestHelpers)

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

@@ -39,4 +39,4 @@ module Test
   end
 end
 
-ActiveSupport::TestCase.send(:include, Test::Spec::Rails::ResponseHelpers)
+ActionController::TestCase.send(:include, Test::Spec::Rails::ResponseHelpers)

data/on-test-spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{on-test-spec}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   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-08-24}
+  s.date = %q{2009-09-11}
   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 = [
@@ -21,11 +21,10 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README",
      "Rakefile",
-     "VERSION",
+     "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",
@@ -36,23 +35,26 @@ Gem::Specification.new do |s|
      "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"
   ]
-  s.has_rdoc = true
   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.2}
+  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"
   ]

data/test/add_allow_switch_test.rb

@@ -1,9 +1,5 @@
-require 'rubygems' rescue LoadError
-
-require 'test/spec'
-require 'mocha'
-
-require File.expand_path('../../lib/test/spec/add_allow_switch', __FILE__)
+require File.expand_path('../test_helper', __FILE__)
+require 'test/spec/add_allow_switch'
 
 module Factory
   def self.run

data/test/controller_helpers_test.rb

@@ -0,0 +1,29 @@
+require File.expand_path('../test_helper', __FILE__)
+require 'test/spec/rails/request_helpers'
+require 'test/spec/rails/response_helpers'
+
+class ActionControllerClass < ActionController::Base; end
+
+describe ActionControllerClass, "response helpers for a controller test" do
+  it "should map #status to the response status" do
+    expects(:assert_response).with(:success, 'the message')
+    status.should.be :success, 'the message'
+  end
+  
+  it "should map #template to the response template" do
+    expects(:assert_template).with('show', 'the message')
+    template.should.be 'show', 'the message'
+  end
+  
+  it "should map #layout to the response layout" do
+    @response.stubs(:layout).returns('layouts/application')
+    expects(:assert_equal).with('application', 'application', 'the message')
+    layout.should.be 'application', 'the message'
+  end
+end
+
+describe ActionControllerClass, "request helpers for a controller test" do
+  it "should make @request available as an accessor" do
+    request.should.be @request
+  end
+end

data/test/expectations_test.rb

@@ -1,11 +1,5 @@
-require 'rubygems' rescue LoadError
-require 'test/spec'
-require 'mocha'
-
-require 'active_support'
-require 'active_support/testing/assertions'
-
-require File.expand_path('../../lib/test/spec/rails/expectations', __FILE__)
+require File.expand_path('../test_helper', __FILE__)
+require 'test/spec/rails'
 
 module TestingAssertionsThemselves
   class << self

data/test/rails_test.rb

@@ -0,0 +1,100 @@
+require File.expand_path("../test_helper", __FILE__)
+require "test/spec/rails"
+
+class RegularClass; end
+class ActiveRecordModel < ActiveRecord::Base; end
+class ActionControllerClass < ActionController::Base; end
+module ViewModuleHelper; end
+
+CLASS_TO_TESTCASE_MAPPINGS = {
+  RegularClass          => ActiveSupport::TestCase,
+  ActiveRecordModel     => ActiveRecord::TestCase,
+  ActionControllerClass => ActionController::TestCase,
+  ViewModuleHelper      => ActionView::TestCase
+}
+
+describe "A test case with a traditional, string only, description" do
+  test_case = self
+  
+  it "should inherit from ActiveSupport::TestCase" do
+    test_case.superclass.should.be ActiveSupport::TestCase
+  end
+  
+  it "should have the description given" do
+    test_case.name.should ==
+      "A test case with a traditional, string only, description"
+  end
+end
+
+describe "A test case for an", ActionControllerClass do
+  test_case = self
+  
+  it "should have the class assigned as the class to test" do
+    test_case.controller_class.should.be ActionControllerClass
+    @controller.should.be.instance_of ActionControllerClass
+  end
+end
+
+describe "A test case for a", ViewModuleHelper do
+  test_case = self
+  
+  it "should have the module assigned as the module to test" do
+    test_case.helper_class.should.be ViewModuleHelper
+    test_case.ancestors.should.include ViewModuleHelper
+  end
+end
+
+CLASS_TO_TESTCASE_MAPPINGS.each do |test_class, expected_test_case|
+
+  describe test_class do
+    test_case = self
+
+    it "should inherit from #{expected_test_case}" do
+      test_case.superclass.should.be expected_test_case
+    end
+
+    it "should use the model class name as the description" do
+      test_case.name.should == test_class.to_s
+    end
+  end
+
+  describe "A test case with prepended description for", test_class do
+    test_case = self
+
+    it "should inherit from #{expected_test_case}" do
+      test_case.superclass.should.be expected_test_case
+    end
+
+    it "should have appended the model class name to the description" do
+      test_case.name.should ==
+        "A test case with prepended description for #{test_class}"
+    end
+  end
+
+  describe test_class, "test case with a model class and an appended description" do
+    test_case = self
+
+    it "should inherit from #{expected_test_case}" do
+      test_case.superclass.should.be expected_test_case
+    end
+
+    it "should have prepended the model class name to the description" do
+      test_case.name.should ==
+        "#{test_class} test case with a model class and an appended description"
+    end
+  end
+
+  describe "An", test_class, "test case with a model class and a prepended _and_ appended description" do
+    test_case = self
+
+    it "should inherit from #{expected_test_case}" do
+      test_case.superclass.should.be expected_test_case
+    end
+
+    it "should have inserted the model class name in the middle of the description" do
+      test_case.name.should ==
+        "An #{test_class} test case with a model class and a prepended _and_ appended description"
+    end
+  end
+
+end

data/test/share_test.rb

@@ -1,7 +1,5 @@
-require 'rubygems' rescue LoadError
-require 'test/spec'
-
-require File.expand_path('../../lib/test/spec/share', __FILE__)
+require File.expand_path('../test_helper', __FILE__)
+require 'test/spec/share'
 
 class DummyMock
   extend SharedSpecsInclusionHelper

data/test/test_helper.rb

@@ -2,7 +2,5 @@ require 'rubygems' rescue LoadError
 require 'test/spec'
 require 'mocha'
 
-require 'active_support'
-require 'active_support/test_case'
-
-$:.unshift(File.expand_path('../../lib', __FILE__))
+$:.unshift(File.expand_path('../../lib', __FILE__))
+require 'test/spec/rails'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Fingertips-on-test-spec
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Manfred Stienstra
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-24 00:00:00 -07:00
+date: 2009-09-11 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -29,11 +29,10 @@ files:
 - LICENSE
 - README
 - Rakefile
-- VERSION
+- 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
@@ -44,12 +43,14 @@ files:
 - 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
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/Fingertips/on-test-spec
 licenses: 
 post_install_message: 
@@ -78,8 +79,10 @@ specification_version: 3
 summary: Rails plugin to make testing Rails on test/spec easier.
 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

data/VERSION

@@ -1 +0,0 @@
-0.1.2

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

@@ -1,40 +0,0 @@
-require 'action_controller/test_case'
-
-module Test
-  module Spec
-    module Rails
-      module Controller
-        module ClassMethods
-          # Sets up the test environment before every functional test
-          def tests(controller_class)
-            setups << lambda { setup_request_environment(controller_class) }
-          end
-        end
-        module InstanceMethods
-          include ActionController::TestProcess
-          include ActionController::TestCase::Assertions
-          
-          attr_reader :controller
-          
-          # Sets up the test environment for functional tests
-          def setup_request_environment(controller_class)
-            controller_class.class_eval do
-              def rescue_action(e)
-                raise e
-              end
-            end
-            @controller = controller_class.new
-            @controller.request = @request = ActionController::TestRequest.new
-            @response = ActionController::TestResponse.new
-            
-            @controller.params = {}
-            @controller.send(:initialize_current_url)
-          end
-        end
-      end
-    end
-  end
-end
-
-ActiveSupport::TestCase.send(:extend, Test::Spec::Rails::Controller::ClassMethods)
-ActiveSupport::TestCase.send(:include, Test::Spec::Rails::Controller::InstanceMethods)