testdependencies 0.1.0 → 0.2.0

data/README.rdoc

@@ -1,7 +1,8 @@
 = testdependencies
 
-This tiny tool adds explicit dependency declarations to 
-rails' #test method. more info: http://www.iam.unibe.ch/~scg/Research/JExample/
+Testdependencies adds explicit dependency declarations to 
+Rails #test method and Shouldas' toplevel #should method (Not working inside contexts).
+more about dependency declarative testing: http://www.iam.unibe.ch/~scg/Research/JExample/
 
     test "A test that depends on" => "dependency" do |value_of_dependency|
       assert something

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/adapters/plain.rb

@@ -0,0 +1,18 @@
+ActiveSupport::TestCase.module_eval do
+  class<<self
+    alias old_test test
+    def test(decl, &block)
+      unless String === decl
+        old_test decl.keys.first do
+          dep = decl.values.first
+          dep = "test_#{dep.gsub(/\s+/,'_')}".to_sym if String === dep
+          raise "Dependency undefined: #{dep}" unless respond_to?(dep)
+          result = send(dep) rescue false
+          instance_exec(*result, &block) if result
+        end
+      else
+        old_test decl, &block
+      end
+    end
+  end
+end

data/lib/adapters/shoulda.rb

@@ -0,0 +1,18 @@
+ActiveSupport::TestCase.module_eval do
+  class<<self
+    alias old_should should
+    def should(decl, &block)
+      unless String === decl
+        old_should decl.keys.first do
+          dep = decl.values.first
+          dep = "test: #{self.class.to_s.gsub('Test', '')} should #{dep}. ".to_sym if String === dep
+          raise "Dependency undefined: #{dep}" unless respond_to?(dep)
+          result = send(dep) rescue false
+          instance_exec(*result, &block) if result
+        end
+      else
+        old_should decl, &block
+      end
+    end
+  end
+end

data/lib/testdependencies.rb

@@ -1,22 +1,15 @@
+$:.unshift(File.dirname(__FILE__)) unless
+  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-ActiveSupport::TestCase.module_eval do
-  class<<self
-    unless defined?(ActiveSupport)
-      raise "testdependencies must be required *after* rails/activesupport has been loaded" 
-    end
-    alias old_test test
-    def test(decl, &block)
-      unless String === decl
-        old_test decl.keys.first do
-          dep = decl.values.first
-          dep = "test_#{dep.gsub(/\s+/,'_')}".to_sym if String === dep
-          raise "Dependency undefined: #{dep}" unless respond_to?(dep)
-          result = send(dep) rescue false
-          instance_exec(*result, &block) if result
-        end
-      else
-        old_test decl, &block
-      end
-    end
-  end
-end
+unless defined?(ActiveSupport)
+  raise "testdependencies must be required *after* rails/activesupport has been loaded" 
+end
+
+if defined?(Shoulda::Helpers) && Test::Unit::TestCase.ancestors.include?(Shoulda::Helpers)
+  require "adapters/shoulda" 
+else
+  require "adapters/plain"
+end
+
+
+  

data/test/helper.rb

@@ -1,25 +1,12 @@
 require 'rubygems'
 require 'test/unit'
+require 'rails/all'
+if defined?(SHOULDA_TEST)
+  require 'shoulda'
+end
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'rails/all'
-
-class ActiveSupport::TestCase < Test::Unit::TestCase
-  # this is rail's way of declaring tests
-  def test(name, &block)
-    test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
-    defined = instance_method(test_name) rescue false
-    raise "#{test_name} is already defined in #{self}" if defined
-    if block_given?
-      define_method(test_name, &block)
-    else
-      define_method(test_name) do
-        flunk "No implementation provided for #{name}"
-      end
-    end
-  end
-end
 
 require 'testdependencies'

data/test/plain_test.rb

