test-unit-context 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: b2b74eda8d17c70a42e4f4e4012f5db75165b0f4
-  data.tar.gz: 801d51680aeb9b80be2c6d2a709fc21d3918577c
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWM1MGRiMmE5MWY4ZTA0OWM1NjIxYWIxMjBlNjBiMGI4YzMxYWUwNQ==
+  data.tar.gz: !binary |-
+    YjIzNjdiNDA1NjllYmVkODQwNmEwZjA4MTE0YTYyYTNmNTUyNDBhMQ==
 SHA512:
-  metadata.gz: fe11be327ef6489dabf2d072862a95afdff47bf460b76b3c8eaa650aefc33edffba7922c86813333e55cc202ec5c01b4d0ced6b1067ae7efc97f14cef7a373a0
-  data.tar.gz: 96fc5b5786d2dfd94acf17ee2fb0f69bf6a24d83bf46d3bbd830aca3307f89c5a6a957c7b8ad4b09b9454b24c58c7584e0b1ee88811d5f58b73e7db81440415a
+  metadata.gz: !binary |-
+    N2VjNjgwZDcyZDA4YmM4Zjk3NDIwYzg4ZjQ2ZDRhN2EzZWU3MWY5OGE4OTU2
+    NTk4YTNiZDA1MzkxOTAwYzU0YWNlZjI1MjkyNmI2NTA0ZWUzZTVjMjEyNjQy
+    NDc1NjkxOGQ0YzM1NTEyNmYyZDAxZGMwM2JmYjI5ZDg3YTcxZTA=
+  data.tar.gz: !binary |-
+    NTg3MDhkNTZkZWYyYmZmNTZjYmE3MjYxMDgwNWNhMjhlNzM3YjM0N2U0YzUy
+    MTc3ZDdlNTc5MjY5ZTI2ZWRmZjhjMDU0ODRmMTY3Y2IzOTQ5NDcyNDgxZWI1
+    OTFiOWE4MTY2MTAyN2EyMDg2ZThiMmEwN2E5ZWQ5ZmI3NTkyNTU=

data/.travis.yml

@@ -1,18 +1,21 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3
-  - 2.1.5
-  - jruby-1.6.8
-  - jruby-1.7.16
+  - 2.2.3
+  - 2.3.0
+  - jruby-1.7.22
+  - jruby-9.0.4.0
 jdk:
   - openjdk7
 env:
-  - TEST_UNIT="~> 2.5.5"
-  - TEST_UNIT="~> 3.0.9"
+  - TEST_UNIT="~> 2.5"
+  - TEST_UNIT="~> 3.0"
+  - TEST_UNIT="~> 3.1"
+before_install:
+  - ((ruby -v | grep 1.8.7) && ruby -S gem install bundler -v '~> 1.8.9') || true
+  - ((ruby -v | grep 1.9.3) && ruby -S gem install bundler -v '~> 1.8.9') || true
 matrix:
-  exclude:
+  include:
     - rvm: 1.8.7
-      env: TEST_UNIT="~> 3.0.9"
-    - rvm: jruby-1.6.8
-      env: TEST_UNIT="~> 3.0.9"
+      env: TEST_UNIT="~> 2.5"
+      jdk: openjdk6 # jdk_switcher use ["openjdk7"]" failed and exited with 1

