Ticket #7124: xml_http_request_integration.diff

actionpack/test/controller/integration_test.rb

@@ -132 +132 @@
-    @session.head(path,params,headers)
-  end
-
-
+_deprecated_call
-    path = "/index"; params = "blah"; headers = {:location => 'blah'}
-    headers_after_xhr = headers.merge(
-      "X-Requested-With" => "XMLHttpRequest",
-      "Accept"           => "text/javascript, text/html, application/xml, text/xml, */*"
-    )
-    @session.expects(:post).with(path,params,headers_after_xhr)
-@session.xml_http_request(path,params,headers)
+assert_deprecated { @session.xml_http_request(path,params,headers) }
-  end
+
+  def test_xml_http_request_get
+    path = "/index"; params = "blah"; headers = {:location => 'blah'}
+    headers_after_xhr = headers.merge(
+      "X-Requested-With" => "XMLHttpRequest",
+      "Accept"           => "text/javascript, text/html, application/xml, text/xml, */*"
+    )
+    @session.expects(:process).with(:get,path,params,headers_after_xhr)
+    @session.xml_http_request(:get,path,params,headers)
+  end
+
+  def test_xml_http_request_post
+    path = "/index"; params = "blah"; headers = {:location => 'blah'}
+    headers_after_xhr = headers.merge(
+      "X-Requested-With" => "XMLHttpRequest",
+      "Accept"           => "text/javascript, text/html, application/xml, text/xml, */*"
+    )
+    @session.expects(:process).with(:post,path,params,headers_after_xhr)
+    @session.xml_http_request(:post,path,params,headers)
+  end
+
+  def test_xml_http_request_put
+    path = "/index"; params = "blah"; headers = {:location => 'blah'}
+    headers_after_xhr = headers.merge(
+      "X-Requested-With" => "XMLHttpRequest",
+      "Accept"           => "text/javascript, text/html, application/xml, text/xml, */*"
+    )
+    @session.expects(:process).with(:put,path,params,headers_after_xhr)
+    @session.xml_http_request(:put,path,params,headers)
+  end
+
+  def test_xml_http_request_delete
+    path = "/index"; params = "blah"; headers = {:location => 'blah'}
+    headers_after_xhr = headers.merge(
+      "X-Requested-With" => "XMLHttpRequest",
+      "Accept"           => "text/javascript, text/html, application/xml, text/xml, */*"
+    )
+    @session.expects(:process).with(:delete,path,params,headers_after_xhr)
+    @session.xml_http_request(:delete,path,params,headers)
+  end
+
+  def test_xml_http_request_head
+    path = "/index"; params = "blah"; headers = {:location => 'blah'}
+    headers_after_xhr = headers.merge(
+      "X-Requested-With" => "XMLHttpRequest",
+      "Accept"           => "text/javascript, text/html, application/xml, text/xml, */*"
+    )
+    @session.expects(:process).with(:head,path,params,headers_after_xhr)
+    @session.xml_http_request(:head,path,params,headers)
+  end
-end
-
-class IntegrationTestTest < Test::Unit::TestCase
@@ -150 +200 @@
-    @test.class.stubs(:fixture_table_names).returns([])
-    @session = @test.open_session
-  end
-
+
-  def test_opens_new_session
-    @test.class.expects(:fixture_table_names).times(2).returns(['foo'])
-

actionpack/lib/action_controller/integration.rb

@@ -67 +67 @@
-        @https = false
-        @cookies = {}
-        @controller = @request = @response = nil
-
+
-        self.host        = "www.example.com"
-        self.remote_addr = "127.0.0.1"
-        self.accept      = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"
@@ -89 +89 @@
-      #   session.https!
-      #   session.https!(false)
-      def https!(flag=true)
-        
+
-      end
-
-      # Return +true+ if the session is mimicing a secure HTTPS request.
@@ -143 +143 @@
-      # Performs a GET request with the given parameters. The parameters may
-      # be +nil+, a Hash, or a string that is appropriately encoded
-      # (application/x-www-form-urlencoded or multipart/form-data).  The headers
- 
+
-      # prefix 'HTTP_' added if needed.
-      #
- 
+
-      # #put, #delete, and #head.
-      def get(path, parameters=nil, headers=nil)
-        process :get, path, parameters, headers
@@ -161 +161 @@
-      def put(path, parameters=nil, headers=nil)
-        process :put, path, parameters, headers
-      end
-
+
-      # Performs a DELETE request with the given parameters. See get() for more details.
-      def delete(path, parameters=nil, headers=nil)
-        process :delete, path, parameters, headers
-      end
-
+
-      # Performs a HEAD request with the given parameters. See get() for more details.
-      def head(path, parameters=nil, headers=nil)
-        process :head, path, parameters, headers
-      end
-
-      # Performs an XMLHttpRequest request with the given parameters, mimicing
-
-
+
+
+
-      # (application/x-www-form-urlencoded or multipart/form-data).  The headers
- 
+
-      # prefix 'HTTP_' added if needed.
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
+      alias xhr :xml_http_request
-
-      # Returns the URL for the given options, according to the rules specified
-      # in the application's routes.
@@ -222 +239 @@
-          @path = path
-          env = {}
-
- == :get
+.to_s.downcase == 'get'
-            env["QUERY_STRING"] = data
-            data = nil
-          end
@@ -291 +308 @@
-          @status = @status.to_i
-        end
-
- 
+
-        # request.
-        def encode_cookies
-          cookies.inject("") do |string, (name, value)|
@@ -449 +466 @@
-    # without any test methods.
-    def run(*args) #:nodoc:
-      return if @method_name == "default_test"
-   
+
-    end
-
-    # Because of how use_instantiated_fixtures and use_transactional_fixtures