minitest_should 0.2.0 → 0.3.0

data/.travis.yml

@@ -3,6 +3,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - rbx
-  - rbx-2.0
   - ree
   - jruby

data/README.md

@@ -1,92 +1,115 @@
 # MiniTest Should [![Build Status](https://secure.travis-ci.org/citrus/minitest_should.png)](http://travis-ci.org/citrus/minitest_should)
 
-minitest_should allows you to write unit tests with [shoulda](https://github.com/thoughtbot/shoulda) style syntax. Contexts are not fully supported but you can use `should "do something"` instead of those `pesky_underscored_test_names`.
-
+minitest_should allows you to write unit tests with [shoulda](https://github.com/thoughtbot/shoulda) style syntax.
 
+------------------------------------------------------------------------------
 Usage
------
+------------------------------------------------------------------------------
 
-    gem "minitest"
-    
-    require "minitest/autorun"
-    require "minitest/should"
-    
+When writing your mini-tests, inherit from `MiniTest::Should::TestCase`.
+
+
+```ruby
+gem "minitest"
+
+require "minitest/autorun"
+require "minitest/should"
+
+
+# instead of this
+class TestWithUnderscores < MiniTest::Unit::TestCase
+  
+  def test_should_just_work
+    assert true
+  end
+  
+  def test_something_else_should_be_nothing
+    @something = "nothing"
+    assert_equal "nothing", @something
+  end
+  
+end
+
+# use this!
+class TestWithShould < MiniTest::Should::TestCase
+  
+  should "just work" do
+    assert true
+  end
+  
+  context "Something else" do
     
-    # instead of this
-    class TestWithUnderscores < MiniTest::Unit::TestCase
-      
-      def test_should_just_work
-        assert true
-      end
-      
-      def test_something_else_should_be_nothing
-        @something = "nothing"
-        assert_equal "nothing", @something
-      end
-      
+    setup do
+      @something = "nothing"
     end
     
-    # use this!
-    class TestWithShould < MiniTest::Unit::TestCase
-      
-      should "just work" do
-        assert true
-      end
-      
-      context "Something else" do
-        
-        def setup
-          @something = "nothing"
-        end
-        
-        should "be nothing" do
-          assert_equal "nothing", @something
-        end
-        
-      end
-      
+    should "be nothing" do
+      assert_equal "nothing", @something
     end
     
+  end
+  
+end
+```
 
- 
+------------------------------------------------------------------------------
 Installation
-------------
+------------------------------------------------------------------------------
 
 As usual, just use the `gem install` command:
 
-    (sudo) gem install minitest_should
+```bash
+(sudo) gem install minitest_should
+```
     
 Or add minitest_should as a gem in your Gemfile:
 
-    gem 'minitest_should', '~> 0.2.0' 
+```bash
+gem 'minitest_should', '~> 0.3.0' 
+```
 
 Then run `bundle install`
 
 
-
+------------------------------------------------------------------------------
 Testing
--------
+------------------------------------------------------------------------------
 
 Testing is done with minitest. (duh!) Run the tests with:
 
-    rake
+```bash
+rake
+```
     
 
+------------------------------------------------------------------------------
 Changelog
----------
+------------------------------------------------------------------------------
+
+**2012/1/20 - v0.3.0**
+
+- don't pollute minitest/unit/testcase
+- subclass minitest/spec as minitest/should/test_case
+- alias before and after as setup and teardown
+
 
-  **2011/12/8 - v0.2.0**
-  - add contexts
+**2011/12/8 - v0.2.0**
 
-  **2011/11/8 - v0.1.1**
-  - ensure dynamic methods have safe names
+- add contexts
 
-  **2011/11/8 - v0.1.0**
-  - it exists!
+
+**2011/11/8 - v0.1.1**
+
+- ensure dynamic methods have safe names
+
+
+**2011/11/8 - v0.1.0**
+
+- it exists!
   
     
-
+------------------------------------------------------------------------------
 License
--------
+------------------------------------------------------------------------------
 
-Copyright (c) 2011 Spencer Steffen & Citrus, released under the New BSD License All rights reserved.
+Copyright (c) 2011 - 2012 Spencer Steffen & Citrus, released under the New BSD License All rights reserved.

data/lib/minitest/should.rb

@@ -1,13 +1,9 @@
 require "minitest/unit"
-require "minitest/should/base"
 require "minitest/should/version"
 
-alias :context :describe
-
 module MiniTest
-  module Should
-  
-    class DuplicateMethodError < StandardError; end
-    
+  module Should  
+    class DuplicateMethodError < StandardError; end    
+    autoload :TestCase, "minitest/should/test_case"
   end
 end

data/lib/minitest/should/test_case.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/ruby -w
+
+class MiniTest::Should::TestCase < MiniTest::Spec
+  
+  class << self
+    alias :setup :before unless defined?(Rails)
+    alias :teardown :after unless defined?(Rails)
+    alias :context :describe
+  end
+  
+  def self.should(name, &block)
+    method_name = [ "test_should_", name.downcase.gsub(/[^a-z0-9\_\s]+/, ' ').strip.gsub(/\s+/, "_") ].join
+    if self.test_methods.include?(method_name)
+      raise MiniTest::Should::DuplicateMethodError, "Test named `#{method_name}` already exists in #{self.name}." 
+    else
+      self.send(:define_method, method_name, block)
+    end
+  end
+  
+end

data/lib/minitest/should/version.rb

@@ -1,5 +1,5 @@
 module MiniTest
   module Should
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/test/test_minitest_should.rb

@@ -2,7 +2,7 @@ gem "minitest"
 require "minitest/autorun"
 require "minitest/should"
 
-class TestMiniTestShould < MiniTest::Unit::TestCase
+class TestMiniTestShould < MiniTest::Should::TestCase
 
   def setup
     @something = "nothing"
@@ -16,8 +16,8 @@ class TestMiniTestShould < MiniTest::Unit::TestCase
     assert_equal String, MiniTest::Should::VERSION.class
   end
   
-  def test_includes_minitest_should_base_module
-    assert self.class.included_modules.include?(MiniTest::Should::Base)
+  def test_case_extends_minitest_unit_test_case
+    assert self.class.ancestors.include?(MiniTest::Unit::TestCase)
   end
   
   def test_respond_to_should
@@ -80,13 +80,33 @@ class TestMiniTestShould < MiniTest::Unit::TestCase
     should "make this true" do
       assert true
     end
+    
+    should "work with the parent tests instance variables" do
+      assert_equal "nothing", @something
+    end
+    
+    should "work with the parent tests instance methods" do
+      assert_equal "blank", nothing
+    end    
       
     context "with a another context" do
+            
+      setup do
+        @something = "not-nothing"
+      end
       
+      teardown do
+        assert "not-nothing", @something
+      end
+            
       should "just keep on keepin' on" do
         assert true
       end
-        
+      
+      should "manipulate the parent tests instance variables in setup" do
+        assert_equal "not-nothing", @something
+      end
+      
     end
     
     context "with the same method names as another context" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest_should
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000Z
+date: 2012-01-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70281328533800 !ruby/object:Gem::Requirement
+  requirement: &70318086885480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70281328533800
+  version_requirements: *70318086885480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70281328533200 !ruby/object:Gem::Requirement
+  requirement: &70318086884980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70281328533200
+  version_requirements: *70318086884980
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70281328532420 !ruby/object:Gem::Requirement
+  requirement: &70318086884520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -43,7 +43,7 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70281328532420
+  version_requirements: *70318086884520
 description: Shoulda style syntax for minitest test::unit. Contexts are not yet supported,
   but you can use `should "do something"` instead of those `pesky_underscored_test_names`.
   Please see documentation for more information.
@@ -60,7 +60,7 @@ files:
 - README.md
 - Rakefile
 - lib/minitest/should.rb
-- lib/minitest/should/base.rb
+- lib/minitest/should/test_case.rb
 - lib/minitest/should/version.rb
 - minitest_should.gemspec
 - test/test_minitest_should.rb
@@ -76,18 +76,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -18762255773632330
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -18762255773632330
 requirements: []
 rubyforge_project: minitest_should
 rubygems_version: 1.8.10

data/lib/minitest/should/base.rb

@@ -1,26 +0,0 @@
-module MiniTest
-  module Should
-    module Base
-  
-      def self.included(base)
-        base.extend ClassMethods
-      end
-      
-      module ClassMethods
-      
-        def should(name, &block)
-          method_name = [ "test_should_", name.downcase.gsub(/[^a-z0-9\_\s]+/, ' ').strip.gsub(/\s+/, "_") ].join
-          if self.test_methods.include?(method_name)
-            raise MiniTest::Should::DuplicateMethodError, "Test named `#{method_name}` already exists in #{self.name}." 
-          else
-            self.send(:define_method, method_name, block)
-          end
-        end
-            
-      end
-    
-    end
-  end
-end
-
-MiniTest::Unit::TestCase.send(:include, MiniTest::Should::Base)