From 3aa2c5f624d63d0750a165b6c74bf1cd287059a5 Mon Sep 17 00:00:00 2001
From: Steve Kenworthy <steveyken@gmail.com>
Date: Fri, 23 Nov 2012 10:34:46 +0800
Subject: [PATCH] Removed fuubar gem. This was causing problems with zeus and
 the payoffs with running zeus are higher

---
 .rspec                                          | 2 +-
 Gemfile                                         | 1 -
 Gemfile.lock                                    | 7 -------
 spec/lib/core_ext/{string.rb => string_spec.rb} | 0
 spec/spec_helper.rb                             | 4 ----
 5 files changed, 1 insertion(+), 13 deletions(-)
 rename spec/lib/core_ext/{string.rb => string_spec.rb} (100%)

diff --git a/.rspec b/.rspec
index d0472dde50..794db0b97e 100644
--- a/.rspec
+++ b/.rspec
@@ -1,3 +1,3 @@
 --colour
 --tty
---drb
+--format progress
diff --git a/Gemfile b/Gemfile
index 4deb5e41ea..0ad91bfccd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -58,7 +58,6 @@ group :test do
   gem 'capybara', '~> 1.1' # v2 and up is not r1.8 compatible.
   gem 'spork'
   gem 'database_cleaner'
-  gem 'fuubar'
   gem "acts_as_fu", "~> 0.0.8"
 
   if RUBY_VERSION.to_f >= 1.9
diff --git a/Gemfile.lock b/Gemfile.lock
index 396172e53c..257c0aeabf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,10 +102,6 @@ GEM
       railties (>= 3.0.0)
     ffaker (1.14.0)
     ffi (1.1.5)
-    fuubar (1.0.0)
-      rspec (~> 2.0)
-      rspec-instafail (~> 0.2.0)
-      ruby-progressbar (~> 0.0.10)
     haml (3.1.7)
     headless (0.2.2)
     highline (1.6.11)
@@ -207,7 +203,6 @@ GEM
     rspec-core (2.9.0)
     rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
-    rspec-instafail (0.2.4)
     rspec-mocks (2.9.0)
     rspec-rails (2.9.0)
       actionpack (>= 3.0)
@@ -219,7 +214,6 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    ruby-progressbar (0.0.10)
     rubyzip (0.9.9)
     sass (3.2.1)
     sass-rails (3.2.5)
@@ -291,7 +285,6 @@ DEPENDENCIES
   execjs
   factory_girl_rails (~> 3.0.0)
   ffaker (>= 1.12.0)
-  fuubar
   haml (~> 3)
   headless
   jquery-rails
diff --git a/spec/lib/core_ext/string.rb b/spec/lib/core_ext/string_spec.rb
similarity index 100%
rename from spec/lib/core_ext/string.rb
rename to spec/lib/core_ext/string_spec.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 62d94b9408..d775165399 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -16,7 +16,6 @@
   require File.expand_path("../../config/environment", __FILE__)
   require 'rspec/rails'
   require 'rspec/autorun'
-  require 'fuubar'
 
   require 'acts_as_fu'
   # Load factories
@@ -89,9 +88,6 @@
     #   view.lookup_context.prefixes << 'entities'
     # end
 
-    # Fuubar formatter doesn't work too well on Travis
-    config.formatter = ENV["TRAVIS"] ? :progress : "Fuubar"
-
     # If true, the base class of anonymous controllers will be inferred
     # automatically. This will be the default behavior in future versions of
     # rspec-rails.