operawatir 0.4.1.pre5-jruby → 0.4.1.pre6-jruby

data/lib/operawatir/browser.rb

@@ -205,8 +205,7 @@ private
       # FIXME: OPERA_ARGS will be moved to OperaDriver soon.
       s.setOperaBinaryArguments ENV['OPERA_ARGS'].to_s + ' ' + self.settings[:args].to_s # if self.settings[:args]
       s.setNoQuit true if self.settings[:no_quit]
-      s.setUseOperaIdle false if !self.settings[:opera_idle]
-      s.setUseOperaIdle true if ENV['OPERA_IDLE'].truthy?
+      s.setUseOperaIdle true if self.settings[:opera_idle] or ENV['OPERA_IDLE'].truthy?
     }
   end
 

data/lib/operawatir/collection.rb

@@ -51,7 +51,7 @@ class OperaWatir::Collection
   # Public interface to elms, used in Selector
   def raw_elements
     _elms.tap do |e|
-      raise(OperaWatir::Exceptions::UnknownObjectException) if e.empty?
+      #raise(OperaWatir::Exceptions::UnknownObjectException) if e.empty?
     end
   end
 

data/lib/operawatir/compat/collection.rb

@@ -79,6 +79,10 @@ class OperaWatir::Collection
     define_method(name) {method_missing(name)}
   end
 
+=begin
+  This only applies to Watir 1.  #to_s is in Watir 2 treated the same
+  way as Object#to_s (which will give you a Collection instance).
+
   # Fetches the string representation of this collection.
   #
   # @return [String] the string representation of this collection
@@ -95,6 +99,15 @@ class OperaWatir::Collection
       "  text:         #{el.text}"
     end.join("\n")
   end
+=end
+
+  def select(option_text)
+    option(:text => option_text).node.setSelected
+  end
+
+  def selected?(option_text)
+    option(:text => option_text).node.isSelected
+  end
 
 private
 

data/lib/operawatir/compat/element.rb

@@ -1,18 +1,24 @@
 class OperaWatir::Element
   include Deprecated
 
+  #
   # Gets the attribute called name.
   #
   # @param  [String, Symbol] name  The name of the attribute to get.
   # @return [String]               The value of the attribute.
+  #
+
   def attr(name)
     node.getAttribute(name.to_s) || ''
   end
 
+  #
   # Check the existence of the attribute on the element.
   #
   # @return [Boolean] True if the attribute exists on the element,
   #                   false otherwise.
+  #
+
   def attr?(name)
     !node.getAttribute(name.to_s).nil?
   end
@@ -25,9 +31,12 @@ class OperaWatir::Element
     end
   end
 
+  #
   # Gets the text content of the element.
   #
   # @return [String] The text content.
+  #
+
   def text
     if node.tag_name =~ /input|textarea|select/i
       node.value.strip
@@ -36,17 +45,18 @@ class OperaWatir::Element
     end
   end
 
-  alias_method :to_s, :text
-
+  #
   # Checks whether the text content of the element contains the given
   # string In the compatibility layer as the preferred way of doing
   # this is.
   #
   #   elm.text.should include('My string')
   #
-  # @param [String] String to search for
-  # @param [Boolean] true if the element's text contains str, false
-  #   otherwise
+  # @param [String]  String to search for.
+  # @param [Boolean] True if the element's text contains str, false
+  #                  otherwise.
+  #
+
   def verify_contains(str)
     text.include?(str)
   end
@@ -55,11 +65,15 @@ class OperaWatir::Element
 
   alias_method :caption, :text
 
+  #
   # Clicks on the top left of the element, or the given x, y offset.
+  # Asserts whether element is enabled first.
   #
   # @param [optional, Fixnum] x The offset from the left of the
   #   element
   # @param [optional, Fixnum] y The offset from the top of the element
+  #
+
   def click(x=0, y=0)
     assert_enabled!
     node.click(x.to_i, y.to_i)
