Ditching preloading of Webrat::Elements
This commit is contained in:
parent
d48a0fcb15
commit
de2ba2caf8
@ -30,9 +30,6 @@ module Webrat
|
|||||||
def initialize(session, &block) #:nodoc:
|
def initialize(session, &block) #:nodoc:
|
||||||
@session = session
|
@session = session
|
||||||
instance_eval(&block) if block_given?
|
instance_eval(&block) if block_given?
|
||||||
|
|
||||||
# preload
|
|
||||||
load_elements
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Verifies an input field or textarea exists on the current page, and stores a value for
|
# Verifies an input field or textarea exists on the current page, and stores a value for
|
||||||
@ -281,14 +278,6 @@ module Webrat
|
|||||||
end
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
def load_elements
|
|
||||||
labels
|
|
||||||
fields
|
|
||||||
forms
|
|
||||||
areas
|
|
||||||
links
|
|
||||||
end
|
|
||||||
|
|
||||||
def page_dom #:nodoc:
|
def page_dom #:nodoc:
|
||||||
return @response.dom if @response.respond_to?(:dom)
|
return @response.dom if @response.respond_to?(:dom)
|
||||||
@ -323,27 +312,9 @@ module Webrat
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def areas #:nodoc:
|
|
||||||
@areas ||= Area.load_all(@session, dom)
|
|
||||||
end
|
|
||||||
|
|
||||||
def links #:nodoc:
|
|
||||||
@links ||= Link.load_all(@session, dom)
|
|
||||||
end
|
|
||||||
|
|
||||||
def forms #:nodoc:
|
def forms #:nodoc:
|
||||||
@forms ||= Form.load_all(@session, dom)
|
@forms ||= Form.load_all(@session, dom)
|
||||||
end
|
end
|
||||||
|
|
||||||
def fields
|
|
||||||
@fields ||= Field.field_classes.map do |field_class|
|
|
||||||
field_class.load_all(@session, dom)
|
|
||||||
end.flatten
|
|
||||||
end
|
|
||||||
|
|
||||||
def labels
|
|
||||||
@labels ||= Label.load_all(@session, dom)
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user