Permalink
Browse files

Merge pull request #5132 from rafaelfranca/fix-build

Fix routes inspection order
  • Loading branch information...
tenderlove committed Feb 22, 2012
2 parents ef5670e + a870d06 commit cdc1885d4198e1af8f3d15c4433fd19e2aa3e493
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1014,10 +1014,10 @@ def resource(*resources, &block)
member do
get :edit if parent_resource.actions.include?(:edit)
get :show if parent_resource.actions.include?(:show)
- delete :destroy if parent_resource.actions.include?(:destroy)
if parent_resource.actions.include?(:update)
send default_method_for_update, :update
end
+ delete :destroy if parent_resource.actions.include?(:destroy)
end
end
@@ -1156,10 +1156,10 @@ def resources(*resources, &block)
member do
get :edit if parent_resource.actions.include?(:edit)
get :show if parent_resource.actions.include?(:show)
- delete :destroy if parent_resource.actions.include?(:destroy)
if parent_resource.actions.include?(:update)
send default_method_for_update, :update
end
+ delete :destroy if parent_resource.actions.include?(:destroy)
end
end

5 comments on commit cdc1885

Contributor

dlee replied Feb 22, 2012

I didn't notice any problems when running the tests. Is there something else we should verify before submitting patches to rails?

Owner

rafaelfranca replied Feb 22, 2012

@dlee two railties tests are broken on my machine and on the travis-ci. One related with these lines, another related to ActionView railtie load.

Contributor

dlee replied Feb 23, 2012

@rafaelfranca ah, thanks. I can see one broken test on my machine (railties/test/application/initializers/frameworks_test.rb:160) but I couldn't reproduce the one broken on travis-ci (railties/test/application/route_inspect_test.rb:72).

I'm running ruby-1.9.3p0 like travis-ci, and ran bundle exec rake test in both / and /railties/ so I'm not sure what's going on. Do you have any clues?

Owner

rafaelfranca replied Feb 23, 2012

@dlee when one test fails in the railties suite the entire suite is halted. Try to run only the route_inspect_test with bundle exec ruby -Itest railties/test/application/route_inspect_test.rb

Contributor

dlee replied Feb 23, 2012

@rafaelfranca Spot on. Thanks for the tip!

Please sign in to comment.