merge from master (post-CSRF changes)

1 files changed, 41 insertions, 0 deletions

diff --git a/vendor/gems/rspec-1.3.1/lib/spec/deprecation.rb b/vendor/gems/rspec-1.3.1/lib/spec/deprecation.rb
new file mode 100644
index 000000000..3e3140d47
--- /dev/null
+++ b/vendor/gems/rspec-1.3.1/lib/spec/deprecation.rb
@@ -0,0 +1,41 @@
+module Spec
+  class << self
+    def deprecate(method, alternate_method=nil)
+      return if Spec::Runner.configuration.suppress_deprecation_warnings?
+      message = <<-NOTICE
+
+*****************************************************************
+DEPRECATION WARNING: you are using deprecated behaviour that will
+be removed from a future version of RSpec.
+
+#{caller(0)[2]}
+
+* #{method} is deprecated.
+NOTICE
+      if alternate_method
+        message << <<-ADDITIONAL
+* please use #{alternate_method} instead.
+ADDITIONAL
+      end
+
+      message << "*****************************************************************"
+      warn(message)
+    end
+
+    def warn(message)
+      Kernel.warn(message)
+    end
+
+  end
+
+  class HashWithDeprecationNotice < Hash
+    def initialize(method, alternate_method=nil, &block)
+      @method, @alternate_method = method, alternate_method
+    end
+    def []=(k,v)
+      Spec.deprecate(@method, @alternate_method)
+      super
+    end
+  end
+end
+