shoulda-context 1.1.6 → 1.2.0

data/lib/shoulda/context.rb

@@ -1,19 +1,4 @@
-begin
-  # 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
-
-# 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/test_framework_detection'
 require 'shoulda/context/version'
 require 'shoulda/context/proc_extensions'
 require 'shoulda/context/assertions'
@@ -30,4 +15,6 @@ module ShouldaContextLoadable
   end
 end
 
-base_test_case.class_eval { include ShouldaContextLoadable }
+Shoulda::Context.test_framework_test_cases.each do |test_case|
+  test_case.class_eval { include ShouldaContextLoadable }
+end

data/lib/shoulda/context/context.rb

@@ -387,7 +387,7 @@ module Shoulda
       end
 
       def create_test_from_should_hash(should)
-        test_name = ["test:", full_name, "should", "#{should[:name]}. "].flatten.join(' ').to_sym
+        test_name = [test_name_prefix, full_name, "should", "#{should[:name]}. "].flatten.join(' ').to_sym
 
         if test_methods[test_unit_class][test_name.to_s] then
           raise DuplicateTestError, "'#{test_name}' is defined more than once."
@@ -470,10 +470,17 @@ module Shoulda
         print_should_eventuallys
       end
 
+      def test_name_prefix
+        if defined?(Minitest) || defined?(MiniTest)
+          'test_:'
+        else
+          'test:'
+        end
+      end
+
       def method_missing(method, *args, &blk)
         test_unit_class.send(method, *args, &blk)
       end
-
     end
   end
 end

data/lib/shoulda/context/test_framework_detection.rb

@@ -0,0 +1,34 @@
+module Shoulda
+  module Context
+    module TestFrameworkDetection
+      def self.possible_test_frameworks
+        [
+          -> { ActiveSupport::TestCase },
+          -> { Minitest::Test },
+          -> { MiniTest::Unit::TestCase },
+          -> { Test::Unit::TestCase }
+        ]
+      end
+
+      def self.resolve_framework(future_framework)
+        future_framework.call
+      rescue NameError
+        nil
+      end
+
+      def self.detected_test_framework_test_cases
+        possible_test_frameworks.
+          map { |future_framework| resolve_framework(future_framework) }.
+          compact
+      end
+
+      def self.test_framework_test_cases
+        @_test_framework_test_case ||= detected_test_framework_test_cases
+      end
+    end
+
+    def self.test_framework_test_cases
+      TestFrameworkDetection.test_framework_test_cases
+    end
+  end
+end

data/lib/shoulda/context/version.rb

@@ -1,5 +1,5 @@
 module Shoulda
   module Context
-    VERSION = '1.1.6'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

data/test/shoulda/test_framework_detection_test.rb

