operawatir 0.4-jruby → 0.4.1-jruby

data/lib/operawatir/compat/window.rb

@@ -1,27 +1,76 @@
 module OperaWatir
   module Compat
     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

@@ -3,16 +3,19 @@ module OperaWatir
     include DesktopContainer
     include DesktopCommon
     
-    #@private
-    LoadActions = ["Open url in new page", "Open url in current page", "Open url in background page",
-      "Open url in new window"]
+    LoadActions = ["Open url in new page", "Open url in current page", "Open url in new background page",
+      "Open url in new window", "New private page", "Paste and go", "Paste and go background", 
+      "Hotclick search", "Duplicate page", "Reopen page", "Back", "Forward", "Help"]
     
     # @private
     def initialize
-      OperaWatir.compatibility! unless OperaWatir.api >= 2
+      OperaWatir.compatibility! unless OperaWatir.api >= 3
 
       self.driver = OperaDesktopDriver.new(self.class.opera_driver_settings)
       self.active_window = OperaWatir::Window.new(self)
+      self.preferences   = OperaWatir::Preferences.new(self)
+      self.keys          = OperaWatir::Keys.new(self)
+      self.spatnav       = OperaWatir::Spatnav.new(self)
     end
 
     # @private
@@ -20,10 +23,10 @@ module OperaWatir
     # dialogs to autoclose in Dialog.cpp when then OnUrlChanged is fired 
     # after a dialog is opened
     def goto(url = "")
-      super #active_window.url = url
+      active_window.url = url
       sleep(1)
     end
-
+    
     ######################################################################
     # Quits Opera
     #
@@ -38,7 +41,7 @@ module OperaWatir
       driver.quitOpera
       driver.startOpera
     end
-
+    
     ######################################################################
     # Quits the driver without exiting Opera
     #
@@ -235,12 +238,24 @@ module OperaWatir
     #       puts quick_widget.to_s
     #   end
     #
-    # @param win_name [String] name or [int] id of the window to retrieve the list of widgets from,
+    # @param window [String] name or [int] id of the window to retrieve the list of widgets from,
     #
     # @return [Array] Array of widgets retrieved from the window
     #
-    def widgets(win_name)
-      driver.getQuickWidgetList(win_name).map do |java_widget|
+    def widgets(window)
+      
+      # If window specifies window name, and the active window has this name
+      # use its id to get the widgets,
+      if window.is_a? String
+        active_win_id = driver.getActiveQuickWindowID()
+        active_win_name = driver.getQuickWindowName(active_win_id)
+        
+        #If the active window is of same type, then grab that one, not first
+        if active_win_name == window #e.g. Both Document Window 
+          window = active_win_id
+        end
+      end
+      driver.getQuickWidgetList(window).map do |java_widget|
         case java_widget.getType
           when QuickWidget::WIDGET_ENUM_MAP[:button]
             QuickButton.new(self,java_widget)
@@ -281,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
@@ -398,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 
@@ -525,16 +561,55 @@ module OperaWatir
       driver.deleteOperaPrefs
     end
     
+    # Set preference pref in prefs section prefs_section to value
+    # specified.
+    #
+    # @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
+    def set_preference(prefs_section, pref, value)
+      driver.setPref(prefs_section, pref, value.to_s)
+    end
+
+    # Get value of preference pref in prefs section prefs_section.
+    #
+    # @param [String] prefs_section The prefs section the pref belongs to
+    # @param [String] pref          The preference to get
+    #
+    # @return [String] The value of the preference
+    def get_preference(prefs_section, pref)
+      driver.getPref(prefs_section, pref)
+    end
+        
+    # Get default value of preference pref in prefs section
+    # prefs_section.
+    #
+    # @param [String] prefs_section The prefs section the pref belongs to
+    # @param [String] pref          The preference to get
+    #
+    # @return [String] The value of the preference
+    def get_default_preference(prefs_section, pref)
+      driver.getDefaultPref(prefs_section, pref)
+    end
+      
+    # @private
+    def start_opera
+      driver.startOpera
+    end
+
 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] + ' -watirtest'
+       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
    
@@ -550,4 +625,3 @@ private
   end
   
 end
-

data/lib/operawatir/desktop_common.rb

@@ -41,14 +41,12 @@ private
     end
     
     def key_down(key, *opts)
-      puts "keydown"
       list = Java::JavaUtil::ArrayList.new
       opts.each { |mod| list << KEYMODIFIER_ENUM_MAP[mod] }
       driver.keyDown(key, list)
     end
     
     def key_up(key, *opts)
-      puts "keyup"
       list = Java::JavaUtil::ArrayList.new
       opts.each { |mod| list << KEYMODIFIER_ENUM_MAP[mod] }
       driver.keyUp(key, list)

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
 
     ######################################################################