@@ -16,8 +16,7 @@ end desc "Update docs and upload to rubyforge.org" task :website => [:rdoc] task :website do - sh %{chmod -R g+w rdoc/*} - sh %{scp -rp rdoc/* rubyforge.org:/var/www/gforge-projects/scaffolding-ext} + sh %{rsync -rvt rdoc/* rubyforge.org:/var/www/gforge-projects/scaffolding-ext/} end desc "Package Scaffolding Extensions" Rakefile @@ -1,6 +1,6 @@ spec = Gem::Specification.new do |s| s.name = "scaffolding_extensions" - s.version = '1.3.8' + s.version = '1.3.9' s.author = "Jeremy Evans" s.email = "code@jeremyevans.net" s.platform = Gem::Platform::RUBY scaffolding_extensions.gemspec @@ -58,6 +58,12 @@ class ScaffoldingExtensionsTest < Test::Unit::TestCase f.close h end + + def page_xhr(port, path) + req = Net::HTTP::Get.new(path) + req['X-Requested-With'] = 'XMLHttpRequest' + Hpricot(Net::HTTP.new(HOST, port).start{|http| http.request(req)}.body) + end def post(port, path, params) req = Net::HTTP::Post.new(path) @@ -785,25 +791,25 @@ class ScaffoldingExtensionsTest < Test::Unit::TestCase end # Test regular auto completing - p = page(port, "#{root}/scaffold_auto_complete_for_officer?id=Z") + p = page_xhr(port, "#{root}/scaffold_auto_complete_for_officer?id=Z") assert_equal "<ul><li>#{i} - Zofficer</li></ul>", p.inner_html - p = page(port, "#{root}/scaffold_auto_complete_for_officer?id=X") + p = page_xhr(port, "#{root}/scaffold_auto_complete_for_officer?id=X") assert_equal '<ul></ul>', p.inner_html # Tset auto completing for belongs to associations p = page(port, "#{root}/browse_position") ip = (p/:form)[1][:action].split('/')[-1] - p = page(port, "#{root}/scaffold_auto_complete_for_officer?id=Z&association=position") + p = page_xhr(port, "#{root}/scaffold_auto_complete_for_officer?id=Z&association=position") assert_equal "<ul><li>#{ip} - Zposition</li></ul>", p.inner_html - p = page(port, "#{root}/scaffold_auto_complete_for_officer?id=X&association=position") + p = page_xhr(port, "#{root}/scaffold_auto_complete_for_officer?id=X&association=position") assert_equal '<ul></ul>', p.inner_html # Test auto completing for habtm associations p = page(port, "#{root}/browse_group") ig = (p/:form)[1][:action].split('/')[-1] - p = page(port, "#{root}/scaffold_auto_complete_for_officer?id=Z&association=groups") + p = page_xhr(port, "#{root}/scaffold_auto_complete_for_officer?id=Z&association=groups") assert_equal "<ul><li>#{ig} - Zgroup</li></ul>", p.inner_html - p = page(port, "#{root}/scaffold_auto_complete_for_officer?id=X&association=groups") + p = page_xhr(port, "#{root}/scaffold_auto_complete_for_officer?id=X&association=groups") assert_equal '<ul></ul>', p.inner_html end test_site/test.rb 16bf607001f6e542ae055ed2154681a68dca660e Jeremy Evans code@jeremyevans.net http://github.com/jeremyevans/scaffolding_extensions/commit/0156ed2f43a9fd4836c70737705dd9ccf181eba0 0156ed2f43a9fd4836c70737705dd9ccf181eba0 2009-06-26T21:36:52-07:00 2009-06-26T21:31:38-07:00 Bump version to 1.3.9 This also updates the test suite to use xhr for autocomplete requests so the test suite no longer fails on ramaze. Also, this updates the Rakefile to use rsync instead of scp for updating the website, since rsync is so much faster. 6b52dbb14bdad6cff879acf922db8b5e7b48cd5e Jeremy Evans code@jeremyevans.net