Merge remote-tracking branch 'upstream/pull/2935' into master

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 1a60c8234bc33b5abc6b00e7282b8746faee7e48..720618ba094ec06ca1a5aabea17371d3675771ca 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -16,6 +16,9 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
    Coveralls::SimpleCov::Formatter]
 )
 
    Coveralls::SimpleCov::Formatter]
 )
 

+require "securerandom"
+require "digest/sha1"
+

 ENV["RAILS_ENV"] = "test"
 require_relative "../config/environment"
 require "rails/test_help"
 ENV["RAILS_ENV"] = "test"
 require_relative "../config/environment"
 require "rails/test_help"


@@ -113,29 +116,56 @@ module ActiveSupport
     end
 
     ##
     end
 
     ##

-    # set request headers for HTTP basic authentication
-    def basic_authorization(user, pass)
-      @request.env["HTTP_AUTHORIZATION"] = format("Basic %{auth}", :auth => Base64.encode64("#{user}:#{pass}"))
+    # return request header for HTTP Basic Authorization
+    def basic_authorization_header(user, pass)
+      { "Authorization" => format("Basic %<auth>s", :auth => Base64.encode64("#{user}:#{pass}")) }

     end
 
     ##
     end
 
     ##

-    # return request header for HTTP Basic Authorization
-    def basic_authorization_header(user, pass)
-      { "Authorization" => format("Basic %{auth}", :auth => Base64.encode64("#{user}:#{pass}")) }
+    # make an OAuth signed request
+    def signed_request(method, uri, options = {})
+      uri = URI.parse(uri)
+      uri.scheme ||= "http"
+      uri.host ||= "www.example.com"
+
+      oauth = options.delete(:oauth)
+      params = options.fetch(:params, {}).transform_keys(&:to_s)
+
+      oauth[:consumer] ||= oauth[:token].client_application
+
+      helper = OAuth::Client::Helper.new(nil, oauth)
+
+      request = OAuth::RequestProxy.proxy(
+        "method" => method.to_s.upcase,
+        "uri" => uri,
+        "parameters" => params.merge(helper.oauth_parameters)
+      )
+
+      request.sign!(oauth)
+
+      method(method).call(request.signed_uri, options)

     end
 
     ##
     end
 
     ##

-    # set request header for HTTP Accept
-    def http_accept_format(format)
-      @request.env["HTTP_ACCEPT"] = format
+    # make an OAuth signed GET request
+    def signed_get(uri, options = {})
+      signed_request(:get, uri, options)

     end
 
     ##
     end
 
     ##

-    # set request readers to ask for a particular error format
-    def error_format(format)
-      @request.env["HTTP_X_ERROR_FORMAT"] = format
+    # make an OAuth signed POST request
+    def signed_post(uri, options = {})
+      signed_request(:post, uri, options)

     end
 
     end
 

+    ##
+    # return request header for HTTP Accept
+    def accept_format_header(format)
+      { "Accept" => format }
+    end
+
+    ##
+    # return request header to ask for a particular error format

     def error_format_header(f)
       { "X-Error-Format" => f }
     end
     def error_format_header(f)
       { "X-Error-Format" => f }
     end


@@ -145,7 +175,7 @@ module ActiveSupport
     # when the owner of the changset has their data not marked as public
     def assert_require_public_data(msg = "Shouldn't be able to use API when the user's data is not public")
       assert_response :forbidden, msg
     # when the owner of the changset has their data not marked as public
     def assert_require_public_data(msg = "Shouldn't be able to use API when the user's data is not public")
       assert_response :forbidden, msg

-      assert_equal @response.headers["Error"], "You must make your edits public to upload new data", "Wrong error message"
+      assert_equal("You must make your edits public to upload new data", @response.headers["Error"], "Wrong error message")

     end
 
     ##
     end
 
     ##