diff -Nru ruby-shoulda-context-1.1.2/Appraisals ruby-shoulda-context-1.2.0/Appraisals
--- ruby-shoulda-context-1.1.2/Appraisals	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/Appraisals	2014-04-01 07:58:37.000000000 +0000
@@ -1,21 +1,44 @@
-appraise '3.0' do
-  gem 'rails', '3.0.17'
+appraise 'rails_3_0' do
+  gem 'rails', '~> 3.0.0'
+  gem 'sqlite3'
 end
 
-appraise '3.1' do
-  gem 'rails', '3.1.8'
+appraise 'rails_3_1' do
+  gem 'rails', '~> 3.1.0'
   gem 'jquery-rails'
   gem 'sass-rails'
+  gem 'sqlite3'
 end
 
-appraise '3.2' do
-  gem 'rails', '3.2.9'
+appraise 'rails_3_2' do
+  gem 'rails', '~> 3.2.0'
   gem 'jquery-rails'
   gem 'sass-rails'
+  gem 'sqlite3'
 end
 
-appraise '4.0' do
-  gem 'rails', '4.0.0.rc1'
+appraise 'rails_4_0' do
+  gem 'rails', '~> 4.0.0'
   gem 'jquery-rails'
-  gem 'sass-rails', '4.0.0.rc1'
+  gem 'sass-rails'
+  gem 'sqlite3'
+end
+
+appraise 'rails_4_1' do
+  gem 'rails', github: 'rails/rails', branch: '4-1-stable'
+  gem 'jquery-rails'
+  gem 'sass-rails'
+  gem 'sqlite3'
+end
+
+appraise 'minitest_4_x' do
+  gem 'minitest', '~> 4.0'
+end
+
+appraise 'minitest_5_x' do
+  gem 'minitest', '~> 5.0'
+end
+
+appraise 'test_unit' do
+  gem 'test-unit'
 end
Binary files /tmp/5v1wxhn4Sp/ruby-shoulda-context-1.1.2/checksums.yaml.gz and /tmp/X2qsHcaX8g/ruby-shoulda-context-1.2.0/checksums.yaml.gz differ
diff -Nru ruby-shoulda-context-1.1.2/debian/changelog ruby-shoulda-context-1.2.0/debian/changelog
--- ruby-shoulda-context-1.1.2/debian/changelog	2013-05-22 15:59:28.000000000 +0000
+++ ruby-shoulda-context-1.2.0/debian/changelog	2014-04-01 19:49:43.000000000 +0000
@@ -1,3 +1,26 @@
+ruby-shoulda-context (1.2.0-1) unstable; urgency=medium
+  
+  * Team upload
+
+  [ Praveen Arimbrathodiyil ]
+  * remove libshoulda* in Conflicts
+
+  [ Christian Hofstaedtler ]
+  * Fix typo in package description.
+    Thanks to Pascal De Vuyst (Closes: #739217)
+
+  [ Cédric Boutillier ]
+  * Imported Upstream version 1.2.0
+  * require 'mocha/setup' to correctly initialize mocha (Closes: #743071)
+  * Bump Standards-Version to 3.9.5 (no changes needed)
+  * tests:
+    - simplify Rake task to run tests;
+    - deactivate check for BUNDLE_GEMFILE in tests
+    - deactivate test_framework_detection_test.rb
+    - do not ignore test results anymore
+
+ -- Cédric Boutillier <boutil@debian.org>  Tue, 01 Apr 2014 21:49:34 +0200
+
 ruby-shoulda-context (1.1.2-1) unstable; urgency=low
 
   * Team upload.
diff -Nru ruby-shoulda-context-1.1.2/debian/control ruby-shoulda-context-1.2.0/debian/control
--- ruby-shoulda-context-1.1.2/debian/control	2013-05-22 15:58:38.000000000 +0000
+++ ruby-shoulda-context-1.2.0/debian/control	2014-04-01 07:41:20.000000000 +0000
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
 Uploaders: Antonio Terceiro <terceiro@softwarelivre.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), rake, ruby-mocha, ruby-test-unit
-Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), rake, ruby-mocha (>= 0.13~), ruby-test-unit
+Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-shoulda-context.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-shoulda-context.git;a=summary
 Homepage: https://github.com/thoughtbot/shoulda-context
@@ -14,11 +14,10 @@
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Conflicts: libshoulda-ruby (<< 3.0.0~beta2-1~), libshoulda-ruby1.8 (<< 3.0.0~beta2-1)
 Description: context framework for Test::Unit
  Shoulda’s contexts make it easy to write understandable and maintainable
  tests for Test::Unit. It’s fully compatible with your existing tests in
  Test::Unit, and requires no retooling to use.
  .
  This package provides shoulda-context, a context framework for Test::Unit that