@@ -0,0 +1,154 @@
+require 'test_helper'
+require 'tempfile'
+
+class TestFrameworkDetectionTest < Test::Unit::TestCase
+  if CURRENT_APPRAISAL_NAME == 'rails_4_1'
+    should 'detect Minitest 5.x w/ Rails 4.1' do
+      assert_integration_with_rails_and 'Minitest::Test', 'Minitest::Unit::TestCase'
+    end
+  end
+
+  if CURRENT_APPRAISAL_NAME == 'rails_4_0'
+    should 'detect ActiveSupport::TestCase and Minitest 4.x w/ Rails 4.0' do
+      assert_integration_with_rails_and 'MiniTest::Unit::TestCase'
+    end
+  end
+
+  if CURRENT_APPRAISAL_NAME == 'rails_3_2'
+    should 'detect ActiveSupport::TestCase and Test::Unit::TestCase w/ Rails 3.2' do
+      assert_integration_with_rails_and 'Test::Unit::TestCase'
+    end
+  end
+
+  if CURRENT_APPRAISAL_NAME == 'rails_3_1'
+    should 'detect ActiveSupport::TestCase and Test::Unit::TestCase w/ Rails 3.1' do
+      assert_integration_with_rails_and 'Test::Unit::TestCase'
+    end
+  end
+
+  if CURRENT_APPRAISAL_NAME == 'rails_3_0'
+    should 'detect ActiveSupport::TestCase and Test::Unit::TestCase w/ Rails 3.0' do
+      assert_integration_with_rails_and 'Test::Unit::TestCase'
+    end
+  end
+
+  if CURRENT_APPRAISAL_NAME == 'minitest_5_x'
+    should 'detect Minitest 5.x when it is loaded standalone' do
+      assert_integration_with 'Minitest::Test', 'Minitest::Unit::TestCase',
+        setup: <<-RUBY
+          require 'minitest/autorun'
+        RUBY
+    end
+  end
+
+  if CURRENT_APPRAISAL_NAME == 'minitest_4_x'
+    should 'detect Minitest 4.x when it is loaded standalone' do
+      assert_integration_with 'MiniTest::Unit::TestCase',
+        setup: <<-RUBY
+          require 'minitest/autorun'
+        RUBY
+    end
+  end
+
+  if CURRENT_APPRAISAL_NAME == 'test_unit'
+    should 'detect the test-unit gem when it is loaded standalone' do
+      assert_integration_with 'Test::Unit::TestCase',
+        setup: <<-RUBY
+          require 'test/unit'
+        RUBY
+    end
+  end
+
+  def assert_integration_with(*test_cases)
+    assert_test_cases_are_detected(*test_cases)
+    assert_our_api_is_available_in_test_cases(*test_cases)
+  end
+
+  def assert_integration_with_rails_and(*test_cases)
+    test_cases = ['ActiveSupport::TestCase'] | test_cases
+    options = test_cases.last.is_a?(Hash) ? test_cases.pop : {}
+    options[:setup] = <<-RUBY
+      require 'rails/all'
+      require 'rails/test_help'
+      ActiveRecord::Base.establish_connection(
+        adapter: 'sqlite3',
+        database: ':memory:'
+      )
+    RUBY
+    args = test_cases + [options]
+
+    assert_integration_with(*args)
+  end
+
+  def assert_test_cases_are_detected(*expected_test_cases)
+    options = expected_test_cases.last.is_a?(Hash) ? expected_test_cases.pop : {}
+    setup = options[:setup] || ''
+    output = execute(file_that_detects_test_framework_test_cases([setup]))
+    actual_test_cases = output.split("\n").first.split(', ')
+    assert_equal expected_test_cases, actual_test_cases
+  end
+
+  def file_that_detects_test_framework_test_cases(mixins)
+    <<-RUBY
+      #{require_gems(mixins)}
+      require 'yaml'
+      test_cases = Shoulda::Context.test_framework_test_cases.map { |test_case| test_case.to_s }
+      puts test_cases.join(', ')
+    RUBY
+  end
+
+  def require_gems(mixins)
+    <<-RUBY
+      ENV['BUNDLE_GEMFILE'] = "#{PROJECT_DIR}/gemfiles/#{CURRENT_APPRAISAL_NAME}.gemfile"
+      require 'bundler'
+      Bundler.setup
+      #{mixins.join("\n")}
+      require 'shoulda-context'
+    RUBY
+  end
+
+  def assert_our_api_is_available_in_test_cases(*test_cases)
+    options = test_cases.last.is_a?(Hash) ? test_cases.pop : {}
+    setup = options[:setup] || ''
+
+    test_cases.each do |test_case|
+      output = execute(file_that_runs_a_test_within_test_case(test_case, [setup]))
+      assert_match /1 (tests|runs)/, output
+      assert_match /1 assertions/, output
+      assert_match /0 failures/, output
+      assert_match /0 errors/, output
+    end
+  end
+
+  def file_that_runs_a_test_within_test_case(test_case, mixins)
+    <<-RUBY
+      #{require_gems(mixins)}
+
+      class FrameworkIntegrationTest < #{test_case}
+        context 'a context' do
+          should 'have a test' do
+            assert_equal true, true
+          end
+        end
+      end
+    RUBY
+  end
+
+  def execute(code)
+    tempfile = Tempfile.new('shoulda-context-test')
+    tempfile.write(code)
+    tempfile.close
+
+    if ENV['DEBUG']
+      puts 'Code:'
+      puts code
+    end
+
+    output = `RUBYOPT='' ruby #{tempfile.path} 2>&1`
+    if ENV['DEBUG']
+      puts 'Output:'
+      puts output
+    end
+    output
+  end
+end

data/test/test_helper.rb

@@ -2,10 +2,15 @@ require 'fileutils'
 require 'test/unit'
 require 'mocha'
 
-shoulda_path = File.join(File.dirname(__FILE__), '..', 'lib')
-$LOAD_PATH << shoulda_path
-require "shoulda/context"
+if ENV['BUNDLE_GEMFILE'].to_s.empty?
+  raise "No Appraisal is specified. Please re-run your tests with BUNDLE_GEMFILE set."
+end
+
+PROJECT_DIR = File.expand_path('../..', __FILE__)
+CURRENT_APPRAISAL_NAME = File.basename(ENV['BUNDLE_GEMFILE'], '.gemfile')
+
+$LOAD_PATH << File.join(PROJECT_DIR, 'lib')
+require 'shoulda/context'
 
 Shoulda.autoload_macros File.join(File.dirname(__FILE__), 'fake_rails_root'),
                         File.join("vendor", "{plugins,gems}", "*")
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-context
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - thoughtbot, inc.
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -102,14 +102,22 @@ files:
 - README.md
 - Rakefile
 - bin/convert_to_should_syntax
