From a613347100a46fc90acde80a580c1dddaf46c9cb Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 14 May 2013 15:20:28 +1000 Subject: [PATCH] this warning is getting in the way of my presentation --- config/application.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config/application.rb b/config/application.rb index acfcaa568..a58589a6b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -20,6 +20,16 @@ module Discourse require 'discourse' + # mocha hates us, active_support/testing/mochaing.rb line 2 is requiring the wrong + # require, patched in source, on upgrade remove this + if Rails.env.test? || Rails.env.development? + require "mocha/version" + require "mocha/deprecation" + if Mocha::VERSION == "0.13.3" && Rails::VERSION::STRING == "3.2.12" + Mocha::Deprecation.mode = :disabled + end + end + # Custom directories with classes and modules you want to be autoloadable. config.autoload_paths += %W(#{config.root}/app/serializers)