- was is extracted from (and is used by) shoulda.
+ was extracted from (and is used by) shoulda.
diff -Nru ruby-shoulda-context-1.1.2/debian/patches/deactivate_appraisal.patch ruby-shoulda-context-1.2.0/debian/patches/deactivate_appraisal.patch
--- ruby-shoulda-context-1.1.2/debian/patches/deactivate_appraisal.patch	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/debian/patches/deactivate_appraisal.patch	2014-04-01 11:12:28.000000000 +0000
@@ -0,0 +1,25 @@
+Description: deactivate the check for BUNDLE_GEMFILE
+ it is used in test_framework_detection_test.rb, which is deactivated
+ See debian/ruby-tests.rake
+Author: Cédric Boutillier <boutil@debian.org>
+Last-Update: 2014-04-01
+
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -2,12 +2,12 @@
+ require 'test/unit'
+ require 'mocha/setup'
+ 
+-if ENV['BUNDLE_GEMFILE'].to_s.empty?
+-  raise "No Appraisal is specified. Please re-run your tests with BUNDLE_GEMFILE set."
+-end
++#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')
++#CURRENT_APPRAISAL_NAME = File.basename(ENV['BUNDLE_GEMFILE'], '.gemfile')
+ 
+ $LOAD_PATH << File.join(PROJECT_DIR, 'lib')
+ require 'shoulda/context'
diff -Nru ruby-shoulda-context-1.1.2/debian/patches/require_mocha_setup.patch ruby-shoulda-context-1.2.0/debian/patches/require_mocha_setup.patch
--- ruby-shoulda-context-1.1.2/debian/patches/require_mocha_setup.patch	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/debian/patches/require_mocha_setup.patch	2014-04-01 08:01:06.000000000 +0000
@@ -0,0 +1,16 @@
+Description: initialise mocha by requiring mocha/setup
+ This is the correct way since ruby-mocha 0.13 
+Author: Cédric Boutillier <boutil@debian.org>
+Bug-Debian: http://bugs.debian.org/743071
+Last-Update: 2014-04-01
+
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -1,6 +1,6 @@
+ require 'fileutils'
+ require 'test/unit'
+-require 'mocha'
++require 'mocha/setup'
+ 
+ if ENV['BUNDLE_GEMFILE'].to_s.empty?
+   raise "No Appraisal is specified. Please re-run your tests with BUNDLE_GEMFILE set."
diff -Nru ruby-shoulda-context-1.1.2/debian/patches/series ruby-shoulda-context-1.2.0/debian/patches/series
--- ruby-shoulda-context-1.1.2/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/debian/patches/series	2014-04-01 11:11:04.000000000 +0000
@@ -0,0 +1,2 @@
+require_mocha_setup.patch
+deactivate_appraisal.patch
diff -Nru ruby-shoulda-context-1.1.2/debian/ruby-shoulda-context.lintian-overrides ruby-shoulda-context-1.2.0/debian/ruby-shoulda-context.lintian-overrides
--- ruby-shoulda-context-1.1.2/debian/ruby-shoulda-context.lintian-overrides	2013-05-22 15:45:07.000000000 +0000
+++ ruby-shoulda-context-1.2.0/debian/ruby-shoulda-context.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# Upstread does not provide a changelog file
-ruby-shoulda-context: no-upstream-changelog
diff -Nru ruby-shoulda-context-1.1.2/debian/ruby-tests.rake ruby-shoulda-context-1.2.0/debian/ruby-tests.rake
--- ruby-shoulda-context-1.1.2/debian/ruby-tests.rake	2013-05-22 15:24:40.000000000 +0000
+++ ruby-shoulda-context-1.2.0/debian/ruby-tests.rake	2014-04-01 11:08:52.000000000 +0000
@@ -2,12 +2,9 @@
 
 require 'rake/testtask'
 
-test_files_pattern = 'test/**/*_test.rb'
 Rake::TestTask.new do |t|
-  t.libs << 'debian/ruby-shoulda-context/usr/lib/ruby/vendor_ruby'
   t.libs << 'test'
-  t.pattern = test_files_pattern
-  t.verbose = false
+  t.test_files = FileList['test/**/*_test.rb'].exclude('test/shoulda/test_framework_detection_test.rb')
 end
 
 task :default => :test
diff -Nru ruby-shoulda-context-1.1.2/debian/rules ruby-shoulda-context-1.2.0/debian/rules
--- ruby-shoulda-context-1.1.2/debian/rules	2013-05-22 15:24:40.000000000 +0000
+++ ruby-shoulda-context-1.2.0/debian/rules	2014-04-01 11:14:35.000000000 +0000
@@ -1,11 +1,6 @@
 #!/usr/bin/make -f
 
