From e890d73de7d52ada9f0e9f38dcce2d896c086c92 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Wed, 26 Jan 2011 11:52:14 -0800
Subject: [PATCH] Remove mocha

---
 Gemfile                | 3 +--
 Gemfile.lock           | 3 ---
 spec/helper_methods.rb | 9 ---------
 spec/spec_helper.rb    | 3 ---
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1c8bc4784..24ec75a72 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,7 @@ gem 'thin', '1.2.7', :require => false
 gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket', :ref => 'e278f5a1c4db60be7485'
 
 #File uploading
-gem 'carrierwave', :git => 'git://github.com/recruitmilitary/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
+gem 'carrierwave', :git => 'git://github.com/recruitmilitary/carrierwave.git' , :branch => 'master'
 gem 'mini_magick', '3.2'
 gem 'aws', '2.3.32' # upgrade to 2.4 breaks 1.8 >.<
 gem 'fastercsv', '1.5.4', :require => false
@@ -64,7 +64,6 @@ group :test do
   gem 'cucumber-rails', '0.3.2'
   gem 'rspec', '>= 2.0.0'
   gem 'rspec-rails', '>= 2.0.0'
-  gem 'mocha'
   gem 'database_cleaner', '0.6.0'
   gem 'webmock', :require => false
   gem 'jasmine', :path => 'vendor/gems/jasmine', :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index 2f35328ca..60837bd83 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -204,8 +204,6 @@ GEM
     mixlib-cli (1.2.0)
     mixlib-config (1.1.2)
     mixlib-log (1.2.0)
-    mocha (0.9.10)
-      rake
     moneta (0.6.0)
     mongrel (1.1.5)
       cgi_multipart_eof_fix (>= 2.4)
@@ -383,7 +381,6 @@ DEPENDENCIES
   json (= 1.4.6)
   launchy
   mini_magick (= 3.2)
-  mocha
   mongrel
   mysql2 (= 0.2.6)
   nokogiri (= 1.4.3.1)
diff --git a/spec/helper_methods.rb b/spec/helper_methods.rb
index 89c02ec43..4e1f51830 100644
--- a/spec/helper_methods.rb
+++ b/spec/helper_methods.rb
@@ -1,13 +1,4 @@
 module HelperMethods
-
-  def stub_comment_signature_verification
-    Comment.any_instance.stubs(:verify_signature).returns(true)
-  end
-
-  def unstub_mocha_stubs
-    Mocha::Mockery.instance.stubba.unstub_all
-  end
-
   def connect_users_with_aspects(u1,u2)
     connect_users(u1, u1.aspects.first, u2, u2.aspects.first)
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3c7d032be..2eb3c978b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -22,11 +22,8 @@ include HelperMethods
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  config.mock_with :mocha
   config.mock_with :rspec
 
- # config.fixture_path = "#{Rails.root}/spec/fixtures"
- # config.global_fixtures = :all
   config.use_transactional_fixtures = true
 
   config.before(:each) do