@@ -67,27 +81,40 @@ class OperaWatir::Element
 
   alias_method :click_no_wait, :click_async
 
+  #
   # Focuses the element
+  #
+
   def focus
     fire_event :focus
   end
 
+  #
   # Submits a form, or the form the elment is contained in.
+  #
+
   def submit
     assert_exists
     node.submit
   end
 
+  #
   # Clears a text input or textarea of any text.
+  #
+
   def clear
     assert_enabled!
-    uncheck!
+    click
+    node.clear
   end
 
+  #
   # If passed a value it will type text into the element, otherwise it
   # will check a radio button or checkbox.
   #
-  # @param [optional, String] value Text to type
+  # @param [String] value  (Optional.) Text to type.
+  #
+
   def set(value=nil)
     if value
       self.text = value
@@ -97,31 +124,40 @@ class OperaWatir::Element
     end
   end
 
+  #
   # Gets the href of an `<a>` element, or the url attribute of any
   # other element.
   #
-  # @return [String] an href or the url attribute
+  # @return [String] An href or the @url attribute.
+  #
+
   def url
     attr(tag_name == 'A' ? :href : :url)
   end
 
+  #
   # Gets the selected `<option>` elements in a `<select>` element.
   #
-  # @return [OperaWatir::Collection] a collection of the selected
-  #   `<option>`s
+  # @return [Collection] a collection of the selected
+  #                                  `<option>`s
+  #
+
   def selected_options
     options(:selected?, true)
   end
 
+  #
   # On checkboxes, radio buttons, and option elements returns whether
   # the element is checked/selected. On a select element, when passed
   # an value it checks whether the selected option contains the given
   # text.
   #
-  # @param [optional, String] value Text the selected option should
-  #   contain
-  # @return [Boolean] true if the element is selected/selected option
-  #   contains value, false otherwise
+  # @param  [String]  value (Optional.) Text the selected option should
+  #                         contain.
+  # @return [Boolean]       True if the element is selected/selected
+  #                         option contains value, false otherwise.
+  #
+
   def selected?(value=nil)
     if option.nil?
       selected_options.text.include?(value)
@@ -132,10 +168,13 @@ class OperaWatir::Element
 
   alias_method :set?, :checked?
 
+  #
   # For `<select>` elements returns either 'select-one' for
   # `<select>`s where only a single `<option>` can be selected, or
   # 'select-multiple' otherwise.  For non-`<select>` elements returns
   # the `type` attribute.
+  #
+
   def type
     if tag_name == 'SELECT'
       attr(:multiple) == 'multiple' ? 'select-multiple' : 'select-one'
@@ -144,9 +183,12 @@ class OperaWatir::Element
     end
   end
 
+  #
   # Gets the colspan attribute as an integer.
   #
-  # @return [Fixnum] the colspan
+  # @return [Fixnum] The colspan.
+  #
+
   def colspan
     attr(:colspan).to_i
   end

data/lib/operawatir/compat/window.rb

@@ -3,33 +3,74 @@ module OperaWatir
     module Window
       include Deprecated
 
+      #
       # Checks whether the body has the given text in it.
       #
       # @param [String] str Text to search for.
       # @return [Boolean] true if the body contains the given text,
       #   false otherwise
+      #
+
       def contains_text(str)
         text.index(str)
       end
 
+
+      #
       # Find elements that match the given XPath.
       #
       # @param [String] value The XPath expression to search for.
       # @return [OperaWatir::Collection] A collection of matching
       #   elements.
+      #
+
       def elements_by_xpath(value)
         find_by_xpath(value)
       end
 
       alias_method :element_by_xpath, :elements_by_xpath
 
+
+      #
       # Opera specific
+      #
+
       def get_hash
         visual_hash
       end
 
       deprecated :get_hash, 'browser.visual_hash'
 