-# Ignore failure in ruby1.9.1 tests for now. Although shoulda-context does work
-# with ruby1.9.1, its test suite depends heavily on the internals of
-# Test::Unit, which was replaced by minitest in ruby1.9.1
-#
-# See details at https://github.com/thoughtbot/shoulda/issues/168
-export DH_RUBY_IGNORE_TESTS=ruby1.9.1
+#export DH_RUBY_IGNORE_TESTS=all
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/3.0.gemfile ruby-shoulda-context-1.2.0/gemfiles/3.0.gemfile
--- ruby-shoulda-context-1.1.2/gemfiles/3.0.gemfile	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/3.0.gemfile	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "3.0.17"
-
-gemspec :path=>"../"
\ No newline at end of file
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/3.0.gemfile.lock ruby-shoulda-context-1.2.0/gemfiles/3.0.gemfile.lock
--- ruby-shoulda-context-1.1.2/gemfiles/3.0.gemfile.lock	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/3.0.gemfile.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-PATH
-  remote: /Users/rmcgeary/work/oss/shoulda-context
-  specs:
-    shoulda-context (1.1.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.17)
-      actionpack (= 3.0.17)
-      mail (~> 2.2.19)
-    actionpack (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.5)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.17)
-      activesupport (= 3.0.17)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
-    activesupport (3.0.17)
-    appraisal (0.5.2)
-      bundler
-      rake
-    arel (2.0.10)
-    builder (2.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    json (1.8.0)
-    mail (2.2.20)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.23)
-    mocha (0.9.12)
-    polyglot (0.3.3)
-    rack (1.2.8)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.17)
-      actionmailer (= 3.0.17)
-      actionpack (= 3.0.17)
-      activerecord (= 3.0.17)
-      activeresource (= 3.0.17)
-      activesupport (= 3.0.17)
-      bundler (~> 1.0)
-      railties (= 3.0.17)
-    railties (3.0.17)
-      actionpack (= 3.0.17)
-      activesupport (= 3.0.17)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    test-unit (2.1.2)
-    thor (0.14.6)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 0.5)
-  mocha (~> 0.9.10)
-  rails (= 3.0.17)
-  rake
-  shoulda-context!
-  test-unit (~> 2.1.0)
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/3.1.gemfile ruby-shoulda-context-1.2.0/gemfiles/3.1.gemfile
--- ruby-shoulda-context-1.1.2/gemfiles/3.1.gemfile	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/3.1.gemfile	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "3.1.8"
-gem "jquery-rails"
-gem "sass-rails"
-
-gemspec :path=>"../"
\ No newline at end of file
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/3.1.gemfile.lock ruby-shoulda-context-1.2.0/gemfiles/3.1.gemfile.lock
--- ruby-shoulda-context-1.1.2/gemfiles/3.1.gemfile.lock	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/3.1.gemfile.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,112 +0,0 @@
-PATH
-  remote: /Users/rmcgeary/work/oss/shoulda-context
-  specs:
-    shoulda-context (1.1.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.1.8)
-      actionpack (= 3.1.8)
-      mail (~> 2.3.3)
-    actionpack (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
-    activemodel (3.1.8)
-      activesupport (= 3.1.8)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
-    activesupport (3.1.8)
-      multi_json (>= 1.0, < 1.3)
-    appraisal (0.5.2)
-      bundler
-      rake
-    arel (2.2.3)
-    builder (3.0.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)
-    json (1.8.0)
-    mail (2.3.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.23)
-    mocha (0.9.12)
-    multi_json (1.2.0)
-    polyglot (0.3.3)
-    rack (1.3.10)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.1.8)
-      actionmailer (= 3.1.8)
-      actionpack (= 3.1.8)
-      activerecord (= 3.1.8)
-      activeresource (= 3.1.8)
-      activesupport (= 3.1.8)
-      bundler (~> 1.0)
-      railties (= 3.1.8)
-    railties (3.1.8)
-      actionpack (= 3.1.8)
-      activesupport (= 3.1.8)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    sass (3.2.9)
-    sass-rails (3.1.0)
-      actionpack (~> 3.1.0)
-      railties (~> 3.1.0)
-      sass (>= 3.1.4)
-    sprockets (2.0.4)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    test-unit (2.1.2)
-    thor (0.14.6)
-    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 (= 3.1.8)
-  rake
-  sass-rails
-  shoulda-context!
-  test-unit (~> 2.1.0)
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/3.2.gemfile ruby-shoulda-context-1.2.0/gemfiles/3.2.gemfile
--- ruby-shoulda-context-1.1.2/gemfiles/3.2.gemfile	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/3.2.gemfile	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "3.2.9"
-gem "jquery-rails"
-gem "sass-rails"
-
-gemspec :path=>"../"
\ No newline at end of file
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/3.2.gemfile.lock ruby-shoulda-context-1.2.0/gemfiles/3.2.gemfile.lock
--- ruby-shoulda-context-1.1.2/gemfiles/3.2.gemfile.lock	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/3.2.gemfile.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-PATH
-  remote: /Users/rmcgeary/work/oss/shoulda-context
-  specs:
-    shoulda-context (1.1.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
-      mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
-      builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    appraisal (0.5.2)
-      bundler
-      rake
-    arel (3.0.2)
-    builder (3.0.4)
-    erubis (2.7.0)
-    hike (1.2.2)
-    i18n (0.6.4)
-    journey (1.0.4)
-    jquery-rails (2.2.1)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.8.0)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.23)
-    mocha (0.9.12)
-    multi_json (1.7.3)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
-      bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    sass (3.2.9)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    test-unit (2.1.2)
-    thor (0.18.1)
-    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 (= 3.2.9)
-  rake
-  sass-rails
-  shoulda-context!
-  test-unit (~> 2.1.0)
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/4.0.gemfile ruby-shoulda-context-1.2.0/gemfiles/4.0.gemfile
--- ruby-shoulda-context-1.1.2/gemfiles/4.0.gemfile	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/4.0.gemfile	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "4.0.0.rc1"
-gem "jquery-rails"
-gem "sass-rails", "4.0.0.rc1"
-
-gemspec :path=>"../"
\ No newline at end of file
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/4.0.gemfile.lock ruby-shoulda-context-1.2.0/gemfiles/4.0.gemfile.lock
--- ruby-shoulda-context-1.1.2/gemfiles/4.0.gemfile.lock	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/4.0.gemfile.lock	1970-01-01 00:00:00.000000000 +0000
@@ -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)
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/minitest_4_x.gemfile ruby-shoulda-context-1.2.0/gemfiles/minitest_4_x.gemfile
--- ruby-shoulda-context-1.1.2/gemfiles/minitest_4_x.gemfile	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/minitest_4_x.gemfile	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "minitest", "~> 4.0"
+
+gemspec :path=>"../"
\ No newline at end of file
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/minitest_4_x.gemfile.lock ruby-shoulda-context-1.2.0/gemfiles/minitest_4_x.gemfile.lock
--- ruby-shoulda-context-1.1.2/gemfiles/minitest_4_x.gemfile.lock	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/minitest_4_x.gemfile.lock	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,96 @@
+PATH
+  remote: ../
+  specs:
+    shoulda-context (1.1.6)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (4.0.3)
+      actionpack (= 4.0.3)
+      mail (~> 2.5.4)
+    actionpack (4.0.3)
+      activesupport (= 4.0.3)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.3)
+      activesupport (= 4.0.3)
+      builder (~> 3.1.0)
+    activerecord (4.0.3)
+      activemodel (= 4.0.3)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.3)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.3)
+      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.2)
+    atomic (1.1.16)
+    builder (3.1.4)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.9)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    minitest (4.7.5)
+    mocha (0.9.12)
+    multi_json (1.9.2)
+    polyglot (0.3.4)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.3)
+      actionmailer (= 4.0.3)
+      actionpack (= 4.0.3)
+      activerecord (= 4.0.3)
+      activesupport (= 4.0.3)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.3)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.3)
+      actionpack (= 4.0.3)
+      activesupport (= 4.0.3)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.2.1)
+    sprockets (2.12.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    test-unit (2.1.2)
+    thor (0.19.1)
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.38)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.5)
+  minitest (~> 4.0)
+  mocha (~> 0.9.10)
+  rails (>= 3.0)
+  rake
+  shoulda-context!
+  test-unit (~> 2.1.0)
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/minitest_5_x.gemfile ruby-shoulda-context-1.2.0/gemfiles/minitest_5_x.gemfile
--- ruby-shoulda-context-1.1.2/gemfiles/minitest_5_x.gemfile	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/minitest_5_x.gemfile	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "minitest", "~> 5.0"
+
+gemspec :path=>"../"
\ No newline at end of file
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/minitest_5_x.gemfile.lock ruby-shoulda-context-1.2.0/gemfiles/minitest_5_x.gemfile.lock
--- ruby-shoulda-context-1.1.2/gemfiles/minitest_5_x.gemfile.lock	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/minitest_5_x.gemfile.lock	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,102 @@
+PATH
+  remote: ../
+  specs:
+    shoulda-context (1.1.6)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (3.0.3)
+    builder (3.0.4)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.8.1)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    minitest (5.3.1)
+    mocha (0.9.12)
+    multi_json (1.9.2)
+    polyglot (0.3.4)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
+      bundler (~> 1.0)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.2.1)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    test-unit (2.1.2)
+    thor (0.19.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.38)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.5)
+  minitest (~> 5.0)
+  mocha (~> 0.9.10)
+  rails (>= 3.0)
+  rake
+  shoulda-context!
+  test-unit (~> 2.1.0)
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/rails_3_0.gemfile ruby-shoulda-context-1.2.0/gemfiles/rails_3_0.gemfile
--- ruby-shoulda-context-1.1.2/gemfiles/rails_3_0.gemfile	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/rails_3_0.gemfile	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 3.0.0"
+gem "sqlite3"
+
+gemspec :path=>"../"
\ No newline at end of file
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/rails_3_0.gemfile.lock ruby-shoulda-context-1.2.0/gemfiles/rails_3_0.gemfile.lock
--- ruby-shoulda-context-1.1.2/gemfiles/rails_3_0.gemfile.lock	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/rails_3_0.gemfile.lock	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,93 @@
+PATH
+  remote: ../
+  specs:
+    shoulda-context (1.1.6)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.20)
+      actionpack (= 3.0.20)
+      mail (~> 2.2.19)
+    actionpack (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+    activesupport (3.0.20)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (2.0.10)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.3)
+    json (1.8.1)
+    mail (2.2.20)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    mocha (0.9.12)
+    polyglot (0.3.4)
+    rack (1.2.8)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.20)
+      actionmailer (= 3.0.20)
+      actionpack (= 3.0.20)
+      activerecord (= 3.0.20)
+      activeresource (= 3.0.20)
+      activesupport (= 3.0.20)
+      bundler (~> 1.0)
+      railties (= 3.0.20)
+    railties (3.0.20)
+      actionpack (= 3.0.20)
+      activesupport (= 3.0.20)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (10.2.1)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    sqlite3 (1.3.9)
+    test-unit (2.1.2)
+    thor (0.14.6)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.38)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.5)
+  mocha (~> 0.9.10)
+  rails (~> 3.0.0)
+  rake
+  shoulda-context!
+  sqlite3
+  test-unit (~> 2.1.0)
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/rails_3_1.gemfile ruby-shoulda-context-1.2.0/gemfiles/rails_3_1.gemfile
--- ruby-shoulda-context-1.1.2/gemfiles/rails_3_1.gemfile	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/rails_3_1.gemfile	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 3.1.0"
+gem "jquery-rails"
+gem "sass-rails"
+gem "sqlite3"
+
+gemspec :path=>"../"
\ No newline at end of file
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/rails_3_1.gemfile.lock ruby-shoulda-context-1.2.0/gemfiles/rails_3_1.gemfile.lock
--- ruby-shoulda-context-1.1.2/gemfiles/rails_3_1.gemfile.lock	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/rails_3_1.gemfile.lock	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,114 @@
+PATH
+  remote: ../
+  specs:
+    shoulda-context (1.1.6)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.12)
+      actionpack (= 3.1.12)
+      mail (~> 2.4.4)
+    actionpack (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.12)
+      activesupport (= 3.1.12)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
+    activesupport (3.1.12)
+      multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (2.2.3)
+    builder (3.0.4)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.9)
+    jquery-rails (3.1.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.1)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    mocha (0.9.12)
+    multi_json (1.9.2)
+    polyglot (0.3.4)
+    rack (1.3.10)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.1.12)
+      actionmailer (= 3.1.12)
+      actionpack (= 3.1.12)
+      activerecord (= 3.1.12)
+      activeresource (= 3.1.12)
+      activesupport (= 3.1.12)
+      bundler (~> 1.0)
+      railties (= 3.1.12)
+    railties (3.1.12)
+      actionpack (= 3.1.12)
+      activesupport (= 3.1.12)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (10.2.1)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    sass (3.3.4)
+    sass-rails (3.1.0)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
+      sass (>= 3.1.4)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.9)
+    test-unit (2.1.2)
+    thor (0.14.6)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.38)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.5)
+  jquery-rails
+  mocha (~> 0.9.10)
+  rails (~> 3.1.0)
+  rake
+  sass-rails
+  shoulda-context!
+  sqlite3
+  test-unit (~> 2.1.0)
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/rails_3_2.gemfile ruby-shoulda-context-1.2.0/gemfiles/rails_3_2.gemfile
--- ruby-shoulda-context-1.1.2/gemfiles/rails_3_2.gemfile	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/rails_3_2.gemfile	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 3.2.0"
+gem "jquery-rails"
+gem "sass-rails"
+gem "sqlite3"
+
+gemspec :path=>"../"
\ No newline at end of file
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/rails_3_2.gemfile.lock ruby-shoulda-context-1.2.0/gemfiles/rails_3_2.gemfile.lock
--- ruby-shoulda-context-1.1.2/gemfiles/rails_3_2.gemfile.lock	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/rails_3_2.gemfile.lock	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,112 @@
+PATH
+  remote: ../
+  specs:
+    shoulda-context (1.1.6)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (3.0.3)
+    builder (3.0.4)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.1)
+    journey (1.0.4)
+    jquery-rails (3.1.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.1)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    mocha (0.9.12)
+    multi_json (1.9.2)
+    polyglot (0.3.4)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
+      bundler (~> 1.0)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.2.1)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    sass (3.3.4)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.9)
+    test-unit (2.1.2)
+    thor (0.19.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.38)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.5)
+  jquery-rails
+  mocha (~> 0.9.10)
+  rails (~> 3.2.0)
+  rake
+  sass-rails
+  shoulda-context!
+  sqlite3
+  test-unit (~> 2.1.0)
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/rails_4_0.gemfile ruby-shoulda-context-1.2.0/gemfiles/rails_4_0.gemfile
--- ruby-shoulda-context-1.1.2/gemfiles/rails_4_0.gemfile	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/rails_4_0.gemfile	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+gem "jquery-rails"
+gem "sass-rails"
+gem "sqlite3"
+
+gemspec :path=>"../"
\ No newline at end of file
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/rails_4_0.gemfile.lock ruby-shoulda-context-1.2.0/gemfiles/rails_4_0.gemfile.lock
--- ruby-shoulda-context-1.1.2/gemfiles/rails_4_0.gemfile.lock	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/rails_4_0.gemfile.lock	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,107 @@
+PATH
+  remote: ../
+  specs:
+    shoulda-context (1.1.6)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (4.0.3)
+      actionpack (= 4.0.3)
+      mail (~> 2.5.4)
+    actionpack (4.0.3)
+      activesupport (= 4.0.3)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.3)
+      activesupport (= 4.0.3)
+      builder (~> 3.1.0)
+    activerecord (4.0.3)
+      activemodel (= 4.0.3)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.3)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.3)
+      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.2)
+    atomic (1.1.16)
+    builder (3.1.4)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.9)
+    jquery-rails (3.1.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    minitest (4.7.5)
+    mocha (0.9.12)
+    multi_json (1.9.2)
+    polyglot (0.3.4)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.3)
+      actionmailer (= 4.0.3)
+      actionpack (= 4.0.3)
+      activerecord (= 4.0.3)
+      activesupport (= 4.0.3)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.3)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.3)
+      actionpack (= 4.0.3)
+      activesupport (= 4.0.3)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.2.1)
+    sass (3.3.4)
+    sass-rails (4.0.1)
+      railties (>= 4.0.0, < 5.0)
+      sass (>= 3.1.10)
+      sprockets-rails (~> 2.0.0)
+    sprockets (2.12.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.9)
+    test-unit (2.1.2)
+    thor (0.19.1)
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.38)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.5)
+  jquery-rails
+  mocha (~> 0.9.10)
+  rails (~> 4.0.0)
+  rake
+  sass-rails
+  shoulda-context!
+  sqlite3
+  test-unit (~> 2.1.0)
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/rails_4_1.gemfile ruby-shoulda-context-1.2.0/gemfiles/rails_4_1.gemfile
--- ruby-shoulda-context-1.1.2/gemfiles/rails_4_1.gemfile	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/rails_4_1.gemfile	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", :github=>"rails/rails", :branch=>"4-1-stable"
+gem "jquery-rails"
+gem "sass-rails"
+gem "sqlite3"
+
+gemspec :path=>"../"
\ No newline at end of file
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/rails_4_1.gemfile.lock ruby-shoulda-context-1.2.0/gemfiles/rails_4_1.gemfile.lock
--- ruby-shoulda-context-1.1.2/gemfiles/rails_4_1.gemfile.lock	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/rails_4_1.gemfile.lock	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,119 @@
+GIT
+  remote: git://github.com/rails/rails.git
+  revision: 5ac4d6e8dd6f11b3291ce85d455ab5aff0abdbfe
+  branch: 4-1-stable
+  specs:
+    actionmailer (4.1.0.rc1)
+      actionpack (= 4.1.0.rc1)
+      actionview (= 4.1.0.rc1)
+      mail (~> 2.5.4)
+    actionpack (4.1.0.rc1)
+      actionview (= 4.1.0.rc1)
+      activesupport (= 4.1.0.rc1)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.0.rc1)
+      activesupport (= 4.1.0.rc1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.0.rc1)
+      activesupport (= 4.1.0.rc1)
+      builder (~> 3.1)
+    activerecord (4.1.0.rc1)
+      activemodel (= 4.1.0.rc1)
+      activesupport (= 4.1.0.rc1)
+      arel (~> 5.0.0)
+    activesupport (4.1.0.rc1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    rails (4.1.0.rc1)
+      actionmailer (= 4.1.0.rc1)
+      actionpack (= 4.1.0.rc1)
+      actionview (= 4.1.0.rc1)
+      activemodel (= 4.1.0.rc1)
+      activerecord (= 4.1.0.rc1)
+      activesupport (= 4.1.0.rc1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.0.rc1)
+      sprockets-rails (~> 2.0.0)
+    railties (4.1.0.rc1)
+      actionpack (= 4.1.0.rc1)
+      activesupport (= 4.1.0.rc1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+
+PATH
+  remote: ../
+  specs:
+    shoulda-context (1.1.6)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (5.0.0)
+    atomic (1.1.16)
+    builder (3.2.2)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.9)
+    jquery-rails (3.1.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.1)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    minitest (5.3.1)
+    mocha (0.9.12)
+    multi_json (1.9.2)
+    polyglot (0.3.4)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.2.1)
+    sass (3.3.4)
+    sass-rails (4.0.1)
+      railties (>= 4.0.0, < 5.0)
+      sass (>= 3.1.10)
+      sprockets-rails (~> 2.0.0)
+    sprockets (2.12.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.9)
+    test-unit (2.1.2)
+    thor (0.19.1)
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.5)
+  jquery-rails
+  mocha (~> 0.9.10)
+  rails!
+  rake
+  sass-rails
+  shoulda-context!
+  sqlite3
+  test-unit (~> 2.1.0)
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/test_unit.gemfile ruby-shoulda-context-1.2.0/gemfiles/test_unit.gemfile
--- ruby-shoulda-context-1.1.2/gemfiles/test_unit.gemfile	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/test_unit.gemfile	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "test-unit"
+
+gemspec :path=>"../"
\ No newline at end of file
diff -Nru ruby-shoulda-context-1.1.2/gemfiles/test_unit.gemfile.lock ruby-shoulda-context-1.2.0/gemfiles/test_unit.gemfile.lock
--- ruby-shoulda-context-1.1.2/gemfiles/test_unit.gemfile.lock	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/gemfiles/test_unit.gemfile.lock	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1,95 @@
+PATH
+  remote: ../
+  specs:
+    shoulda-context (1.1.6)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (4.0.3)
+      actionpack (= 4.0.3)
+      mail (~> 2.5.4)
+    actionpack (4.0.3)
+      activesupport (= 4.0.3)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.3)
+      activesupport (= 4.0.3)
+      builder (~> 3.1.0)
+    activerecord (4.0.3)
+      activemodel (= 4.0.3)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.3)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.3)
+      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.2)
+    atomic (1.1.16)
+    builder (3.1.4)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.9)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    minitest (4.7.5)
+    mocha (0.9.12)
+    multi_json (1.9.2)
+    polyglot (0.3.4)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.3)
+      actionmailer (= 4.0.3)
+      actionpack (= 4.0.3)
+      activerecord (= 4.0.3)
+      activesupport (= 4.0.3)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.3)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.3)
+      actionpack (= 4.0.3)
+      activesupport (= 4.0.3)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.2.1)
+    sprockets (2.12.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    test-unit (2.5.5)
+    thor (0.19.1)
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.38)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.5)
+  mocha (~> 0.9.10)
+  rails (>= 3.0)
+  rake
+  shoulda-context!
+  test-unit
diff -Nru ruby-shoulda-context-1.1.2/lib/shoulda/context/assertions.rb ruby-shoulda-context-1.2.0/lib/shoulda/context/assertions.rb
--- ruby-shoulda-context-1.1.2/lib/shoulda/context/assertions.rb	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/lib/shoulda/context/assertions.rb	2014-04-01 07:58:37.000000000 +0000
@@ -52,14 +52,14 @@
         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 @@
         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 = "assert_block failed.", &block)
