remove redundancy

robotarmy · Mar 5, 2011 · 5b492c7 · 5b492c7
1 parent 598f7ec
commit 5b492c7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/rspec/rails/matchers/routing_matchers.rb b/lib/rspec/rails/matchers/routing_matchers.rb
@@ -11,7 +11,7 @@ module RoutingMatchers
         if path.is_a?(String)
           controller, action = path.split("#")
           options ||= {}
-          (options || {}).merge!(:controller => controller, :action => action)
+          options.merge!(:controller => controller, :action => action)
         else
           options = path
         end