lib/watir.rb in watir-6.10.1 vs lib/watir.rb in watir-6.10.2
- old
+ new
@@ -1,158 +1,158 @@
-require 'selenium-webdriver'
-
-require 'watir/legacy_wait'
-require 'watir/wait'
-require 'watir/exception'
-require 'watir/xpath_support'
-require 'watir/window'
-require 'watir/has_window'
-require 'watir/adjacent'
-require 'watir/js_execution'
-require 'watir/alert'
-require 'watir/js_snippets'
-require 'watir/container'
-require 'watir/cookies'
-require 'watir/capabilities'
-require 'watir/browser'
-require 'watir/screenshot'
-require 'watir/after_hooks'
-require 'watir/logger'
-
-module Watir
-
- @relaxed_locate = true
-
- class << self
-
- attr_writer :relaxed_locate, :always_locate, :default_timeout, :prefer_css, :locator_namespace
-
- #
- # Whether or not Watir should wait for an element to be found or present
- # before taking an action.
- # Defaults to true.
- #
-
- def relaxed_locate?
- @relaxed_locate
- end
-
- #
- # Whether or not Watir should re-locate a stale Element on use.
- #
-
- def always_locate?
- always_locate_message
- true
- end
-
- def always_locate_message
- Watir.logger.warn <<-EOS
-Watir#always_locate is deprecated; elements are always cached and will always
-be re-located if they go stale before use.
-Use Element#stale? or Element#wait_until(&:stale?) if needed for flow control.
- EOS
- end
-
- #
- # Whether or not Watir should prefer CSS when translating the Watir selectors to Selenium.
- #
-
- def prefer_css?
- prefer_css_message
- false
- end
-
- def prefer_css_message
- Watir.logger.warn <<-EOS
-Watir#prefer_css is deprecated; all elements that can not be passed directly
-as Selenium locators will be translated to XPath. To continue using CSS Selectors
-require the watir_css gem - https://github.com/watir/watir_css
- EOS
- end
-
- #
- # Default wait time for wait methods.
- #
-
- def default_timeout
- @default_timeout ||= 30
- end
-
- #
- # Whether the locators should be used from a different namespace.
- # Defaults to Watir::Locators.
- #
-
- def locator_namespace
- @locator_namespace ||= Watir::Locators
- end
-
- #
- # @api private
- #
-
- def tag_to_class
- @tag_to_class ||= {}
- end
-
- #
- # @api private
- #
-
- def element_class_for(tag_name)
- tag_to_class[tag_name.to_sym] || HTMLElement
- end
- end
-
- #
- # Returns logger instance that can be used across the whole Selenium.
- #
- # @return [Logger]
- #
-
- def self.logger
- @logger ||= Watir::Logger.new
- end
-
-end
-require 'watir/locators'
-
-require 'watir/attribute_helper'
-require 'watir/row_container'
-require 'watir/cell_container'
-require 'watir/user_editable'
-require 'watir/element_collection'
-require 'watir/elements/element'
-
-require 'watir/elements/html_elements'
-require 'watir/elements/svg_elements'
-
-require 'watir/elements/area'
-require 'watir/elements/button'
-require 'watir/elements/cell'
-require 'watir/elements/checkbox'
-require 'watir/elements/dlist'
-require 'watir/elements/file_field'
-require 'watir/elements/font'
-require 'watir/elements/form'
-require 'watir/elements/iframe'
-require 'watir/elements/hidden'
-require 'watir/elements/image'
-require 'watir/elements/link'
-require 'watir/elements/list'
-require 'watir/elements/option'
-require 'watir/elements/radio'
-require 'watir/elements/row'
-require 'watir/elements/select'
-require 'watir/elements/table'
-require 'watir/elements/table_cell'
-require 'watir/elements/table_row'
-require 'watir/elements/table_section'
-require 'watir/elements/text_area'
-require 'watir/elements/text_field'
-require 'watir/elements/input'
-require 'watir/radio_set'
-
-require 'watir/aliases'
-
-Watir.tag_to_class.freeze
+require 'selenium-webdriver'
+
+require 'watir/legacy_wait'
+require 'watir/wait'
+require 'watir/exception'
+require 'watir/xpath_support'
+require 'watir/window'
+require 'watir/has_window'
+require 'watir/adjacent'
+require 'watir/js_execution'
+require 'watir/alert'
+require 'watir/js_snippets'
+require 'watir/container'
+require 'watir/cookies'
+require 'watir/capabilities'
+require 'watir/browser'
+require 'watir/screenshot'
+require 'watir/after_hooks'
+require 'watir/logger'
+
+module Watir
+
+ @relaxed_locate = true
+
+ class << self
+
+ attr_writer :relaxed_locate, :always_locate, :default_timeout, :prefer_css, :locator_namespace
+
+ #
+ # Whether or not Watir should wait for an element to be found or present
+ # before taking an action.
+ # Defaults to true.
+ #
+
+ def relaxed_locate?
+ @relaxed_locate
+ end
+
+ #
+ # Whether or not Watir should re-locate a stale Element on use.
+ #
+
+ def always_locate?
+ always_locate_message
+ true
+ end
+
+ def always_locate_message
+ Watir.logger.warn <<-EOS
+Watir#always_locate is deprecated; elements are always cached and will always
+be re-located if they go stale before use.
+Use Element#stale? or Element#wait_until(&:stale?) if needed for flow control.
+ EOS
+ end
+
+ #
+ # Whether or not Watir should prefer CSS when translating the Watir selectors to Selenium.
+ #
+
+ def prefer_css?
+ prefer_css_message
+ false
+ end
+
+ def prefer_css_message
+ Watir.logger.warn <<-EOS
+Watir#prefer_css is deprecated; all elements that can not be passed directly
+as Selenium locators will be translated to XPath. To continue using CSS Selectors
+require the watir_css gem - https://github.com/watir/watir_css
+ EOS
+ end
+
+ #
+ # Default wait time for wait methods.
+ #
+
+ def default_timeout
+ @default_timeout ||= 30
+ end
+
+ #
+ # Whether the locators should be used from a different namespace.
+ # Defaults to Watir::Locators.
+ #
+
+ def locator_namespace
+ @locator_namespace ||= Watir::Locators
+ end
+
+ #
+ # @api private
+ #
+
+ def tag_to_class
+ @tag_to_class ||= {}
+ end
+
+ #
+ # @api private
+ #
+
+ def element_class_for(tag_name)
+ tag_to_class[tag_name.to_sym] || HTMLElement
+ end
+ end
+
+ #
+ # Returns logger instance that can be used across the whole Selenium.
+ #
+ # @return [Logger]
+ #
+
+ def self.logger
+ @logger ||= Watir::Logger.new
+ end
+
+end
+require 'watir/locators'
+
+require 'watir/attribute_helper'
+require 'watir/row_container'
+require 'watir/cell_container'
+require 'watir/user_editable'
+require 'watir/element_collection'
+require 'watir/elements/element'
+
+require 'watir/elements/html_elements'
+require 'watir/elements/svg_elements'
+
+require 'watir/elements/area'
+require 'watir/elements/button'
+require 'watir/elements/cell'
+require 'watir/elements/checkbox'
+require 'watir/elements/dlist'
+require 'watir/elements/file_field'
+require 'watir/elements/font'
+require 'watir/elements/form'
+require 'watir/elements/iframe'
+require 'watir/elements/hidden'
+require 'watir/elements/image'
+require 'watir/elements/link'
+require 'watir/elements/list'
+require 'watir/elements/option'
+require 'watir/elements/radio'
+require 'watir/elements/row'
+require 'watir/elements/select'
+require 'watir/elements/table'
+require 'watir/elements/table_cell'
+require 'watir/elements/table_row'
+require 'watir/elements/table_section'
+require 'watir/elements/text_area'
+require 'watir/elements/text_field'
+require 'watir/elements/input'
+require 'watir/radio_set'
+
+require 'watir/aliases'
+
+Watir.tag_to_class.freeze