data/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2012 Karol Bucek
+   Copyright (c) 2012-2016 [Karol Bucek](http://kares.org)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/README.md

@@ -2,11 +2,11 @@
 
 [![Build Status][0]](http://travis-ci.org/kares/test-unit-context)
 
-Makes `Test::Unit::TestCase` 'context-able' and thus (subjectively - hopefully) 
-much easier to read and write. If you have ever seen RSpec than it's the very 
-same *context do ... end* re-invented for **Test::Unit**. 
+Makes `Test::Unit::TestCase` 'context-able' and thus (subjectively - hopefully)
+much easier to read and write. If you have ever seen RSpec than it's the very
+same *context do ... end* re-invented for **Test::Unit**.
 
-Inspired by [gem 'context'](https://github.com/jm/context) that does the same 
+Inspired by [gem 'context'](https://github.com/jm/context) that does the same
 for the good 'old' test-unit 1.2.3 bundled with Ruby 1.8.x standard libraries.
 
 ## Installation
@@ -25,7 +25,6 @@ Or install it yourself, if you're not using Bundler :
 ## Usage
 
 ```ruby
-# NOTE: do not run try running this at home!
 class ChuckNorrisTest < Test::Unit::TestCase
 
   setup do
@@ -76,7 +75,7 @@ class ChuckNorrisTest < Test::Unit::TestCase
   uses 'elementary math facts'
 
   context 'cloned' do
-    
+
     setup do
       @subject = @subject.clone
     end
@@ -91,7 +90,6 @@ class ChuckNorrisTest < Test::Unit::TestCase
   end
 
 end
-
 ```
 
 ### Spec Mode
@@ -113,11 +111,12 @@ describe ChuckNorris, '#fart' do
   end
 
 end
+# NOTE: do not try running this at home!
 ```
 
 ## Copyright
 
-Copyright (c) 2012 [Karol Bucek](https://github.com/kares). 
+Copyright (c) 2016 [Karol Bucek](https://github.com/kares).
 See LICENSE (http://www.apache.org/licenses/LICENSE-2.0) for details.
 
-[0]: https://secure.travis-ci.org/kares/test-unit-context.png
+[0]: https://secure.travis-ci.org/kares/test-unit-context.png

data/lib/test/unit/context/context.rb

@@ -40,12 +40,12 @@ module Test::Unit::Context
       if const_defined?(class_name)
         klass = const_get(class_name)
         if ( klass.superclass == self rescue nil )
-          warn "duplicate context definition with the name #{name.inspect} " <<
-                "found at #{caller.first} it is going to be merged with " <<
+          warn "duplicate context definition with the name #{name.inspect} " +
+                "found at #{caller.first} it is going to be merged with " +
                 "the previous context definition"
         else
-          raise "could not create a context with the name #{name.inspect} " <<
-                "as a constant #{class_name} is already defined and is not " <<
+          raise "could not create a context with the name #{name.inspect} " +
+                "as a constant #{class_name} is already defined and is not " +
                 "another context definition"
         end
       else

data/lib/test/unit/context/version.rb

@@ -1,7 +1,7 @@
 module Test
   module Unit
     module Context
-      VERSION = '0.5.0'
+      VERSION = '0.5.1'
     end
   end
 end

data/lib/test/unit/patches.rb

@@ -10,25 +10,37 @@ module Test::Unit
   end
   TestSuiteCreator.class_eval do
 
+    unless respond_to?(:test_method?)
+      require 'test/unit/attribute' unless Test::Unit.const_defined? :Attribute
+      if Test::Unit::Attribute::ClassMethods.method_defined?(:find_attribute)
+        def self.test_method?(test_case, method_name)
+          method_name = method_name.to_s
+          ( method_name.start_with?('test') && method_name.length > 4 ) ||
+            test_case.find_attribute(method_name, :test)
+        end
+      else
+        def self.test_method?(test_case, method_name)
+          method_name = method_name.to_s
+          ( method_name.start_with?('test') && method_name.length > 4 ) ||
+            test_case.attributes(method_name)[:test]
+        end
+      end
+    end
+
     private
 
     def collect_test_names
       methods = @test_case.public_instance_methods(true)
-      test_case_super = @test_case.superclass
-      while test_case_super && test_case_super != TestCase
-        methods -= test_case_super.public_instance_methods(true)
-        test_case_super = test_case_super.superclass
+      super_test_case = @test_case.superclass
+      while super_test_case && super_test_case != TestCase
+        methods -= super_test_case.public_instance_methods(true)
+        super_test_case = super_test_case.superclass
       end
-      methods.map!(&:to_s)
-      use_find_attribute = @test_case.respond_to?(:find_attribute)
-      test_names = methods.find_all do |method_name|
-        # method_name =~ /^test./
-        ( method_name.start_with?('test') && method_name.length > 4 ) ||
-        ( use_find_attribute ? # since Test-Unit 3.0
-            @test_case.find_attribute(method_name, :test) :
-              @test_case.attributes(method_name)[:test] )
+      method_names = methods.map!(&:to_s)
+      test_names = method_names.find_all do |method_name|
+        self.class.test_method?(@test_case, method_name)
       end
-      send("sort_test_names_in_#{@test_case.test_order}_order", test_names)
+      __send__("sort_test_names_in_#{@test_case.test_order}_order", test_names)
     end
 
   end

data/test-unit-context.gemspec

@@ -1,26 +1,27 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require 'test/unit/context/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "test-unit-context"
-  gem.version       = Test::Unit::Context::VERSION
-  gem.authors       = ["kares"]
-  gem.email         = ["self@kares.org"]
-  
+  gem.name          = 'test-unit-context'
+  gem.authors       = ['Karol Bucek']
+  gem.email         = ['self@kares.org']
+  gem.licenses      = ['Apache-2.0']
+
+  path = File.expand_path("lib/test/unit/context/version.rb", File.dirname(__FILE__))
+  gem.version       = File.read(path).match( /.*VERSION\s*=\s*['"](.*)['"]/m )[1]
+
   gem.summary       = %q{Context for Test::Unit (2.x)}
   gem.description   = %q{Makes Test::Unit::TestCases 'contextable' and thus much
-easier to read and write. If you've seen RSpec than it's the very same 'context 
-do ... end' re-invendet for Test::Unit. Inspired by gem 'context' that does the
-same for the 'old' Test::Unit 1.2.3 bundled with Ruby 1.8.x standard libraries.}
-  gem.homepage      = "http://github.com/kares/test-unit-context"
+easier to read and write. If you've seen RSpec than it's the very same 'context
+do ... end' re-invendet for Test::Unit. Inspired by gem 'context' that does a
+similar job for the 'old' Test::Unit bundled with Ruby 1.8.x standard libraries.}
+  gem.homepage      = "https://github.com/kares/test-unit-context"
 
   gem.require_paths = ["lib"]
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test}/*`.split("\n")
-  
+
   gem.extra_rdoc_files = %w[ README.md LICENSE ]
-  
+
   gem.add_dependency 'test-unit', '>= 2.4.0'
   gem.add_development_dependency 'rake'
 end

data/test/test/unit/context/hooks_test.rb

@@ -2,14 +2,14 @@ require File.expand_path('../../../test_helper', File.dirname(__FILE__))
 
 module Test::Unit::Context
   class TestHooks < Test::Unit::TestCase
-    
+
     class << self; alias_method :it, :test; end
-    
+
     setup do
       @inherited_before_each_var ||= 0
       @inherited_before_each_var  += 1
     end
-    
+
     attr_reader :inherited_before_each_var
 
     def setup
@@ -20,29 +20,29 @@ module Test::Unit::Context
     end
 
     attr_reader :inherited_before_each_var_2
-    
+
     def teardown
       @inherited_after_each_var ||= 0
       @inherited_after_each_var  += 1
     end
 
     attr_reader :inherited_after_each_var
-    
+
     startup do
       @inherited_before_all_var ||= 0
       @inherited_before_all_var  += 1
     end
 
     attr_reader :inherited_before_all_var
-    
+
     shutdown do
       @inherited_after_all_var ||= 0
       @inherited_after_all_var  += 1
     end
-  
+
     attr_reader :inherited_after_all_var
-    
-    SAMPLE_TEST = context "hooks" do
+
+    SAMPLE_TEST1 = context "hooks1" do
 
       setup do
         @inherited_before_each_var ||= 0
@@ -55,13 +55,17 @@ module Test::Unit::Context
       end
 
       attr_reader :after_each_var
-      
+
       teardown :a_method
 
       test "foo" do
         assert :foo
       end
-      
+
+      # @override so its not auto-run
+      alias_method :default_run, :run
+      def run(result); result end
+
     end
 
     setup
@@ -71,7 +75,7 @@ module Test::Unit::Context
     end
 
     attr_reader :superclass_before_each_var
-    
+
     teardown
     def a_teardown
       @superclass_after_each_var ||= 0
@@ -79,7 +83,7 @@ module Test::Unit::Context
     end
 
     attr_reader :superclass_after_each_var
-    
+
     context "with (inherited) setup/teadown hooks" do
 
       it "runs superclass before callbacks in order" do
@@ -109,48 +113,57 @@ module Test::Unit::Context
       it "runs after callbacks specified with method names, instead of blocks" do
         assert_equal "a method ran", @test.ivar
       end
-      
+
       setup do
-        @result = Test::Unit::TestResult.new
-        @test = SAMPLE_TEST.new("test: hooks foo")
-        @test.run(@result) { |inherited_after_each_var, v| }
+        result = Test::Unit::TestResult.new
+        @test = SAMPLE_TEST1.new("test: foo")
+        @test.default_run(result) { |inherited_after_each_var, v| }
+        verify_result_passed! result
       end
-      
+
     end
 
-    context "with redefined setup/teadown methods" do
+    SAMPLE_TEST2 = context "hooks2" do
 
-      SAMPLE_TEST.class_eval do
-        OLD_SETUP = instance_method(:setup)
-        OLD_TEARDOWN = instance_method(:teardown)
-      end
-      
       setup do
-        SAMPLE_TEST.class_eval do
-          def setup
-            @superclass_before_each_var ||= 0
-            @inherited_before_each_var_2 ||= 9
-          end
-          def teardown
-            @superclass_after_each_var ||= 0
-          end
-        end
-        
-        @result = Test::Unit::TestResult.new
-        @test = SAMPLE_TEST.new("test: hooks foo")
-        @test.run(@result) { |inherited_after_each_var, v| }
+        @inherited_before_each_var ||= 0
+        @inherited_before_each_var  += 4
       end
-      
+
       teardown do
-        SAMPLE_TEST.class_eval do
-          remove_method :setup
-          remove_method :teardown
-          
-          define_method(:setup, OLD_SETUP)
-          define_method(:teardown, OLD_TEARDOWN)
-        end
+        @after_each_var ||= 0
+        @after_each_var  += 1
+      end
+
+      def setup
+        @superclass_before_each_var ||= 0
+        @inherited_before_each_var_2 ||= 9
+      end
+
+      def teardown
+        @superclass_after_each_var ||= 0
+      end
+
+      attr_reader :after_each_var
+
+      test "foo" do
+        assert :foo
       end
-      
+
+      # @override so its not auto-run
+      alias_method :default_run, :run
+      def run(result); result end
+
+    end
+
+    context "with redefined setup/teadown methods" do
+
+      setup do
+        @result = Test::Unit::TestResult.new
+        @test = SAMPLE_TEST2.new("test: foo")
+        @test.default_run(@result) { |inherited_after_each_var, v| }
+      end
+
       it "runs superclass before callbacks" do
         assert_equal 1, @test.superclass_before_each_var
       end
@@ -158,24 +171,54 @@ module Test::Unit::Context
       it "runs superclass after callbacks" do
         assert_equal 1, @test.superclass_after_each_var
       end
-      
+
       it "does not run inherited (re-defined) setup method" do
         assert_equal 9, @test.inherited_before_each_var_2
       end
-      
+
       it "runs inherited before callbacks (except previous setup method)" do
         assert_equal 5, @test.inherited_before_each_var
       end
-      
+
     end
-    
+
+    SAMPLE_TEST3 = context "hooks3" do
+
+      setup do
+        #puts "hooks3 setup \n  #{caller.join("\n  ")}"
+        @inherited_before_each_var ||= 0
+        @inherited_before_each_var  += 4
+      end
+
+      teardown do
+        @after_each_var ||= 0
+        @after_each_var  += 1
+      end
+
+      attr_reader :after_each_var
+
+      test "foo" do
+        assert :foo
+      end
+
+      # @override so its not auto-run
+      alias_method :default_run, :run
+      def run(result); result end
+
+    end
+
     # test that we aren't stomping on defined setup method
     context "with setup/teardown methods" do
-      
+
+      SAMPLE_TEST3.class_eval { attr_reader :one, :two }
+
       setup
       def custom_setup
-        @result = Test::Unit::TestResult.new
-        @test = SAMPLE_TEST.new("test: hooks foo")
+
+        #SAMPLE_TEST3.setup { @one = 1 }
+        #SAMPLE_TEST3.teardown { @two = 10 }
+
+        @test = SAMPLE_TEST3.new("test: foo")
 
         @test.class.setup do
           @one = 1
@@ -185,55 +228,55 @@ module Test::Unit::Context
           @two = 10
         end
 
-        @test.run(@result) { |inherited_after_each_var, v| }
+        result = Test::Unit::TestResult.new
+        @test.default_run(result) { |inherited_after_each_var, v| }
+        verify_result_passed! result
       end
-      
-      SAMPLE_TEST.class_eval { attr_reader :one, :two }
-      
+
       it "runs setup method block a la Shoulda" do
         assert_equal 1, @test.one
       end
 
-      it "runs setup method block and regular callbacks" do
-        assert_equal 7, @test.inherited_before_each_var
-      end
-
       it "runs teardown method block a la Shoulda" do
         assert_equal 10, @test.two
       end
 
       it "runs teardown method block and regular callbacks" do
+        assert_equal 7, @test.inherited_before_each_var
         assert_equal 1, @test.after_each_var
       end
-      
+
     end
 
     def self.startup
       @superclass_before_all_var ||= 0
       @superclass_before_all_var  += 1
     end
-    
+
     def self.shutdown
       @superclass_after_all_var ||= 0
       @superclass_after_all_var  += 1
     end
-    
-    context "To be compatible with rails' expectations" do
-      setup :a_method
-
-      test "should accept a symbol for an argument to setup and run that method at setup time" do
-        assert_equal "a method ran", @ivar
-      end
-    end
 
     protected
-    
+
     attr_reader :ivar
-    
+
     def a_method
       @ivar = "a method ran"
     end
-    
+
+    private
+
+    def verify_result_passed!(test_result)
+      unless test_result.passed?
+        #raise test_result.faults[0] if test_result.faults.size == 1
+        #raise "test run failed: #{result.summary}\n#{faults.inspect}"
+        warn "test run failed: #{test_result.summary}\n#{test_result.inspect}"
+        raise test_result.faults.first unless test_result.faults.empty?
+      end
+    end
+
   end
-  
+
 end

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 begin
   require 'test/unit/version'
+  puts "using Test::Unit::VERSION = #{Test::Unit::VERSION}" if $VERBOSE
 rescue LoadError => e
   require('rubygems') && retry
   fail "`bundle install` to install Test::Unit 2.x (#{e.inspect})"

metadata

@@ -1,47 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: test-unit-context
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
-- kares
+- Karol Bucek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: "Makes Test::Unit::TestCases 'contextable' and thus much\neasier to read
-  and write. If you've seen RSpec than it's the very same 'context \ndo ... end' re-invendet
-  for Test::Unit. Inspired by gem 'context' that does the\nsame for the 'old' Test::Unit
-  1.2.3 bundled with Ruby 1.8.x standard libraries."
+description: ! 'Makes Test::Unit::TestCases ''contextable'' and thus much
+
+  easier to read and write. If you''ve seen RSpec than it''s the very same ''context
+
+  do ... end'' re-invendet for Test::Unit. Inspired by gem ''context'' that does a
+
+  similar job for the ''old'' Test::Unit bundled with Ruby 1.8.x standard libraries.'
 email:
 - self@kares.org
 executables: []
@@ -50,8 +53,8 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -71,8 +74,9 @@ files:
 - test/test/unit/context_test.rb
 - test/test/unit/patches_test.rb
 - test/test_helper.rb
-homepage: http://github.com/kares/test-unit-context
-licenses: []
+homepage: https://github.com/kares/test-unit-context
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -80,17 +84,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Context for Test::Unit (2.x)