merge from master (post-CSRF changes)

1 files changed, 26 insertions, 0 deletions

diff --git a/vendor/gems/rspec-rails-1.3.3/lib/spec/rails.rb b/vendor/gems/rspec-rails-1.3.3/lib/spec/rails.rb
new file mode 100644
index 000000000..2a20d70b5
--- /dev/null
+++ b/vendor/gems/rspec-rails-1.3.3/lib/spec/rails.rb
@@ -0,0 +1,26 @@
+begin
+  require_dependency 'application_controller'
+rescue MissingSourceFile
+  require_dependency 'application'
+end
+require 'rack/utils'
+
+require 'action_controller/test_process'
+require 'action_controller/integration'
+require 'active_support/test_case'
+require 'active_record/fixtures' if defined?(ActiveRecord::Base)
+
+require 'spec/test/unit'
+
+require 'spec/rails/matchers'
+require 'spec/rails/mocks'
+require 'spec/rails/example'
+require 'spec/rails/extensions'
+require 'spec/rails/interop/testcase'
+
+Spec::Example::ExampleGroupFactory.default(ActiveSupport::TestCase)
+
+if ActionView::Base.respond_to?(:cache_template_extensions)
+  ActionView::Base.cache_template_extensions = false
+end
+