shoulda-context 1.1.2 → 1.1.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWFjNDc2MDE5Njc1ZWQwNDhhZDFlMTk5MjNlMTIxYmFmMWQ0YjNiZg==
-  data.tar.gz: !binary |-
-    NWM1ZGJkMTM2NzJlOTAxMzgwZmIwMzBkMDFhNTM2MzkyZWJiYzI3ZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NTlmNjFmNTE3M2RmMTM5NjZmYWFkMDhkYmUwNTRlZDA3YjQyODE3ZTM5OTk5
-    YTg4ZjIxMDJmNmVlZDRiMWFiZmMyMDM4NDRkYTk4ODFiNjM0ZTZjZDhhYTk1
-    NzNlMDkwNWI0YTdjOTE2OWMwMjQ3MGM0NjY2NDFlYzVjNDQ2MzQ=
-  data.tar.gz: !binary |-
-    MjM1MDRhZDkyMmQ4YjQ5NGM1NjcyZGQ4YTkxOWExZTZkYWNlYWJkMGRjMzVl
-    YzViMzg1YTA5ZWEyZWY1OGYwZjdkMDQ5NGUxODI3NDFiNzA1MzllMjM2NTcx
-    MjkyNWFiZjE2NzJiN2JlNDk0OWNjNzM4MTQzMGNlYjk1ZDFjYWM=
+SHA1:
+  metadata.gz: 41b60644837ba1b4d4168e7bdab013f4bc834e67
+  data.tar.gz: d9a1a81ea9625b792003edd12afcd6f6f7eacb9f
+SHA512:
+  metadata.gz: 57eb54533d9edb1aca3f479e1e516f2625706294e53fe164e6779f7f6c7e177fa0b4267a20151e4a122dfe834d24dfdcdeea5702da1d379ef1293d6035dc8e10
+  data.tar.gz: 33ab273a78b588d99b4d34e5b09bee1ab2068f2157e3883edea8f4b8fa1c24b14d01c3cbb1debe8b82c8a0597ced79922d3efc79d0ab9b5bfb414af581e9be41

data/lib/shoulda/context/assertions.rb

@@ -52,14 +52,14 @@ module Shoulda # :nodoc:
         end
 
         if matcher.matches?(target)
-          assert_block { true }
+          safe_assert_block { true }
           if options[:message]
             message = matcher.respond_to?(:failure_message_for_should_not) ? matcher.failure_message_for_should_not : matcher.negative_failure_message
             assert_match options[:message], message
           end
         else
           message = matcher.respond_to?(:failure_message_for_should) ? matcher.failure_message_for_should : matcher.failure_message
-          assert_block(message) { false }
+          safe_assert_block(message) { false }
         end
       end
 
@@ -73,14 +73,22 @@ module Shoulda # :nodoc:
         not_match = matcher.respond_to?(:does_not_match?) ? matcher.does_not_match?(target) : !matcher.matches?(target)
 
         if not_match
-          assert_block { true }
+          safe_assert_block { true }
           if options[:message]
             message = matcher.respond_to?(:failure_message_for_should) ? matcher.failure_message_for_should : matcher.failure_message
             assert_match options[:message], message
           end
         else
           message = matcher.respond_to?(:failure_message_for_should_not) ? matcher.failure_message_for_should_not : matcher.negative_failure_message
-          assert_block(message) { false }
+          safe_assert_block(message) { false }
+        end
+      end
+
+      def safe_assert_block(message = nil, &block)
+        if respond_to?(:assert_block)
+          assert_block message, &block
+        else
+          assert yield, message
         end
       end
     end

data/lib/shoulda/context/context.rb

@@ -385,7 +385,7 @@ module Shoulda
         test_name = ["test:", full_name, "should", "#{should[:name]}. "].flatten.join(' ').to_sym
 
         if test_methods[test_unit_class][test_name.to_s] then
-          warn "  * WARNING: '#{test_name}' is already defined"
+          raise DuplicateTestError, "'#{test_name}' is defined more than once."
         end
 
         test_methods[test_unit_class][test_name.to_s] = true
@@ -450,3 +450,5 @@ module Shoulda
     end
   end
 end
+
+class DuplicateTestError < RuntimeError; end

data/lib/shoulda/context/version.rb

@@ -1,5 +1,5 @@
 module Shoulda
   module Context
-    VERSION = '1.1.2'.freeze
+    VERSION = '1.1.3'.freeze
   end
 end

data/lib/shoulda/context.rb

@@ -1,26 +1,25 @@
 begin
-  # if present, then also loads MiniTest::Unit::TestCase
+  # if present, load and set base_test_case
   ActiveSupport::TestCase
+  if defined?([ActiveSupport::TestCase, MiniTest::Unit::TestCase]) &&
+     (ActiveSupport::TestCase.ancestors.include?(MiniTest::Unit::TestCase))
+    base_test_case = MiniTest::Unit::TestCase
+  end
 rescue
 end
 
-if defined?([ActiveSupport::TestCase, MiniTest::Unit::TestCase]) && (ActiveSupport::TestCase.ancestors.include?(MiniTest::Unit::TestCase))
-  base_test_case = MiniTest::Unit::TestCase
-else
-  if !defined?(Test::Unit::TestCase)
-    require 'test/unit/testcase'
-  end
+# no base_test_case set, using Test:Unit:TestCase
+unless base_test_case
+  require 'test/unit/testcase' unless defined?(Test::Unit::TestCase)
   base_test_case = Test::Unit::TestCase
 end
 
-
 require 'shoulda/context/version'
 require 'shoulda/context/proc_extensions'
 require 'shoulda/context/assertions'
 require 'shoulda/context/context'
 require 'shoulda/context/autoload_macros'
 
-
 module ShouldaContextLoadable
   def self.included(base)
     base.class_eval do

data/test/shoulda/should_test.rb

@@ -46,7 +46,6 @@ class ShouldTest < Test::Unit::TestCase # :nodoc:
   end
 
   context "Context" do
-
     should_see_class_methods
     should_see_a_context_block_like_a_Test_Unit_class
     should_be_able_to_make_context_macros("Context ")
@@ -155,6 +154,20 @@ class ShouldTest < Test::Unit::TestCase # :nodoc:
     assert_equal "Parent Child GrandChild", grandchild.full_name
   end
 
+  def test_should_raise_on_duplicate_naming
+  tu_class = Test::Unit::TestCase
+   context = Shoulda::Context::Context.new("DupContext", tu_class) do
+      should "dup" do; end
+      should "dup" do; end
+    end
+
+    names = context.shoulds.map {|s| s[:name]}
+    assert_equal 1, names.uniq.length
+    assert_raise DuplicateTestError do
+      context.build
+    end
+  end
+
   # Should statements
 
   def test_should_have_should_hashes_when_given_should_statements

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-context
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - thoughtbot, inc.
@@ -13,78 +13,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
-  type: :development
-  prerelease: false
-  name: appraisal
 - !ruby/object:Gem::Dependency
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :development
-  prerelease: false
-  name: rails
 - !ruby/object:Gem::Dependency
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.10
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.10
-  type: :development
-  prerelease: false
-  name: mocha
 - !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'
-  type: :development
-  prerelease: false
-  name: rake
 - !ruby/object:Gem::Dependency
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.0
-  type: :development
-  prerelease: false
-  name: test-unit
 description: Context framework extracted from Shoulda
 email: support@thoughtbot.com
 executables:
@@ -143,17 +143,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.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Context framework extracted from Shoulda