From 89a257c951ca55d9cfeca3e05707d670af272e8d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Thu, 13 Dec 2012 12:02:21 -0500
Subject: [PATCH] Use minitest-rails only when we actually want to test it.

Some features test the factory_girl_rails integration with minitest-rails.

Other features just test normal integration with rails generators.

When minitest-rails is *always* in our gemfiles, minitest's generator
gets run during the features which generate new rails apps.

Because minitest doesnt support namespaced models, this fails.  But, also,
we don't actually want to run minitest during anything other than the specific
areas where we are testing that integration.

Thus, we need the gem present on the system, but not in the gemfiles during
any times other than when it's pulled in specifically by those features.
---
 .travis.yml | 3 +--
 Appraisals  | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 199dd35..bc36dfe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,7 @@ rvm:
   - jruby-19mode
 before_install:
   - gem update --system
-  - bundle install
-  - bundle exec rake appraisal:install
+  - gem install minitest-rails
 jdk:
   - openjdk6
 gemfile:
diff --git a/Appraisals b/Appraisals
index e23ca67..aba9f35 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,16 +1,13 @@
 appraise "rails3.0" do
   gem "rails", "~> 3.0.17"
-  gem 'minitest-rails', '0.3'
 end
 
 appraise "rails3.1" do
   gem "rails", "~> 3.1.8"
   gem "sqlite3", ">= 1.3.4"
-  gem 'minitest-rails', '0.3'
 end
 
 appraise "rails3.2" do
   gem "rails", "~> 3.2.8"
   gem "sqlite3", ">= 1.3.4"
-  gem 'minitest-rails', '0.3'
 end