@@ -384,7 +384,7 @@ class DepotTest < Book::TestCase assert_equal "=> nil", stdout.shift assert_match /^=> #<ActiveRecord::Reflection::AggregateReflection/, stdout.shift assert_equal "=> 0", stdout.shift - assert_match /^=> #<Name:0x\w+ @.*?last="Eisenhower"/, stdout.shift + assert_match /^=> .*Eisenhower/, stdout.shift assert_match /^=> #<Customer id: 1/, stdout.shift assert_match /^=> #<Customer id: 1/, stdout.shift assert_equal "Dwight", stdout.shift checkdepot.rb @@ -72,10 +72,10 @@ class RoutingTest < ActionController::TestCase with_routing do |set| set.draw do |map| map.connect "shop/:action/:id", :controller => "store" + end assert_generates("/shop", :controller => "store") assert_recognizes({:controller => "store", :action => "index"}, "/shop") - end end assert_generates("/store", :controller => "store") data/routing/routing_test.rb @@ -490,7 +490,7 @@ section 8.4, 'Iteration C3: Handling Errors' do EOF end post '/store/add_to_cart/wibble', {} - cmd 'tail -17 log/development.log', ['Attempt to access'] + cmd 'tail -25 log/development.log', ['Attempt to access'] edit 'app/views/layouts/store.html.erb' do |data| data[/<div id="main">()/,1] = "\n" + <<-'EOF' <!-- START_HIGHLIGHT --> makedepot.rb 71c2d8fe3b675356db66d67a27925469b4e7b779 Sam Ruby rubys@intertwingly.net http://github.com/rubys/awdwr/commit/7ab80dd2957efbed470f80d75ac12221588b21c4 7ab80dd2957efbed470f80d75ac12221588b21c4 2009-10-26T13:45:13-07:00 2009-10-26T13:45:13-07:00 Accomodate Rails changes 388eb798f9e1ba253a7b67787ede7c17d24c5c2e Sam Ruby rubys@intertwingly.net