+
+      #
+      # TODO This is a relic from the old OperaWatir implementation,
+      # tests should be updated.
+      #
+
+      def frame(selector, argument)
+        case selector
+        when :name
+          driver.switch_to.frame(argument)
+        when :index
+          driver.switch_to.frame(argument.to_i - 1)  # index starts from 1 in Watir
+        else
+          raise OperaWatir::Exceptions::NotImplementedException,
+            "We do not support the `#{selector}' selector yet"
+        end
+      end
+
+
+      def switch_to_default
+        driver.switch_to.default_content
+      end
+
+      
+      def show_frames
+        frames = driver.list_frames
+        puts "There are #{frames.length.to_s} frames"
+        frames.each_with_index { |frame, i| puts "frame index: #{(i.to_i + 1).to_s} name: #{frame.to_s}" }
+      end
+
     end
   end
 end

data/lib/operawatir/desktop_browser.rb

@@ -26,7 +26,7 @@ module OperaWatir
       active_window.url = url
       sleep(1)
     end
-
+    
     ######################################################################
     # Quits Opera
     #
@@ -296,8 +296,11 @@ module OperaWatir
       end.to_a
     end
     
-    #@private
-    # Retrieve all tabs
+    ####################################################
+    # Retrieves an array of all tabs (Document Windows)
+    #
+    # @return [Array] Array of windows
+    #
     def open_pages
       quick_windows.select { |win| win.name == "Document Window" }
     end
@@ -413,6 +416,24 @@ module OperaWatir
     def cache_preferences_path
       driver.getCachePreferencesPath()
     end
+    
+    ######################################################################
+    # Returns the language string corresponding to the string_id provided
+    #
+    # @param string_id the string_id to convert to the corresponding
+    #                  language string
+    # @param skip_ampersand if false, then leave string as is, else
+    #                  (default) remove any ampersand in string
+    #
+    #
+    # @example
+    #   browser.string("D_NEW_PREFERENCES_GENERAL")
+    #
+    # @return [String] the language string corresponding to the string_id
+    #
+    def string(string_id, skip_ampersand = true)
+      string = driver.getString(string_id, skip_ampersand)
+    end
 
     ######################################################################
     # Returns true if the test is running on Mac 
@@ -543,8 +564,6 @@ module OperaWatir
     # Set preference pref in prefs section prefs_section to value
     # specified.
     #
-    # TODO: This needs to be moved to a separate preference section.
-    #
     # @param [String] prefs_section The prefs section the pref belongs to
     # @param [String] pref          The preference to set
     # @param [String] value         The value to set the preference to
@@ -554,8 +573,6 @@ module OperaWatir
 
     # Get value of preference pref in prefs section prefs_section.
     #
-    # TODO: This needs to be moved to a separate preference section.
-    #
     # @param [String] prefs_section The prefs section the pref belongs to
     # @param [String] pref          The preference to get
     #
@@ -567,8 +584,6 @@ module OperaWatir
     # Get default value of preference pref in prefs section
     # prefs_section.
     #
-    # TODO: This needs to be moved to a separate preference section.
-    #
     # @param [String] prefs_section The prefs section the pref belongs to
     # @param [String] pref          The preference to get
     #
@@ -587,12 +602,14 @@ private
    def self.opera_driver_settings
      @opera_driver_settings ||= OperaDriverSettings.new.tap {|s|
        s.setRunOperaLauncherFromOperaDriver true
+       s.setAutostart false if self.settings[:manual]
        s.setOperaLauncherBinary self.settings[:launcher]
        s.setOperaBinaryLocation self.settings[:path]
        s.setOperaBinaryArguments self.settings[:args].to_s + ' -autotestmode'
        s.setNoQuit self.settings[:no_quit]
        s.setNoRestart self.settings[:no_restart]
        s.setGuessOperaPath false
+       s.setUseOperaIdle false if !self.settings[:opera_idle]
      }
    end
    

data/lib/operawatir/desktop_container.rb

@@ -14,7 +14,12 @@ module OperaWatir
     # @return [Object] button object if found, otherwise nil
     #
     def quick_button(how, what)
