Commit e890d73d authored by Raphael's avatar Raphael

Remove mocha

parent f9fbb63e
......@@ -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
......
......@@ -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)
......
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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment