Mocha version

Gemfile

@@ -85,7 +85,7 @@ group :test do
   gem 'capybara',              '1.1.2'
   gem 'delorean'
   gem 'webrick',               '1.3.1'
-  gem 'mocha',                 '0.12.0'
+  gem 'mocha',                 '1.1.0'
   gem 'ci_reporter',           '1.8.4'
   gem 'poltergeist',           '>= 1.0.0'
   gem 'activerecord-nulldb-adapter', '0.3.1'

Gemfile.lock

@@ -170,7 +170,7 @@ GEM
       escape
       json
       rack
-    mocha (0.12.0)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
     multi_json (1.11.1)
@@ -350,7 +350,7 @@ DEPENDENCIES
   hiredis (= 0.6.0)
   instagram (= 1.1.3)
   mixpanel (= 4.0.2)
-  mocha (= 0.12.0)
+  mocha (= 1.1.0)
   nokogiri (~> 1.6.6.2)
   oauth (= 0.4.5)
   oauth-plugin (= 0.4.0.pre4)

Makefile

@@ -1,7 +1,7 @@
 REV=$(shell git rev-parse HEAD)
 
 all:
-	MOCHA_OPTIONS=skip_integration RAILS_ENV=test bundle install
+	RAILS_ENV=test bundle install
 	# I cannot remmeber why gdal is being skipped from this list...
 	cat python_requirements.txt | grep -v gdal | sudo pip install -r /dev/stdin
 	npm install
@@ -190,27 +190,27 @@ endif
 	MOCHA_OPTIONS=skip_integration RAILS_ENV=test bundle exec rake cartodb:test:prepare
 
 check-1:
-	MOCHA_OPTIONS=skip_integration RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_1)
+	RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_1)
 check-2:
-	MOCHA_OPTIONS=skip_integration RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_2)
+	RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_2)
 check-2b:
-	MOCHA_OPTIONS=skip_integration RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_2b)
+	RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_2b)
 check-3:
-	MOCHA_OPTIONS=skip_integration RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_3)
+	RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_3)
 check-4:
-	MOCHA_OPTIONS=skip_integration RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_4)
+	RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_4)
 check-5:
-	MOCHA_OPTIONS=skip_integration RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_5)
+	RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_5)
 check-6:
-	MOCHA_OPTIONS=skip_integration RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_6)
+	RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_6)
 check-7:
-	MOCHA_OPTIONS=skip_integration RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_7)
+	RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_7)
 check-8:
-	MOCHA_OPTIONS=skip_integration RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_8)
+	RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_8)
 check-9:
-	MOCHA_OPTIONS=skip_integration RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_9)
+	RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_9)
 check-10:
-	MOCHA_OPTIONS=skip_integration RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_10)
+	RAILS_ENV=test bundle exec rspec $(WORKING_SPECS_10)
 
 check-prepared: check-1 check-2 check-2b check-3 check-4 check-5 check-6 check-7 check-8 check-9 check-10
 

spec/models/table_spec.rb

@@ -8,6 +8,7 @@
 # 1275 # Table merging two+ tables should import and then export file SHP1.zip as sql
 
 require_relative '../spec_helper'
+
 def check_schema(table, expected_schema, options={})
   table_schema = table.schema(:cartodb_types => options[:cartodb_types] || false)
   schema_differences = (expected_schema - table_schema) + (table_schema - expected_schema)

spec/rspec_configuration.rb

@@ -2,6 +2,7 @@
 require 'rspec/core'
 require 'rspec/expectations'
 require 'rspec/mocks'
+require 'mocha'
 
 RSpec.configure do |config|
   config.mock_with :mocha

spec/spec_helper.rb

@@ -1,4 +1,5 @@
-require 'mocha'
+require_relative './rspec_configuration'
+
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV['RAILS_ENV'] ||= 'test'
 require File.expand_path('../../config/environment', __FILE__)
@@ -12,7 +13,6 @@ Dir[Rails.root.join('spec/support/**/*.rb')].each {|f| require f}
 Resque.inline = true
 
 RSpec.configure do |config|
-  config.mock_with :mocha
 
   config.include CartoDB::Factories
   config.include HelperMethods