merge from master (post-CSRF changes)

1 files changed, 0 insertions, 40 deletions

diff --git a/vendor/plugins/rspec/lib/spec/deprecation.rb b/vendor/plugins/rspec/lib/spec/deprecation.rb
deleted file mode 100644
index ebab78942..000000000
--- a/vendor/plugins/rspec/lib/spec/deprecation.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-module Spec
-  class << self
-    def deprecate(method, alternate_method=nil)
-       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
-