-      QuickButton.new(self, how, what, parent_widget, window_id)
+      if how == :pos
+        if what.is_a? Fixnum
+          what = [0, what]
+        end
+      end
+      QuickButton.new(self, how, what, parent_widget, window_id, :button)
     end
     
     ######################################################################
@@ -36,7 +41,7 @@ module OperaWatir
           what = [0, what]
         end
       end
-      QuickTab.new(self, how, what, parent_widget, window_id)
+      QuickTab.new(self, how, what, parent_widget, window_id, :tabbutton)
     end
        
     ######################################################################
@@ -51,7 +56,7 @@ module OperaWatir
     # @return [Object] checkbox object if found, otherwise nil
     #
     def quick_checkbox(how, what)
-      QuickCheckbox.new(self, how, what, parent_widget, window_id)
+      QuickCheckbox.new(self, how, what, parent_widget, window_id, :checkbox)
     end
 
     ######################################################################
@@ -66,7 +71,7 @@ module OperaWatir
     # @return [Object] dialog tab object if found, otherwise nil
     #
     def quick_dialogtab(how, what)
-      QuickDialogTab.new(self, how, what, parent_widget, window_id)
+      QuickDialogTab.new(self, how, what, parent_widget, window_id, :dialogtab)
     end
 
     ######################################################################
@@ -81,10 +86,24 @@ module OperaWatir
     # @return [Object] drop down object if found, otherwise nil
     #
     def quick_dropdown(how, what)
-      QuickDropdown.new(self, how, what, parent_widget, window_id)
+      QuickDropdown.new(self, how, what, parent_widget, window_id, :dropdown)
     end
 
-    
+   ######################################################################
+   # Method for accessing a quickfind element
+   #
+   # @example
+   #   browser.quick_find(:name, "Filetypes_quickfind")
+   #
+   # @param [String] how   Method to find the element. :name, :string_id or :text
+   # @param [String] what  Search text to find the element with.  
+   #
+   # @return [Object] quickfind object if found, otherwise nil
+   #
+   def quick_find(how, what)
+     QuickFind.new(self, how, what, parent_widget, window_id, :quickfind)
+   end
+
     ######################################################################
     # Method for accessing an edit or multiedit element
     #
@@ -97,7 +116,7 @@ module OperaWatir
     # @return [Object] edit field object if found, otherwise nil
     #
     def quick_editfield(how, what)
-      QuickEditField.new(self, how, what, parent_widget, window_id)
+      QuickEditField.new(self, how, what, parent_widget, window_id, :editfield)
     end
 
     ######################################################################
@@ -112,7 +131,7 @@ module OperaWatir
     # @return [Object] label object if found, otherwise nil
     #
     def quick_label(how, what)
-      QuickLabel.new(self, how, what, parent_widget, window_id)
+      QuickLabel.new(self, how, what, parent_widget, window_id, :label)
     end
 
     ######################################################################
@@ -127,7 +146,7 @@ module OperaWatir
     # @return [Object] radio button object if found, otherwise nil
     #
     def quick_radiobutton(how, what)
-      QuickRadioButton.new(self, how, what, parent_widget, window_id)
+      QuickRadioButton.new(self, how, what, parent_widget, window_id, :radiobutton)
     end
 
     ######################################################################
@@ -142,7 +161,7 @@ module OperaWatir
     # @return [Object] treeview object if found, otherwise nil
     #
     def quick_treeview(how, what)
-      QuickTreeView.new(self, how, what, parent_widget, window_id)
+      QuickTreeView.new(self, how, what, parent_widget, window_id, :treeview)
     end
     
     ######################################################################
@@ -157,7 +176,7 @@ module OperaWatir
     # @return [Object] addressfield object if found, otherwise nil
     #
     def quick_addressfield(how, what)
-        QuickAddressField.new(self, how, what, parent_widget, window_id)
+        QuickAddressField.new(self, how, what, parent_widget, window_id, :addressfield)
     end
         
     ######################################################################