+        if respond_to?(:assert_block)
+          assert_block message, &block
+        else
+          assert yield, message
         end
       end
     end
diff -Nru ruby-shoulda-context-1.1.2/lib/shoulda/context/context.rb ruby-shoulda-context-1.2.0/lib/shoulda/context/context.rb
--- ruby-shoulda-context-1.1.2/lib/shoulda/context/context.rb	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/lib/shoulda/context/context.rb	2014-04-01 07:58:37.000000000 +0000
@@ -318,7 +318,12 @@
       end
 
       def merge_block(&blk)
-        blk.bind(self).call
+        if self.respond_to?(:instance_exec)
+          self.instance_exec(&blk)
+        else
+          # deprecated in Rails 4.x
+          blk.bind(self).call
+        end
       end
 
       def context(name, &blk)
@@ -382,10 +387,10 @@
       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
-          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
@@ -395,9 +400,21 @@
           @shoulda_context = context
           begin
             context.run_parent_setup_blocks(self)
-            should[:before].bind(self).call if should[:before]
+            if should[:before]
+              if self.respond_to?(:instance_exec)
+                self.instance_exec(&should[:before])
+              else
+                # deprecated in Rails 4.x
+                should[:before].bind(self).call
+              end
+            end
             context.run_current_setup_blocks(self)
