operawatir 0.4.3.pre1-jruby → 0.5-jruby

data/lib/operawatir/quickwidgets.rb

@@ -1,4 +1,4 @@
-%w(quick_widget quick_button quick_checkbox quick_editfield 
-    quick_dropdown quick_dialogtab quick_label quick_radiobutton quick_treeview quick_addressfield 
+%w(quick_widget quick_button quick_checkbox quick_editfield
+    quick_dropdown quick_dialogtab quick_label quick_radiobutton quick_treeview quick_addressfield
     quick_searchfield quick_toolbar quick_window quick_tab quick_treeitem quick_thumbnail
-    quick_find quick_griditem quick_gridlayout).each {|widget| require "operawatir/quickwidgets/#{widget}"}
+    quick_find quick_griditem quick_gridlayout quick_menu quick_menuitem quick_dropdownitem).each {|widget| require "operawatir/quickwidgets/#{widget}"}

data/lib/operawatir/quickwidgets/quick_addressfield.rb

@@ -8,21 +8,26 @@ module OperaWatir
       @element.getType == WIDGET_ENUM_MAP[:addressfield]
     end
 
-    # Enters the url into the address field, and waits for page loading 
+    # Enters the url into the address field, and waits for page loading
     # to finish
     #
+    # @example (with RSpec)
+    #    addressfield.load_page_with_url("opera:debug").should == "opera:debug"
+    #
     # @param  [String] URL to load
     # @return [String] text in the address field after the page is loaded
     #                  or a blank string
     # @raise [Exceptions::UnknownObjectException] if the widget could not be found
     #           using the specified method
+    #
     def load_page_with_url(url)
       # Must focus field before calling enter_text...
       focus_with_click
+
       # Enters text in a field and then hits enter
       enter_text_and_hit_enter(url)
     end
-    
+
     #
     # Gets the visible text in the address field
     #
@@ -30,10 +35,11 @@ module OperaWatir
     #
     # @raise [Exceptions::UnknownObjectException] if the widget could not be found
     #           using the specified method
+    #
     def visible_text
       element.getVisibleText()
     end
-    
+
     #
     # Gets the highlighted text in the address field
     #
@@ -41,9 +47,10 @@ module OperaWatir
     #
     # @raise [Exceptions::UnknownObjectException] if the widget could not be found
     #           using the specified method
+    #
     def highlighted_text
-      element.getAdditionalText()     
+      element.getAdditionalText()
     end
-    
+
   end
 end

data/lib/operawatir/quickwidgets/quick_button.rb

@@ -1,6 +1,7 @@
 module OperaWatir
   class QuickButton < QuickWidget
- 
+    include ClickableItem
+
     # @private
     # Checks the type of the widget is correct
     def correct_type?
@@ -16,29 +17,13 @@ module OperaWatir
       element.isDefault
     end
 
-    ######################################################################
-    # Clicks the button, and waits for the window with window name 
-    # win_name to be shown
-    #
-    # @param [String] win_name name of the window that will be opened (Pass a blank string for any window)
-    #
-    # @return [int] Window ID of the window shown or 0 if no window is shown
-    #
-    # @raise [DesktopExceptions::WidgetNotVisibleException] if the button
-    #            is not visible
-    #
-    def open_window_with_click(win_name)
-      wait_start
-      click
-      wait_for_window_shown(win_name)
-    end
-    
-    alias_method :open_dialog_with_click, :open_window_with_click
-
     ######################################################################
     # Clicks the button, and waits for the dialog wizard to switch
     # to the next page
     #
+    # @example
+    #        browser.quick_button(:name, "button_Next").change_page_with_click
+    #
     # @return [int] Window ID of the dialog wizard or 0 if no window is shown
     #
     # @raise [DesktopExceptions::WidgetNotVisibleException] if the button
@@ -49,9 +34,10 @@ module OperaWatir
       click
       wait_for_window_shown("")
     end
-    
+
+
     ######################################################################
-    # Clicks the button, and waits for the window with window name 
+    # Clicks the button, and waits for the window with window name
     # win_name to closed
     #
     # @param [String] win_name name of the window that will be closed (Pass a blank string for any window)
@@ -66,25 +52,10 @@ module OperaWatir
       click
       wait_for_window_close(win_name)
     end
-    
+
     alias_method :close_dialog_with_click, :close_window_with_click
-    
-    ######################################################################
-    # Clicks the button, and waits for loading to finish
-    #
-    # @return [int] Window ID of the window shown or 0 if no window is shown
-    #
-    # @raise [DesktopExceptions::WidgetNotVisibleException] if the button
-    #            is not visible
-    #
-    def load_page_with_click
-      wait_start
-      click()
-      # Just wait for the load
-      wait_for_window_loaded("")
-    end
-        
-    
+
+
     ######################################################################
     # Clicks a button or expand control and toggles it state
     #
