@@ -958,7 +958,7 @@ class DepotTest < Book::TestCase assert_match /^=> (nil|\[.*?\])/, stdout.shift assert_match /^=> (nil|\[.*?\])/, stdout.shift assert_match /^=> (nil|\[.*?\])/, stdout.shift - assert_match /^=> #<ActionController::Routing::RouteSet:.*>/, stdout.shift + assert_match /^=> #<Action\w+::Routing::RouteSet:.*>/, stdout.shift assert_match /^=> #<Action\w+::Integration::Session:.*>/, stdout.shift assert_equal '=> nil', stdout.shift assert_equal '=> {:action=>"index", :controller=>"store"}', stdout.shift @@ -974,9 +974,9 @@ class DepotTest < Book::TestCase assert_equal '=> true', stdout.shift assert_match /^=> (nil|\[.*?\])/, stdout.shift assert_equal '=> ["article", "blog"]', stdout.shift - assert_match /^=> #<ActionController::Routing::RouteSet:.*>/, stdout.shift + assert_match /^=> #<Action\w+::Routing::RouteSet:.*>/, stdout.shift assert_match /^=> #<Action\w+::Integration::Session:.*>/, stdout.shift - assert_equal '=> [ActionController::Base, ActionView::Base]', stdout.shift + assert_match /^=> [ActionController::Base, ActionView::Base]|#<Rack::Mount::RouteSet.*>/, stdout.shift assert_equal '=> {:action=>"index", :controller=>"blog"}', stdout.shift assert_equal '=> {:action=>"show", :controller=>"blog", :id=>"123"}', stdout.shift assert_equal '=> {:action=>"show_date", :controller=>"blog", :year=>"2004"}', stdout.shift checkdepot.rb 9430580d95d1bd561bac8eff8f6769c0c0035141 aa89bb1bccdad4949eb1e67d9aece558111ebca4 Sam Ruby rubys@intertwingly.net http://github.com/rubys/awdwr/commit/71c2d8fe3b675356db66d67a27925469b4e7b779 71c2d8fe3b675356db66d67a27925469b4e7b779 2009-10-20T14:05:12-07:00 2009-10-20T14:05:12-07:00 Merge branch 'master' of ssh://sa3ruby@dillinger.dreamhost.com/home/sa3ruby/code.intertwingly.net/public/git/awdwr 1fd6c5d35b1f5f7ef69b2220794e6ec1fa4189b6 Sam Ruby rubys@intertwingly.net