Merge branch 'master' of git://github.com/lifo/docrails

1 files changed, 35 insertions, 0 deletions

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 3540af13ac..470b36dbe2 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -308,3 +308,38 @@ module ActionView
     end
   end
 end
+
+class Workshop
+  extend ActiveModel::Naming
+  include ActiveModel::Conversion
+  attr_accessor :id
+
+  def initialize(id)
+    @id = id
+  end
+
+  def persisted?
+    id.present?
+  end
+
+  def to_s
+    id.to_s
+  end
+end
+
+module ActionDispatch
+  class ShowExceptions
+    private
+      remove_method :public_path
+      def public_path
+        "#{FIXTURE_LOAD_PATH}/public"
+      end
+
+      remove_method :logger
+      # Silence logger
+      def logger
+        nil
+      end
+  end
+end
+