@@ -97,10 +68,10 @@ module OperaWatir
     #
     def toggle_with_click
       click
-          
-      # Cheat since we don't have an event yet 
+
+      # Cheat since we don't have an event yet
       sleep(0.1)
-        
+
       # Note: click might have made this element dissapear ...
       begin
         element(true).getValue
@@ -108,22 +79,25 @@ module OperaWatir
         nil
       end
     end
-  
+
     ######################################################################
-    # Clicks button to close the toolbar 
+    # Clicks button to close the toolbar
+    #
+    # @example
+    #  browser.quick_toolbar(:name, "Go To Intranet Toolbar").quick_button(:name, "Done").close_toolbar_with_click
     #
     # @raise [DesktopExceptions::WidgetNotVisibleException] if the button
     #            is not visible
     #
     def close_toolbar_with_click
       click
-      
+
       # Cheat since we don't have an event yet
       sleep(0.1)
     end
-          
+
     alias_method :close_panel_with_click, :close_toolbar_with_click
- 
+
     ######################################################################
     # Clicks button to expand or collapse the toolbar
     #
@@ -135,9 +109,9 @@ module OperaWatir
       sleep(0.1)
       #No refresh element because it might not be there still (after click):)
     end
-    
+
     alias_method :collapse_with_click, :expand_with_click
-    
+
     ######################################################################
     # Gets the value of the button or expand control.
     #
@@ -148,16 +122,28 @@ module OperaWatir
     def value
       element.getValue
     end
-    
+
     ######################################################################
     # Pauses to wait for security dialogs when buttons are not active
-    # right away on opening 
+    # right away on opening
+    #
+    # @example (RSpec)
+    #   browser.quick_button(:name, "button_OK").wait_for_enabled.should == true
     #
     # @return [Boolean] Returns true if the button becomes active
     #
     def wait_for_enabled
       wait_for_widget_enabled
     end
-    
+
+    ######################################################################
+    # Waits for widget to be visible
+    #
+    # @return [Boolean] Returns true if the button becomes active
+    #
+    def wait_for_visible
+      wait_for_widget_visible
+    end
+
   end
 end

data/lib/operawatir/quickwidgets/quick_checkbox.rb

@@ -1,6 +1,6 @@
 module OperaWatir
   class QuickCheckbox < QuickWidget
-    
+
     # @private
     # Checks the type of the widget is correct
     def correct_type?
@@ -17,7 +17,7 @@ module OperaWatir
     def checked?
       element.isSelected
     end
-    
+
     ######################################################################
     # Clicks a radio button or checkbox and toggles it state
     #
@@ -29,17 +29,17 @@ module OperaWatir
     #
     def toggle_with_click
       click
-      
-      # Cheat since we don't have an even yet 
+
+      # Cheat since we don't have an even yet
       sleep(0.1)
 
       # is this guaranteed to be same as getValue?
       element(true).isSelected
     end
 
-    
+
     ######################################################################
-    # Clicks the checkbox, and waits for the window with window name 
+    # Clicks the checkbox, and waits for the window with window name
     # win_name to be shown
     #
     # @param [String] win_name name of the window that will be opened (Pass a blank string for any window)

data/lib/operawatir/quickwidgets/quick_dialogtab.rb

@@ -6,18 +6,18 @@ module OperaWatir
     def correct_type?
       @element.getType == WIDGET_ENUM_MAP[:dialogtab]
     end
-    
+
     ######################################################################
-    # Switches to the dialog tab by clicking on it 
+    # Switches to the dialog tab by clicking on it
     #
-    # @raise [DesktopExceptions::WidgetNotVisibleException] if the dialogtab 
+    # @raise [DesktopExceptions::WidgetNotVisibleException] if the dialogtab
     #            is not visible
     #
     def activate_tab_with_click
       click
-      
+
       # No event yet so just cheat and sleep
       sleep(0.1);
     end
-  end  
+  end
 end

data/lib/operawatir/quickwidgets/quick_dropdown.rb

@@ -6,7 +6,7 @@ module OperaWatir
     def correct_type?
       @element.getType == WIDGET_ENUM_MAP[:dropdown]
     end
-    
+
     ######################################################################
     # Checks if the item selected in the dropdown matches the text loaded
     # from Opera using the string_id
@@ -14,14 +14,38 @@ module OperaWatir
     # @param [String] string_id String ID to use to load the string from the current
     #                 language file (e.g. "D_NEW_PREFERENCES_GENERAL")
     #
