Permalink
Browse files

Move more of node functionality into subfolder

We have too many top level files, we have multiple
classes in the same file. This allows us to solve
both problems, while also providing a good place
for the new Capybara::Node::Simple (formerly
Capybara::StringNode)
  • Loading branch information...
1 parent 39f998d commit d223d542f769ec673ee912aee4990a34b6e6a053 @jnicklas jnicklas committed Nov 21, 2010
View
@@ -3,7 +3,10 @@ require 'rspec/core/rake_task'
require 'yard'
desc "Run all examples"
-RSpec::Core::RakeTask.new('spec')
+RSpec::Core::RakeTask.new(:spec) do |t|
+ #t.rspec_path = 'bin/rspec'
+ t.rspec_opts = %w[--color]
+end
YARD::Rake::YardocTask.new do |t|
t.files = ['lib/**/*.rb', 'README.rdoc']
View
@@ -1,7 +1,6 @@
require 'timeout'
require 'nokogiri'
require 'xpath'
-
module Capybara
class CapybaraError < StandardError; end
class DriverNotFoundError < CapybaraError; end
@@ -132,7 +131,7 @@ def server(&block)
##
#
# Wraps the given string, which should contain an HTML document or fragment
- # in a {Capybara::StringNode} which exposes all {Capybara::Node::Matchers} and
+ # in a {Capybara::Node::Simple} which exposes all {Capybara::Node::Matchers} and
# {Capybara::Node::Finders}. This allows you to query any string containing
# HTML in the exact same way you would query the current document in a Capybara
# session. For example:
@@ -150,10 +149,10 @@ def server(&block)
# node.find('ul').find('li').text # => 'Home'
#
# @param [String] html An html fragment or document
- # @return [Capybara::StringNode] A node which has Capybara's finders and matchers
+ # @return [Capybara::Node::Simple] A node which has Capybara's finders and matchers
#
def string(html)
- StringNode.new(html)
+ Capybara::Node::Simple.new(html)
end
##
@@ -183,13 +182,19 @@ def deprecate(method, alternate_method)
autoload :Server, 'capybara/server'
autoload :Session, 'capybara/session'
- autoload :Node, 'capybara/node'
- autoload :StringNode, 'capybara/util/string'
- autoload :Document, 'capybara/node'
- autoload :Element, 'capybara/node'
autoload :Selector, 'capybara/selector'
autoload :VERSION, 'capybara/version'
+ module Node
+ autoload :Base, 'capybara/node/base'
+ autoload :Simple, 'capybara/node/simple'
+ autoload :Element, 'capybara/node/element'
+ autoload :Document, 'capybara/node/document'
+ autoload :Finders, 'capybara/node/finders'
+ autoload :Matchers, 'capybara/node/matchers'
+ autoload :Actions, 'capybara/node/actions'
+ end
+
module Driver
autoload :Base, 'capybara/driver/base'
autoload :Node, 'capybara/driver/node'
@@ -79,7 +79,7 @@ def find(locator)
private
def string_node
- @string_node ||= Capybara::StringNode.new(native)
+ @string_node ||= Capybara::Node::Simple.new(native)
end
# a reference to the select node if this is an option node
View
@@ -1,216 +0,0 @@
-require 'capybara/node/finders'
-require 'capybara/node/actions'
-require 'capybara/node/matchers'
-
-module Capybara
-
- ##
- #
- # A {Capybara::Node} represents either an element on a page through the subclass
- # {Capybara::Element} or a document through {Capybara::Document}.
- #
- # Both types of Node share the same methods, used for interacting with the
- # elements on the page. These methods are divided into three categories,
- # finders, actions and matchers. These are found in the modules
- # {Capybara::Node::Finders}, {Capybara::Node::Actions} and {Capybara::Node::Matchers}
- # respectively.
- #
- # A {Capybara::Session} exposes all methods from {Capybara::Document} directly:
- #
- # session = Capybara::Session.new(:rack_test, my_app)
- # session.visit('/')
- # session.fill_in('Foo', :with => 'Bar') # from Capybara::Node::Actions
- # bar = session.find('#bar') # from Capybara::Node::Finders
- # bar.select('Baz', :from => 'Quox') # from Capybara::Node::Actions
- # session.has_css?('#foobar') # from Capybara::Node::Matchers
- #
- class Node
- attr_reader :session, :base
-
- include Capybara::Node::Finders
- include Capybara::Node::Actions
- include Capybara::Node::Matchers
-
- def initialize(session, base)
- @session = session
- @base = base
- end
-
- protected
-
- def wait?
- driver.wait?
- end
-
- def driver
- session.driver
- end
- end
-
- ##
- #
- # A {Capybara::Element} represents a single element on the page. It is possible
- # to interact with the contents of this element the same as with a document:
- #
- # session = Capybara::Session.new(:rack_test, my_app)
- #
- # bar = session.find('#bar') # from Capybara::Node::Finders
- # bar.select('Baz', :from => 'Quox') # from Capybara::Node::Actions
- #
- # {Capybara::Element} also has access to HTML attributes and other properties of the
- # element:
- #
- # bar.value
- # bar.text
- # bar[:title]
- #
- # @see Capybara::Node
- #
- class Element < Node
-
- ##
- #
- # @return [Object] The native element from the driver, this allows access to driver specific methods
- #
- def native
- base.native
- end
-
- ##
- #
- # @return [String] The text of the element
- #
- def text
- base.text
- end
-
- ##
- #
- # Retrieve the given attribute
- #
- # element[:title] # => HTML title attribute
- #
- # @param [Symbol] attribute The attribute to retrieve
- # @return [String] The value of the attribute
- #
- def [](attribute)
- base[attribute]
- end
-
- ##
- #
- # @return [String] The value of the form element
- #
- def value
- base.value
- end
-
- ##
- #
- # Set the value of the form element to the given value.
- #
- # @param [String] value The new value
- #
- def set(value)
- base.set(value)
- end
-
- ##
- #
- # Select this node if is an option element inside a select tag
- #
- def select_option
- base.select_option
- end
-
- ##
- #
- # Unselect this node if is an option element inside a multiple select tag
- #
- def unselect_option
- base.unselect_option
- end
-
- ##
- #
- # Click the Element
- #
- def click
- base.click
- end
-
- ##
- #
- # @return [String] The tag name of the element
- #
- def tag_name
- base.tag_name
- end
-
- ##
- #
- # Whether or not the element is visible. Not all drivers support CSS, so
- # the result may be inaccurate.
- #
- # @return [Boolean] Whether the element is visible
- #
- def visible?
- base.visible?
- end
-
- ##
- #
- # An XPath expression describing where on the page the element can be found
- #
- # @return [String] An XPath expression
- #
- def path
- base.path
- end
-
- ##
- #
- # Trigger any event on the current element, for example mouseover or focus
- # events. Does not work in Selenium.
- #
- # @param [String] event The name of the event to trigger
- #
- def trigger(event)
- base.trigger(event)
- end
-
- ##
- #
- # Drag the element to the given other element.
- #
- # source = page.find('#foo')
- # target = page.find('#bar')
- # source.drag_to(target)
- #
- # @param [Capybara::Element] node The element to drag to
- #
- def drag_to(node)
- base.drag_to(node.base)
- end
-
- def inspect
- %(#<Capybara::Element tag="#{tag_name}" path="#{path}">)
- rescue NotSupportedByDriverError
- %(#<Capybara::Element tag="#{tag_name}">)
- end
-
- end
-
- ##
- #
- # A {Capybara::Document} represents an HTML document. Any operation
- # performed on it will be performed on the entire document.
- #
- # @see Capybara::Node
- #
- class Document < Node
- def inspect
- %(#<Capybara::Document>)
- end
- end
-end
@@ -1,5 +1,5 @@
module Capybara
- class Node
+ module Node
module Actions
##
View
@@ -0,0 +1,47 @@
+module Capybara
+ module Node
+
+ ##
+ #
+ # A {Capybara::Node::Base} represents either an element on a page through the subclass
+ # {Capybara::Node::Element} or a document through {Capybara::Node::Document}.
+ #
+ # Both types of Node share the same methods, used for interacting with the
+ # elements on the page. These methods are divided into three categories,
+ # finders, actions and matchers. These are found in the modules
+ # {Capybara::Node::Finders}, {Capybara::Node::Actions} and {Capybara::Node::Matchers}
+ # respectively.
+ #
+ # A {Capybara::Session} exposes all methods from {Capybara::Node::Document} directly:
+ #
+ # session = Capybara::Session.new(:rack_test, my_app)
+ # session.visit('/')
+ # session.fill_in('Foo', :with => 'Bar') # from Capybara::Node::Actions
+ # bar = session.find('#bar') # from Capybara::Node::Finders
+ # bar.select('Baz', :from => 'Quox') # from Capybara::Node::Actions
+ # session.has_css?('#foobar') # from Capybara::Node::Matchers
+ #
+ class Base
+ attr_reader :session, :base
+
+ include Capybara::Node::Finders
+ include Capybara::Node::Actions
+ include Capybara::Node::Matchers
+
+ def initialize(session, base)
+ @session = session
+ @base = base
+ end
+
+ protected
+
+ def wait?
+ driver.wait?
+ end
+
+ def driver
+ session.driver
+ end
+ end
+ end
+end
@@ -0,0 +1,17 @@
+module Capybara
+ module Node
+
+ ##
+ #
+ # A {Capybara::Document} represents an HTML document. Any operation
+ # performed on it will be performed on the entire document.
+ #
+ # @see Capybara::Node
+ #
+ class Document < Base
+ def inspect
+ %(#<Capybara::Document>)
+ end
+ end
+ end
+end
Oops, something went wrong.

0 comments on commit d223d54

Please sign in to comment.