2 files changed, 8 insertions, 10 deletions
diff --git a/actionpack/lib/action_dispatch/journey/route.rb b/actionpack/lib/action_dispatch/journey/route.rb
index d18efd863a..f8a53227f3 100644
--- a/actionpack/lib/action_dispatch/journey/route.rb
+++ b/actionpack/lib/action_dispatch/journey/route.rb
@@ -30,11 +30,11 @@ module ActionDispatch
       end
 
       def ast
-        return @decorated_ast if @decorated_ast
-
-        @decorated_ast = path.ast
-        @decorated_ast.grep(Nodes::Terminal).each { |n| n.memo = self }
-        @decorated_ast
+        @decorated_ast ||= begin
+          decorated_ast = path.ast
+          decorated_ast.grep(Nodes::Terminal).each { |n| n.memo = self }
+          decorated_ast
+        end
       end
 
       def requirements # :nodoc:
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index 79dff7d121..abdab026d7 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -208,11 +208,9 @@ module ActionDispatch
         end
 
         def fail_on(exception_class)
-          begin
-            yield
-          rescue exception_class => e
-            raise MiniTest::Assertion, e.message
-          end
+          yield
+        rescue exception_class => e
+          raise MiniTest::Assertion, e.message
         end
     end
   end