-    # @return [Boolean] true if the dropdown has the item with the 
+    # @return [Boolean] true if the dropdown has the item with the
     #                   string_id selected, otherwise false
     #
     # @raise [Exceptions::UnknownObjectException] if the widget could not be found
     #           using the specified method
+    #
     def selected?(string_id)
       element.isSelected(string_id)
     end
-    
+
+    #########################################################################
+    #
+    # @example
+    #    browser.quick_dropdown(:name, "Close_tab_dropdown").dropped_down?
+    #
+    # @return true if dropdown is dropped_down/open, else false
+    #
+    def dropped_down?
+      element.getValue() > 0
+    end
+
+
+    ############################################################################
+    # Click dropdown to open it
+    #
+    # @example
+    #    browser.quick_dropdown(:name, "Close_tab_dropdown").open_with_click
+    #
+    def open_with_click
+      click
+      sleep(0.1)
+    end
+
   end
-end 
+end

data/lib/operawatir/quickwidgets/quick_dropdownitem.rb

@@ -0,0 +1,46 @@
+module OperaWatir
+  class QuickDropdownItem < QuickEditField #QuickWidget # QuickEditField?
+
+    # @private
+    # Checks the type of the widget is correct
+    def correct_type?
+      @element.getType == WIDGET_ENUM_MAP[:dropdownitem]
+    end
+
+    ######################################################################
+    # Checks if the item is selected
+    #
+    # @return [Boolean] true if the dropdown has the item with the
+    #                   string_id selected, otherwise false
+    #
+    # @raise [Exceptions::UnknownObjectException] if the widget could not be found
+    #           using the specified method
+    def selected?
+      element(true).isSelected()
+    end
+
+    ##########################################################################
+    # Select item by click
+    #
+    # @example
+    #    browser.quick_dropdownitem(:text, "Activate the next tab").select_with_click
+    #
+    # @return true if item is now selected, otherwise false
+    #
+    def select_with_click
+      if mac_internal?
+        press_menu
+      else
+        click
+      end
+      selected?
+    end
+
+    private
+
+    # Selects an item from a drop down pop menu where you can't click them on Mac
+    def press_menu
+      driver.pressQuickMenuItem(text, true);
+    end
+  end
+end

data/lib/operawatir/quickwidgets/quick_editfield.rb

@@ -10,13 +10,16 @@ module OperaWatir
     ######################################################################
     # Sets focus to the edit field by clicking on it
     #
-    # @raise [DesktopExceptions::WidgetNotVisibleException] if the editfield 
+    # @example
+    #   browser.quick_editfield(:name, "Startpage_edit").focus_with_clic
+    #
+    # @raise [DesktopExceptions::WidgetNotVisibleException] if the editfield
     #            is not visible
     #
     def focus_with_click
       super
     end
-        
+
     ######################################################################
     # Types a text string into the edit field
     #
@@ -25,20 +28,20 @@ module OperaWatir
     #
     # @param [String] text text string to type in
     # @param wait - seconds to wait after typing
-    # 
+    #
     # @return [String] contents of the edit field after typing has completed
     #
     def type_text(text, wait = 0)
       text.each_char { | t | key_press_direct t }
-      
+
       # No event yet so just cheat and sleep
       sleep(0.2)
 
       # Return what is in the field to check
       text = element(true).getText
-      
+
       sleep(wait) if wait != 0
-      
+
       text
     end
 
@@ -47,10 +50,10 @@ module OperaWatir
     #
     def clear
       focus_with_click
-      
+
       key_press_direct("a", :ctrl)
       key_press_direct("backspace")
-      
+
       # Cheat until we have an event
       sleep(0.1)
     end
@@ -74,7 +77,7 @@ module OperaWatir
     #
     def key_press(key, *modifiers)
       key_press_direct(key, *modifiers)
-      
+
       # Cheat until we have an event
       sleep(0.1)
 
@@ -82,7 +85,7 @@ module OperaWatir
       element(true).getText
     end
 
-    private  
+    private
     # @private
     # Presses the key, and waits for loading to finish
     def load_page_with_key_press(key, *modifiers)
@@ -95,12 +98,12 @@ module OperaWatir
     # Enter some text and hit enter to do the action for the field
     def enter_text_and_hit_enter(text)
       loaded_url = ""
-      
-      # OBS: only caller should set focus, if not this will happily type 
+
+      # OBS: only caller should set focus, if not this will happily type
       # away in the incorrect field, if for example called from subclass address_field
       # Set focus
       # focus_with_click
-      
+
       # Clear the field
       clear
       # Type in the text