@@ -172,7 +191,7 @@ module OperaWatir
     # @return [Object] searchfield object if found, otherwise nil
     #
     def quick_searchfield(how, what)
-      QuickSearchField.new(self, how, what, parent_widget, window_id)
+      QuickSearchField.new(self, how, what, parent_widget, window_id, :search)
     end
     
     ######################################################################
@@ -187,7 +206,7 @@ module OperaWatir
     # @return [Object] toolbar object if found, otherwise nil
     #
     def quick_toolbar(how, what)
-      QuickToolbar.new(self, how, what, parent_widget, window_id)
+      QuickToolbar.new(self, how, what, parent_widget, window_id, :toolbar)
     end
     
     ######################################################################
@@ -203,29 +222,63 @@ module OperaWatir
     # @return [Object] treeitem object if found, otherwise nil
     #
     def quick_treeitem(how, what)
-      QuickTreeItem.new(self, how, what, parent_widget, window_id)
+      QuickTreeItem.new(self, how, what, parent_widget, window_id, :treeitem)
     end
- 
-   ######################################################################
-   # Method for accessing a thumbnail (speeddial, thumbnail when  hovering tab groups)
-   #
-   # @example
-   #   browser.quick_thumbnail(:name, "Thumbnail 1")
-   #   browser.quick_thumbnail(:name, "Speed Dial 2")
-   #
-   # @param [String] how   Method to find the element. :name, :string_id or :text
-   # @param [String] what  Search text to find the element with. Text or position 
-   #                        of treeitem. Position is specified as [row, column]
-   #
-   # @return [Object] thumbnail object if found, otherwise nil
-   #
+
+    ######################################################################
+    # Method for accessing a grid item in a gridlayout
+    #
+    # @example (The label dialog for mail labels)
+    #   browser.quick_gridlayout(:name, "RulesGrid").quick_griditem(:name, "GridItem0").quick_editfield(:name, "Match")
+    #
+    # @param [String] how   Method to find the element. :name, :string_id or :text
+    # @param [String] what  Search text to find the element with. Text or position 
+    #                        of treeitem. Position is specified as [row, column]
+    #
+    # @return [Object] griditem object if found, otherwise nil
+    #
+    def quick_griditem(how, what)
+      QuickGridItem.new(self, how, what, parent_widget, window_id, :griditem)
+    end
+
+    ######################################################################
+    # Method for accessing a grid layout 
+    # (A grid layout would normally be used to specify the path to a child item in one of its cells. 
+    #
+    # @example (The label dialog for mail labels)
+    #   browser.quick_gridlayout(:name, "RulesGrid").quick_griditem(:name, "GridItem0").quick_editfield(:name, "Match")
+    #
+    # @param [String] how   Method to find the element. :name, :string_id or :text
+    # @param [String] what  Search text to find the element with. Text or position 
+    #                        of treeitem. Position is specified as [row, column]
+    #
+    # @return [Object] gridlayout object if found, otherwise nil
+    #
+     def quick_gridlayout(how, what)
+       QuickGridLayout.new(self, how, what, parent_widget, window_id, :gridlayout)
+     end
+
+     
+    ######################################################################
+    # Method for accessing a thumbnail (speeddial, thumbnail when  hovering tab groups)
+    #
+    # @example
+    #   browser.quick_thumbnail(:name, "Thumbnail 1")
+    #   browser.quick_thumbnail(:name, "Speed Dial 2")
+    #
+    # @param [String] how   Method to find the element. :name, :string_id or :text
+    # @param [String] what  Search text to find the element with. Text or position 
+    #                        of treeitem. Position is specified as [row, column]
+    #
+    # @return [Object] thumbnail object if found, otherwise nil
+    #
     def quick_thumbnail(how, what)
       if how == :pos
          if what.is_a? Fixnum
            what = [0, what]
          end
        end
-      QuickThumbnail.new(self, how, what, parent_widget, window_id)
+      QuickThumbnail.new(self, how, what, parent_widget, window_id, :thumbnail)
     end
 
     ######################################################################