-- gemfiles/3.0.gemfile
-- gemfiles/3.0.gemfile.lock
-- gemfiles/3.1.gemfile
-- gemfiles/3.1.gemfile.lock
-- gemfiles/3.2.gemfile
-- gemfiles/3.2.gemfile.lock
-- gemfiles/4.0.gemfile
-- gemfiles/4.0.gemfile.lock
+- gemfiles/minitest_4_x.gemfile
+- gemfiles/minitest_4_x.gemfile.lock
+- gemfiles/minitest_5_x.gemfile
+- gemfiles/minitest_5_x.gemfile.lock
+- gemfiles/rails_3_0.gemfile
+- gemfiles/rails_3_0.gemfile.lock
+- gemfiles/rails_3_1.gemfile
+- gemfiles/rails_3_1.gemfile.lock
+- gemfiles/rails_3_2.gemfile
+- gemfiles/rails_3_2.gemfile.lock
+- gemfiles/rails_4_0.gemfile
+- gemfiles/rails_4_0.gemfile.lock
+- gemfiles/rails_4_1.gemfile
+- gemfiles/rails_4_1.gemfile.lock
+- gemfiles/test_unit.gemfile
+- gemfiles/test_unit.gemfile.lock
 - init.rb
 - lib/shoulda-context.rb
 - lib/shoulda/context.rb
@@ -120,6 +128,7 @@ files:
 - lib/shoulda/context/tasks.rb
 - lib/shoulda/context/tasks/list_tests.rake
 - lib/shoulda/context/tasks/yaml_to_shoulda.rake
+- lib/shoulda/context/test_framework_detection.rb
 - lib/shoulda/context/version.rb
 - rails/init.rb
 - shoulda-context.gemspec
@@ -133,6 +142,7 @@ files:
 - test/shoulda/convert_to_should_syntax_test.rb
 - test/shoulda/helpers_test.rb
 - test/shoulda/should_test.rb
+- test/shoulda/test_framework_detection_test.rb
 - test/test_helper.rb
 homepage: http://thoughtbot.com/community/
 licenses:
@@ -168,4 +178,5 @@ test_files:
 - test/shoulda/convert_to_should_syntax_test.rb
 - test/shoulda/helpers_test.rb
 - test/shoulda/should_test.rb
+- test/shoulda/test_framework_detection_test.rb
 - test/test_helper.rb

data/gemfiles/4.0.gemfile.lock

@@ -1,107 +0,0 @@
-PATH
-  remote: /Users/rmcgeary/work/oss/shoulda-context
-  specs:
-    shoulda-context (1.1.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (4.0.0.rc1)
-      actionpack (= 4.0.0.rc1)
-      mail (~> 2.5.3)
-    actionpack (4.0.0.rc1)
-      activesupport (= 4.0.0.rc1)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.0.rc1)
-      activesupport (= 4.0.0.rc1)
-      builder (~> 3.1.0)
-    activerecord (4.0.0.rc1)
-      activemodel (= 4.0.0.rc1)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0.rc1)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.2)
-    activesupport (4.0.0.rc1)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    appraisal (0.5.2)
-      bundler
-      rake
-    arel (4.0.0)
-    atomic (1.1.9)
-    builder (3.1.4)
-    erubis (2.7.0)
-    hike (1.2.2)
-    i18n (0.6.4)
-    jquery-rails (2.2.1)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.23)
-    minitest (4.7.4)
-    mocha (0.9.12)
-    multi_json (1.7.3)
-    polyglot (0.3.3)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (4.0.0.rc1)
-      actionmailer (= 4.0.0.rc1)
-      actionpack (= 4.0.0.rc1)
-      activerecord (= 4.0.0.rc1)
-      activesupport (= 4.0.0.rc1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0.rc1)
-      sprockets-rails (~> 2.0.0.rc4)
-    railties (4.0.0.rc1)
-      actionpack (= 4.0.0.rc1)
-      activesupport (= 4.0.0.rc1)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.0.4)
-    sass (3.2.9)
-    sass-rails (4.0.0.rc1)
-      railties (>= 4.0.0.beta, < 5.0)
-      sass (>= 3.1.10)
-      sprockets-rails (~> 2.0.0.rc0)
-      tilt (~> 1.3)
-    sprockets (2.9.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0.rc4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    test-unit (2.1.2)
-    thor (0.18.1)
-    thread_safe (0.1.0)
-      atomic
-    tilt (1.4.1)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 0.5)
-  jquery-rails
-  mocha (~> 0.9.10)
-  rails (= 4.0.0.rc1)
-  rake
-  sass-rails (= 4.0.0.rc1)
-  shoulda-context!
-  test-unit (~> 2.1.0)