Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Avoid more uninitialized variable warnings.

  • Loading branch information...
commit 059d609a1a59300faefdc2d4186bae13b30c9699 1 parent 9717498
@miloops miloops authored
View
2  actionpack/lib/abstract_controller/rendering.rb
@@ -66,7 +66,7 @@ def view_context_class
attr_writer :view_context_class
def view_context_class
- @view_context_class || self.class.view_context_class
+ (@view_context_class ||= nil) || self.class.view_context_class
end
def initialize(*)
View
3  actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -187,6 +187,7 @@ def css_select(*args)
def assert_select(*args, &block)
# Start with optional element followed by mandatory selector.
arg = args.shift
+ @selected ||= nil
if arg.is_a?(HTML::Node)
# First argument is a node (tag or text, but also HTML root),
@@ -197,7 +198,7 @@ def assert_select(*args, &block)
# This usually happens when passing a node/element that
# happens to be nil.
raise ArgumentError, "First argument is either selector or element to select, but nil found. Perhaps you called assert_select with an element that does not exist?"
- elsif defined?(@selected) && @selected
+ elsif @selected
root = HTML::Node.new(nil)
root.children.concat @selected
else
Please sign in to comment.
Something went wrong with that request. Please try again.