-            should[:block].bind(self).call
+            if self.respond_to?(:instance_exec)
+              self.instance_exec(&should[:block])
+            else
+              # deprecated in Rails 4.x
+              should[:block].bind(self).call
+            end
           ensure
             context.run_all_teardown_blocks(self)
           end
@@ -415,13 +432,23 @@
 
       def run_current_setup_blocks(binding)
         setup_blocks.each do |setup_block|
-          setup_block.bind(binding).call
+          if binding.respond_to?(:instance_exec)
+            binding.instance_exec(&setup_block)
+          else
+            # deprecated in Rails 4.x
+            setup_block.bind(binding).call
+          end
         end
       end
 
       def run_all_teardown_blocks(binding)
         teardown_blocks.reverse.each do |teardown_block|
-          teardown_block.bind(binding).call
+          if binding.respond_to?(:instance_exec)
+            binding.instance_exec(&teardown_block)
+          else
+            # deprecated in Rails 4.x
+            teardown_block.bind(binding).call
+          end
         end
         self.parent.run_all_teardown_blocks(binding) if am_subcontext?
       end
@@ -443,10 +470,19 @@
         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
+
+class DuplicateTestError < RuntimeError; end
diff -Nru ruby-shoulda-context-1.1.2/lib/shoulda/context/test_framework_detection.rb ruby-shoulda-context-1.2.0/lib/shoulda/context/test_framework_detection.rb
--- ruby-shoulda-context-1.1.2/lib/shoulda/context/test_framework_detection.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/lib/shoulda/context/test_framework_detection.rb	2014-04-01 07:58:37.000000000 +0000
@@ -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
diff -Nru ruby-shoulda-context-1.1.2/lib/shoulda/context/version.rb ruby-shoulda-context-1.2.0/lib/shoulda/context/version.rb
--- ruby-shoulda-context-1.1.2/lib/shoulda/context/version.rb	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/lib/shoulda/context/version.rb	2014-04-01 07:58:37.000000000 +0000
@@ -1,5 +1,5 @@
 module Shoulda
   module Context
