From 77af61be40256d1e9e238d093bbd1ffb95263c67 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 19 Apr 2005 16:34:44 +0000 Subject: [PATCH] Added xml_http_request/xhr method for simulating XMLHttpRequest in functional tests #1151 [Sam Stephenson] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1230 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionmailer/CHANGELOG | 5 +++++ actionmailer/Rakefile | 4 ++-- actionpack/CHANGELOG | 10 ++++++++-- actionpack/Rakefile | 2 +- actionpack/lib/action_controller/test_process.rb | 6 ++++++ actionwebservice/CHANGELOG | 5 +++++ actionwebservice/Rakefile | 6 +++--- railties/CHANGELOG | 5 +++++ railties/Rakefile | 8 ++++---- 9 files changed, 39 insertions(+), 12 deletions(-) diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 8f9d0c6a08..412edf6b9c 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,3 +1,8 @@ +*0.9.1* (20th April, 2005) + +* Depend on Action Pack 1.8.1 + + *0.9.0* (19th April, 2005) * Added that deliver_* will now return the email that was sent diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile index b3aeec2adb..eb9557f6d8 100755 --- a/actionmailer/Rakefile +++ b/actionmailer/Rakefile @@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher' PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' PKG_NAME = 'actionmailer' -PKG_VERSION = '0.9.0' + PKG_BUILD +PKG_VERSION = '0.9.1' + PKG_BUILD PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" RELEASE_NAME = "REL #{PKG_VERSION}" @@ -52,7 +52,7 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "actionmailer" s.homepage = "http://www.rubyonrails.org" - s.add_dependency('actionpack', '= 1.8.0' + PKG_BUILD) + s.add_dependency('actionpack', '= 1.8.1' + PKG_BUILD) s.has_rdoc = true s.requirements << 'none' diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index c263f0700d..ae5750f6d5 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,4 +1,10 @@ -*SVN* +*1.8.1* (20th April, 2005) + +* Added xml_http_request/xhr method for simulating XMLHttpRequest in functional tests #1151 [Sam Stephenson]. Example: + + xhr :post, :index + +* Fixed that Ajax.Base.options.asynchronous wasn't being respected in Ajax.Request (thanks Jon Casey) * Fixed that :get, :post, and the others should take a flash array as the third argument just like process #1144 [rails@cogentdude.com] @@ -47,7 +53,7 @@ * Fixed that you can now pass an alternative :href option to link_to_function/remote in order to point to somewhere other than # if the javascript fails or is turned off. You can do the same with form_remote_tag by passing in :action. #1113 [Sam Stephenson] -* Fixed DateHelper to return values on the option tags such that they'll work properly in IE with form_remote_tag #1024 [rscottmace@gmail.com] +* Fixed DateHelper to return values on the option tags such that they'll work properly in IE with form_remote_tag #1024 [Scott Raymond] * Fixed FormTagHelper#check_box to respect checked #1049 [DelynnB] diff --git a/actionpack/Rakefile b/actionpack/Rakefile index 9a6623527d..4a0674c98f 100755 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher' PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' PKG_NAME = 'actionpack' -PKG_VERSION = '1.8.0' + PKG_BUILD +PKG_VERSION = '1.8.1' + PKG_BUILD PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" RELEASE_NAME = "REL #{PKG_VERSION}" diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index f7dc275c2f..3fd86477db 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -265,6 +265,12 @@ module Test EOV end + def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil) + @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest' + self.send(request_method, action, parameters, session, flash) + end + alias xhr :xml_http_request + def follow_redirect if @response.redirected_to[:controller] raise "Can't follow redirects outside of current controller (#{@response.redirected_to[:controller]})" diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG index a9974b7d8b..c455bbff4c 100644 --- a/actionwebservice/CHANGELOG +++ b/actionwebservice/CHANGELOG @@ -1,3 +1,8 @@ +*0.7.1* (20th April, 2005) + +* Depend on Active Record 1.10.1 and Action Pack 1.8.1 + + *0.7.0* (19th April, 2005) * When casting structured types, don't try to send obj.name= unless obj responds to it, causes casting to be less likely to fail for XML-RPC diff --git a/actionwebservice/Rakefile b/actionwebservice/Rakefile index 4b79384c5d..6a470792e9 100644 --- a/actionwebservice/Rakefile +++ b/actionwebservice/Rakefile @@ -9,7 +9,7 @@ require 'fileutils' PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' PKG_NAME = 'actionwebservice' -PKG_VERSION = '0.7.0' + PKG_BUILD +PKG_VERSION = '0.7.1' + PKG_BUILD PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}" @@ -62,8 +62,8 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "aws" s.homepage = "http://www.rubyonrails.org" - s.add_dependency('actionpack', '= 1.8.0' + PKG_BUILD) - s.add_dependency('activerecord', '= 1.10.0' + PKG_BUILD) + s.add_dependency('actionpack', '= 1.8.1' + PKG_BUILD) + s.add_dependency('activerecord', '= 1.10.1' + PKG_BUILD) s.add_dependency('activesupport', '= 1.0.4' + PKG_BUILD) s.has_rdoc = true diff --git a/railties/CHANGELOG b/railties/CHANGELOG index ac999424cf..5097943d4f 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,3 +1,8 @@ +*0.12.1* (20th April, 2005) + +* Upgraded to Active Record 1.10.1, Action Pack 1.8.1, Action Mailer 0.9.1, Action Web Service 0.7.1 + + *0.12.0* (19th April, 2005) * Fixed that purge_test_database would use database settings from the development environment when recreating the test database #1122 [rails@cogentdude.com] diff --git a/railties/Rakefile b/railties/Rakefile index c87b3302a2..0df3254f7e 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -240,10 +240,10 @@ spec = Gem::Specification.new do |s| s.add_dependency('rake', '>= 0.5.3') s.add_dependency('activesupport', '= 1.0.4' + PKG_BUILD) - s.add_dependency('activerecord', '= 1.10.0' + PKG_BUILD) - s.add_dependency('actionpack', '= 1.8.0' + PKG_BUILD) - s.add_dependency('actionmailer', '= 0.9.0' + PKG_BUILD) - s.add_dependency('actionwebservice', '= 0.7.0' + PKG_BUILD) + s.add_dependency('activerecord', '= 1.10.1' + PKG_BUILD) + s.add_dependency('actionpack', '= 1.8.1' + PKG_BUILD) + s.add_dependency('actionmailer', '= 0.9.1' + PKG_BUILD) + s.add_dependency('actionwebservice', '= 0.7.1' + PKG_BUILD) s.rdoc_options << '--exclude' << '.' s.has_rdoc = false