@@ -0,0 +1,39 @@
+require 'helper'
+
+class RegressionTest < ActiveSupport::TestCase
+  
+  def new_user
+    user = Object.new
+    def user.name
+      "Horst"
+    end
+    user
+  end
+  
+  test "User has a name" => :new_user do |user|
+    assert_respond_to user, :name
+    user.name
+  end
+  
+  test "User name is Horst" => "User has a name" do |name|
+    assert_equal "Horst", name
+  end
+  
+  test "multiple return values" do
+    a, b, c, d = 1,2,3,4
+  end
+  
+  test "Consume separately" => "multiple return values" do |a,b,c,d|
+    assert_equal 1, a
+    assert_equal 2, b
+    assert_equal 3, c
+    assert_equal 4, d
+  end
+  
+  test "Consume altogether" => "multiple return values" do |*arr|
+    assert_equal 1, arr[0]
+    assert_equal 2, arr[1]
+    assert_equal 3, arr[2]
+    assert_equal 4, arr[3]
+  end
+end

data/test/shoulda_test.rb

@@ -0,0 +1,54 @@
+SHOULDA_TEST = true
+require 'helper'
+
+
+class RegressionTest < ActiveSupport::TestCase
+
+  def new_user
+    user = Object.new
+    def user.name
+      "Horst"
+    end
+    user
+  end
+  
+  should "User has a name" => :new_user do |user|
+    assert_respond_to user, :name
+    user.name
+  end
+
+
+  should "User name is Horst" => "User has a name" do |name|
+    assert_equal "Horst", name
+  end
+  
+  context "Declarative and classic style mixed together" do
+    setup do
+      @var = 1
+    end
+    
+    context "still working" do
+      should "get vat from setup" do
+        assert_equal 1, @var
+      end
+    end
+  end
+
+  should "multiple return values" do
+    a, b, c, d = 1,2,3,4
+  end
+  
+  should "Consume separately" => "multiple return values" do |a,b,c,d|
+    assert_equal 1, a
+    assert_equal 2, b
+    assert_equal 3, c
+    assert_equal 4, d
+  end
+  
+  should "Consume altogether" => "multiple return values" do |*arr|
+    assert_equal 1, arr[0]
+    assert_equal 2, arr[1]
+    assert_equal 3, arr[2]
+    assert_equal 4, arr[3]
+  end
+end

data/testdependencies.gemspec

@@ -0,0 +1,58 @@
+# Generated by jeweler
+# 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{testdependencies}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Matthias Hennemeyer"]
+  s.date = %q{2010-04-20}
+  s.description = %q{Add explicit dependencies to your Rails tests.}
+  s.email = %q{mhennemeyer@me.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lib/adapters/plain.rb",
+     "lib/adapters/shoulda.rb",
+     "lib/testdependencies.rb",
+     "test/helper.rb",
+     "test/plain_test.rb",
+     "test/shoulda_test.rb",
+     "testdependencies.gemspec"
+  ]
+  s.homepage = %q{http://github.com/mhennemeyer/testdependencies}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Add explicit dependencies to your Rails tests.}
+  s.test_files = [
+    "test/helper.rb",
+     "test/plain_test.rb",
+     "test/shoulda_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
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    else
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+  end
+end
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matthias Hennemeyer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 +02:00
+date: 2010-04-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,9 +45,13 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/adapters/plain.rb
+- lib/adapters/shoulda.rb
 - lib/testdependencies.rb
 - test/helper.rb
-- test/test_testdependencies.rb
+- test/plain_test.rb
+- test/shoulda_test.rb
+- testdependencies.gemspec
 has_rdoc: true
 homepage: http://github.com/mhennemeyer/testdependencies
 licenses: []
@@ -80,4 +84,5 @@ specification_version: 3
 summary: Add explicit dependencies to your Rails tests.
 test_files: 
 - test/helper.rb
-- test/test_testdependencies.rb
+- test/plain_test.rb
+- test/shoulda_test.rb

data/test/test_testdependencies.rb

@@ -1,21 +0,0 @@
-require 'helper'
-
-class RegressionTest < ActiveSupport::TestCase
-  
-  def new_user
-    user = Object.new
-    def user.name
-      "Horst"
-    end
-    user
-  end
-  
-  test "User has a name" => :new_user do |user|
-    assert_respond_to user, :name
-    user.name
-  end
-  
-  test "User name is Horst" => "User has a name" do |name|
-    assert_equal "Horst", name
-  end
-end