-    VERSION = '1.1.2'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end
diff -Nru ruby-shoulda-context-1.1.2/lib/shoulda/context.rb ruby-shoulda-context-1.2.0/lib/shoulda/context.rb
--- ruby-shoulda-context-1.1.2/lib/shoulda/context.rb	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/lib/shoulda/context.rb	2014-04-01 07:58:37.000000000 +0000
@@ -1,26 +1,10 @@
-begin
-  # if present, then also loads MiniTest::Unit::TestCase
-  ActiveSupport::TestCase
-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
-  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'
 require 'shoulda/context/context'
 require 'shoulda/context/autoload_macros'
 
-
 module ShouldaContextLoadable
   def self.included(base)
     base.class_eval do
@@ -31,4 +15,6 @@
   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
diff -Nru ruby-shoulda-context-1.1.2/metadata.yml ruby-shoulda-context-1.2.0/metadata.yml
--- ruby-shoulda-context-1.1.2/metadata.yml	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/metadata.yml	2014-04-01 07:58:37.000000000 +0000
@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-context
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - thoughtbot, inc.
@@ -13,78 +13,78 @@
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2014-03-31 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:
@@ -93,6 +93,7 @@
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-version
 - .travis.yml
 - Appraisals
 - CONTRIBUTING.md
@@ -101,14 +102,22 @@
 - 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
@@ -119,6 +128,7 @@
 - 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
@@ -132,6 +142,7 @@
 - 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:
@@ -143,12 +154,12 @@
 - 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: []
@@ -167,4 +178,5 @@
 - 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
diff -Nru ruby-shoulda-context-1.1.2/.ruby-version ruby-shoulda-context-1.2.0/.ruby-version
--- ruby-shoulda-context-1.1.2/.ruby-version	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/.ruby-version	2014-04-01 07:58:37.000000000 +0000
@@ -0,0 +1 @@
+2.0.0-p247
diff -Nru ruby-shoulda-context-1.1.2/test/shoulda/should_test.rb ruby-shoulda-context-1.2.0/test/shoulda/should_test.rb
--- ruby-shoulda-context-1.1.2/test/shoulda/should_test.rb	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/test/shoulda/should_test.rb	2014-04-01 07:58:37.000000000 +0000
@@ -46,7 +46,6 @@
   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,17 @@
     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
+    assert_raise DuplicateTestError do
+      context.build
+    end
+  end
+
   # Should statements
 
   def test_should_have_should_hashes_when_given_should_statements
diff -Nru ruby-shoulda-context-1.1.2/test/shoulda/test_framework_detection_test.rb ruby-shoulda-context-1.2.0/test/shoulda/test_framework_detection_test.rb
--- ruby-shoulda-context-1.1.2/test/shoulda/test_framework_detection_test.rb	1970-01-01 00:00:00.000000000 +0000
+++ ruby-shoulda-context-1.2.0/test/shoulda/test_framework_detection_test.rb	2014-04-01 07:58:37.000000000 +0000
@@ -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
diff -Nru ruby-shoulda-context-1.1.2/test/test_helper.rb ruby-shoulda-context-1.2.0/test/test_helper.rb
--- ruby-shoulda-context-1.1.2/test/test_helper.rb	2013-05-22 15:23:29.000000000 +0000
+++ ruby-shoulda-context-1.2.0/test/test_helper.rb	2014-04-01 07:58:37.000000000 +0000
@@ -2,10 +2,15 @@
 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}", "*")
-