awetestlib 0.1.22-x86-mingw32 → 0.1.23-x86-mingw32

data/lib/awetestlib/regression/browser.rb

@@ -17,6 +17,27 @@ module Awetestlib
 
       # @!group Browser
 
+      # @note webdriver specific - still work in progress
+      def go_to_wd_url(browser, url)
+
+        Watir::Browser.class_eval do
+          def goto(uri)
+            uri = "http://#{uri}" unless uri =~ URI.regexp
+            @driver.navigate.to uri
+            run_checkers
+          end
+        end
+        browser.goto(url)
+
+        #in basic_auth1 edit:
+        #a = Thread.new {
+        #    goto_wd_url(browser, @myURL)
+        #  }
+
+      end
+
+      alias goto_wd_url go_to_wd_url
+
       # Open a browser based on the command line parameters that identify the browser and
       # version to use for the test.
       # @example
@@ -24,7 +45,7 @@ module Awetestlib
       # @param [String, Regexp] url When provided, the browser will go to this url.
       # @return [Watir::Browser]
       def open_browser(url = nil)
-        debug_to_log("Opening browser: #{@targetBrowser.name}")
+        message_to_report("Opening browser: #{@targetBrowser.name}")
         case @targetBrowser.abbrev
           when 'IE'
             @myBrowser = open_ie
@@ -96,24 +117,13 @@ module Awetestlib
         if url
           @myURL = url
         end
-        message_tolog("URL: #{@myURL}")
+        message_to_report("URL: #{@myURL}")
         browser.goto(@myURL)
         true
       rescue
         fatal_to_log("Unable to navigate to '#{@myURL}': '#{$!}'")
       end
 
-      def go_to_wd_url(browser, url)
-        Watir::Browser.class_eval do
-          def goto(uri)
-            uri = "http://#{uri}" unless uri =~ URI.regexp
-            @driver.navigate.to uri
-            run_checkers
-          end
-        end
-        browser.goto(url)
-      end
-
       # Return a reference to a browser window.  Used to attach a browser window to a variable
       # which can then be passed to methods that require a *browser* parameter.
       # @example
@@ -324,7 +334,7 @@ module Awetestlib
         ts  = Time.new
         msg = "Bailing out at util line #{lnbr} #{ts} " + desc
         puts "#{msg}"
-        fatal_to_log(msg, nil, 1, lnbr)
+        fatal_to_log(msg, lnbr)
         debug_to_log(dump_caller(lnbr))
         if is_browser?(browser)
           if @browserAbbrev == 'IE'
@@ -588,7 +598,7 @@ module Awetestlib
             begin
               panel.link(:text, what).click
             rescue => e
-              if not rescue_me(e, __method__, "link(:text,'#{what}').click", "#{panel.class}")
+              unless rescue_me(e, __method__, rescue_me_command(:link, :id, what, :click), "#{panel.class}")
                 raise e
               end
             end
@@ -688,7 +698,7 @@ module Awetestlib
             begin
               popup.link(:text, what).click
             rescue => e
-              if not rescue_me(e, __method__, "link(:text,'#{what}')", "#{popup.class}")
+              unless rescue_me(e, __method__, rescue_me_command(:link, :text, what, :click), "#{popup.class}")
                 raise e
               end
             end
@@ -803,11 +813,28 @@ module Awetestlib
         failed_to_log("Close popup title=#{title} failed: '#{$!}' (#{__LINE__})")
       end
 
-      alias close_popup_validate_text close_modal_ie
-      alias close_popup close_modal_ie
+      #alias close_popup_validate_text close_modal_ie
+      #alias close_popup close_modal_ie
 
       #  private :close_modal_ie
 
+      # Close an IE modal popup by its title. Calls close_modal_ie.
+      # @deprecated Use close_modal.
+      # @param [String] title The title of the window to be closed.  Matched from beginning of string.
+      # @param [String] button The display name of the button to be clicked.
+      # @param [String] text The text of the window to be closed.  Matched from beginning of string.
+      # @param [String] side A string identifying which mouse button to click.
+      # @param [Fixnum] wait Number of seconds to wait for the popup to be seen.
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
+      # @param [Boolean] quiet If true, fewer messages and pass/fail validations are logged.
+      def close_popup(title = '', button = 'OK', text = '', side = 'primary',
+                      wait = WAIT, desc = '', quiet = false)
+        debug_to_log("#{__method__} begin")
+        close_modal_ie(@myBrowser, title, button, text, side, wait, desc, quiet)
+      end
+
+      alias close_popup_validate_text close_popup
+
       # Close a Firefox modal popup by its title.
       # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
       # @param [String] title The title of the window to be closed.  Matched from beginning of string.
@@ -1052,71 +1079,34 @@ module Awetestlib
           when 'IE'
             @browserAbbrev  = 'IE'
             @browserName    = 'Internet Explorer'
-            @browserAppInfo = browser.document.invoke('parentWindow').navigator.appVersion
+            if $watir_script
+              @browserAppInfo = browser.document.invoke('parentWindow').navigator.appVersion
+            else
+              @browserAppInfo = browser.execute_script("return navigator.userAgent;")
+            end
             @browserAppInfo =~ /MSIE\s(.*?);/
             @browserVersion = $1
           when 'FF'
-            #@browserAbbrev = 'FF'
-            #@browserName   = 'Firefox'
-            #js_stuff       = <<-end_js_stuff
-            #var info = Components.classes["@mozilla.org/xre/app-info;1"]
-            #.getService(Components.interfaces.nsIXULAppInfo);
-            #[info, info.name, info.version];
-            #end_js_stuff
-            #js_stuff.gsub!("\n", " ")
-            #info = browser.execute_script(js_stuff)
-            #info, aName, @browserVersion = info.split(',')
-            #debug_to_log("FF info: [#{info}]")
-            #debug_to_log("FF name: [#{aName}]")
-            #debug_to_log("FF vrsn: [#{@browserVersion}]")
             @browserAbbrev  = 'FF'
             @browserName    = 'Firefox'
             @browserVersion = '6.01' #TODO: get actual version from browser
-            debug_to_log("Firefox, in get_browser_version (#{@browserVersion})")
+            @browserAppInfo = browser.execute_script("return navigator.userAgent;")
+            debug_to_log("#{@browserName}, @browserAppInfo: (#{@browserAppInfo})")
           when 'S'
             @browserAbbrev  = 'S'
             @browserName    = 'Safari'
             @browserVersion = '5.0.4' #TODO: get actual version from browser itself
-            debug_to_log("Safari, in get_browser_version (#{@browserVersion})")
+            @browserAppInfo = browser.execute_script("return navigator.userAgent;")
+            debug_to_log("#{@browserName}, @browserAppInfo: (#{@browserAppInfo})")
           when 'C'
             @browserAbbrev  = 'C'
             @browserName    = 'Chrome'
             @browserVersion = '11.0' #TODO: get actual version from browser
-            debug_to_log("Chrome, in get_browser_version (#{@browserVersion})")
+            @browserAppInfo = browser.execute_script("return navigator.userAgent;")
+            debug_to_log("#{@browserName}, @browserAppInfo: (#{@browserAppInfo})")
         end
-          # if [notify_queue, notify_class, notify_id].all?
-          #  Resque::Job.create(notify_queue, notify_class, :id => notify_id, :browser_used => "#{@browserName} #{@browserVersion}")
-          #end
       rescue
         debug_to_log("Unable to determine #{@browserAbbrev} browser version: '#{$!}' (#{__LINE__})")
-
-          # TODO: can we get rid of this?
-          # js for getting firefox version information
-          #      function getAppID() {
-          #        var id;
-          #        if("@mozilla.org/xre/app-info;1" in Components.classes) {
-          #          // running under Mozilla 1.8 or later
-          #          id = Components.classes["@mozilla.org/xre/app-info;1"]
-          #                         .getService(Components.interfaces.nsIXULAppInfo).ID;
-          #        } else {
-          #          try {
-          #            id = Components.classes["@mozilla.org/preferences-service;1"]
-          #                           .getService(Components.interfaces.nsIPrefBranch)
-          #                           .getCharPref("app.id");
-          #          } catch(e) {
-          #            // very old version
-          #            dump(e);
-          #          }
-          #        }
-          #        return id;
-          #      }
-          #      alert(getAppID());
-          # another snippet that shows getting attributes from object
-          #      var info = Components.classes["@mozilla.org/xre/app-info;1"]
-          #                 .getService(Components.interfaces.nsIXULAppInfo);
-          #      // Get the name of the application running us
-          #      info.name; // Returns "Firefox" for Firefox
-          #      info.version; // Returns "2.0.0.1" for Firefox version 2.0.0.1
       ensure
         message_to_log("Browser: [#{@browserAbbrev} #{@browserVersion}]")
       end
@@ -1156,15 +1146,15 @@ module Awetestlib
       # @param [Boolean] dbg If set to true additional debug messages are written to the log.
       #
       # @return [Boolean] True if no error conditions have been encountered.
-      def validate(browser, file_name = '', lnbr = "#{__LINE__}", dbg = false)
+      def validate(browser, file_name = @myName, lnbr = "#{__LINE__}", dbg = false)
         debug_to_log("#{__method__} begin") if dbg
         msg  = ''
         myOK = true
         if not browser
           msg  = "#{file_name}----browser is nil object. (#{lnbr})"
           myOK = false
-        elsif not is_browser?(browser)
-          msg = "#{file_name}----not a browser. (#{lnbr})"
+        elsif not browser.class.to_s =~ /Watir/
+          msg = "#{file_name}----not a Watir object. (#{lnbr})"
           debug_to_log(browser.inspect)
           myOK = false
 
@@ -1189,7 +1179,7 @@ module Awetestlib
           begin
             browser_text = browser.text.downcase
           rescue => e
-            if not rescue_me(e, __method__, "browser.text.downcase", "#{browser.class}", browser)
+            unless rescue_me(e, __method__, "browser.text.downcase", "#{browser.class}", browser)
               debug_to_log("browser.text.downcase in #{__method__} #{browser.class}")
               debug_to_log("#{get_callers}")
               raise e
@@ -1326,7 +1316,7 @@ module Awetestlib
 
       rescue
         errmsg = $!
-        if errmsg.match(msg)
+        if errmsg and errmsg.match(msg)
           errmsg = ''
         end
         bail_out(browser, lnbr, "#{msg} #{errmsg}")

data/lib/awetestlib/regression/drag_and_drop.rb

@@ -7,10 +7,14 @@ module Awetestlib
     #   Rdoc is work in progress
     module DragAndDrop
 
+      # Verify that specified *inner_element* is fully enclosed by *outer_element*.
+      # @param [Watir::Element] inner_element A reference to a DOM element
+      # @param [Watir::Element] outer_element A reference to a DOM element
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
       def verify_element_inside(inner_element, outer_element, desc = '')
         mark_testlevel("#{__method__.to_s.titleize}", 3)
-        msg = "#{inner_element.class.to_s} (:id=#{inner_element.id}) is fully enclosed by #{outer_element.class.to_s} (:id=#{outer_element.id})."
-        msg << " #{desc}" if desc.length > 0
+        msg = build_message("#{inner_element.class.to_s} (:id=#{inner_element.id}) is fully enclosed by "+
+                            "#{outer_element.class.to_s} (:id=#{outer_element.id}).", desc)
         if overlay?(inner_element, outer_element, :inside)
           failed_to_log(msg)
         else
@@ -21,11 +25,21 @@ module Awetestlib
         failed_to_log("Unable to verify that #{msg} '#{$!}'")
       end
 
+      # Verify that two elements, identified by specified attribute and value, do not overlap on a given *side*.
+      # @param [Symbol] above_element The element type for the first element, e.g. :div, :span, etc.
+      # @param [Symbol] above_how The element attribute used to identify the *above_element*.
+      #   Valid values depend on the kind of element.
+      #   Common values: :text, :id, :title, :name, :class, :href (:link only)
+      # @param [String, Regexp] above_what A string or a regular expression to be found in the *above_how* attribute that uniquely identifies the element.
+      # @param [Symbol] below_element The element type for the second element, e.g. :div, :span, etc.
+      # @param [Symbol] below_how The element attribute used to identify the *below_element*.
+      # @param [String, Regexp] below_what A string or a regular expression to be found in the *below_how* attribute that uniquely identifies the element.
+      # @param [Symbol] side :top, :bottom, :left, :right, :inside, or :outside
+      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
       def verify_no_element_overlap(browser, above_element, above_how, above_what, below_element, below_how, below_what, side, desc = '')
         mark_testlevel("#{__method__.to_s.titleize}", 3)
-        msg = "#{above_element.to_s.titleize} #{above_how}=>#{above_what} does not overlap "+
-            "#{below_element.to_s.titleize} #{below_how}=>#{below_what} at the #{side}."
-        msg << " #{desc}" if desc.length > 0
+        msg = build_message("#{above_element.to_s.titleize} #{above_how}=>#{above_what} does not overlap "+
+                            "#{below_element.to_s.titleize} #{below_how}=>#{below_what} at the #{side}.", desc)
         above = browser.element(above_how, above_what)
         below = browser.element(below_how, below_what)
         if overlay?(above, below, side)
@@ -270,6 +284,18 @@ module Awetestlib
         [x, y, w, h]
       end
 
+      def drag_and_drop(browser, how, what, delta_x, delta_y, desc = '')
+        #TODO: webdriver
+        msg = "Drag and drop element :#{how}=>#{what} by x=>#{delta_x} y=>#{delta_y}."
+        msg << " #{desc}" if desc.length > 0
+        drag_me = browser.div(how, what)
+        drag_me.drag_and_drop_by(delta_x, delta_y)
+        passed_to_log(msg)
+        true
+      rescue
+        failed_to_log("Unable to #{msg} '#{$!}'")
+      end
+
       def drag_and_drop(x1, y1, dx, dy, speed=nil)
         speed = 10 if not speed
         x2 = x1 + dx

data/lib/awetestlib/regression/find.rb

@@ -67,11 +67,28 @@ module Awetestlib
           nil
         end
       rescue => e
-        if not rescue_me(e, __method__, "browser.#{element}(#{how}, '#{what}')", "#{browser.class}", target)
+        unless rescue_me(e, __method__, rescue_me_command(target, how, what), "#{browser.class}", target)
           raise e
         end
       end
 
+      def get_attribute_value(browser, element, how, what, attribute, desc = '')
+        msg = build_message("Value of #{attribute} in #{element} #{how}=>#{what}.", desc)
+        case element
+          when :link
+            value = browser.link(how => what).attribute_value attribute
+          when :button
+            value = browser.button(how => what).attribute_value attribute
+          else
+            if browser.element(how => what).responds_to('attribute_value')
+              value = browser.element(how => what).attribute_value attribute
+            end
+        end
+        value
+      rescue
+        failed_to_log(" Unable to #{msg}: '#{$!}'")
+      end
+
       # Return an array containing the options available for selection in a select_list identifified by
       # its attribute *how*, and the contents of that attribute *what*.
       # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
@@ -104,7 +121,7 @@ module Awetestlib
         begin
           list = browser.select_list(how, what)
         rescue => e
-          if not rescue_me(e, __method__, "browser.select_list(#{how}, '#{what}')", "#{browser.class}")
+          unless rescue_me(e, __method__, rescue_me_command(:select_list, how, what), "#{browser.class}")
             raise e
           end
         end
@@ -151,14 +168,14 @@ module Awetestlib
         begin
           Watir::Wait.until { browser.span(how, what).exists? }
         rescue => e
-          if not rescue_me(e, __method__, "browser.span(#{how}, '#{what}').exists?", "#{browser.class}")
+          unless rescue_me(e, __method__, rescue_me_command(:span, how, what, :exists?), "#{browser.class}")
             raise e
           end
         end
         begin
           span = browser.span(how, what)
         rescue => e
-          if not rescue_me(e, __method__, "browser.span(#{how}, '#{what}').exists?", "#{browser.class}")
+          unless rescue_me(e, __method__, rescue_me_command(:span, how, what, :exists?), "#{browser.class}")
             raise e
           end
         end
@@ -293,141 +310,6 @@ module Awetestlib
 
       # @!endgroup Core
 
-      # @!group Legacy (Backward compatible usages)
-
-      # Return the list of options in a select list identified by its *:id* attribute.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the designated attribute that uniquely identifies the element.
-      # @param [Boolean] dbg Triggers additional debug logging when set to true.
-      # @return [Array]
-      def get_select_options_by_id(browser, what, dbg = false)
-        get_select_options(browser, :id, what, dbg)
-      end
-
-      # Return the list of options in a select list identified by its *:name* attribute.
-      # @param (see #get_select_options_by_id)
-      # @return [Array]
-      def get_select_options_by_name(browser, what, dbg = false)
-        get_select_options(browser, :name, what, dbg)
-      end
-
-      # Return the list of _selected_ options in a select list identified by its *:id* attribute.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the designated attribute that uniquely identifies the element.
-      # @return [Array]
-      def get_selected_options_by_id(browser, what)
-        get_selected_options(browser, :id, what)
-      end
-
-      alias get_selected_option_by_id get_selected_options_by_id
-
-      # Return the list of _selected_ options in a select list identified by its *:name* attribute.
-      # @param (see #get_select_options_by_id)
-      # @return [Array]
-      def get_selected_options_by_name(browser, what)
-        get_selected_options(browser, :name, what)
-      end
-
-      alias get_selected_option_by_name get_selected_options_by_name
-
-      # Return a reference to a div element identified by its *:id* attribute.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the designated attribute that uniquely identifies the element.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @param [Boolean] dbg Triggers additional debug logging when set to true.
-      # @return [Water::Div]
-      def get_div_by_id(browser, what, desc = '', dbg = false)
-        get_div(browser, :id, what, desc, dbg)
-      end
-
-      # Return a reference to a div element identified by its *:class* attribute.
-      # @param (see #get_div_by_id)
-      # @return [Water::Div]
-      def get_div_by_class(browser, what, desc = '', dbg = false)
-        get_div(browser, :class, what, desc, dbg)
-      end
-
-      # Return a reference to a div element identified by its *:text* attribute.
-      # @param (see #get_div_by_id)
-      # @return [Water::Div]
-      def get_div_by_text(browser, what, desc = '', dbg = false)
-        get_div(browser, :text, what, desc, dbg)
-      end
-
-      # Return a reference to a form element identified by its *:id* attribute.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the designated attribute that uniquely identifies the element.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return [Water::Form]
-      def get_form_by_id(browser, what, desc = '')
-        get_form(browser, :id, what, desc)
-      end
-
-      # Return a reference to a frame element identified by its *:id* attribute.
-      # @param (see #get_form_by_id)
-      # @return [Water::Frame]
-      def get_frame_by_id(browser, what, desc = '')
-        get_frame(browser, :id, what, desc)
-      end
-
-      # Return a reference to a frame element identified by its *:index* within *browser*.
-      # @param (see #get_form_by_id)
-      # @return [Water::Frame]
-      def get_frame_by_index(browser, what, desc = '')
-        get_frame(browser, :index, what, desc)
-      end
-
-      # Return a reference to a frame element identified by its *:name* attribute.
-      # @param (see #get_form_by_id)
-      # @return [Water::Frame]
-      def get_frame_by_name(browser, what, desc = '')
-        get_frame(browser, :name, what, desc)
-      end
-
-      # Return a reference to a span element identified by its *:id* attribute.
-      # @param (see #get_form_by_id)
-      # @return [Water::Span]
-      def get_span_by_id(browser, what, desc = '')
-        get_span(browser, :id, what, desc)
-      end
-
-      # Return a reference to a table element identified by its attribute *how* containing *what*.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [Symbol] how The element attribute used to identify the specific element.
-      #   Valid values depend on the kind of element.
-      #   Common values: :text, :id, :title, :name, :class, :href (:link only)
-      # @param [String, Regexp] what A string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return [Watir::Table]
-      def get_table(browser, how, what, desc = '')
-        get_element(browser, :table, how, what, nil, desc)
-      end
-
-      # Return a reference to a table element identified by its *:id* attribute.
-      # @param [Watir::Browser] browser A reference to the browser window or container element to be tested.
-      # @param [String, Regexp] what A string or a regular expression to be found in the *how* attribute that uniquely identifies the element.
-      # @param [String] desc Contains a message or description intended to appear in the log and/or report output
-      # @return [Watir::Table]
-      def get_table_by_id(browser, what, desc = '')
-        get_element(browser, :table, :id, what, nil, desc)
-      end
-
-      # Return a reference to a table element identified by its *:index* within *browser*.
-      # @param (see #get_table)
-      # @return [Watir::Table]
-      def get_table_by_index(browser, what, desc = '')
-        get_element(browser, :table, :index, what, nil, desc)
-      end
-
-      # Return a reference to a table element identified by its *:text* attribute.
-      # @param (see #get_table)
-      # @return [Watir::Table]
-      def get_table_by_text(browser, what)
-        get_element(browser, :table, :text, what, nil, desc)
-      end
-
-      # @!endgroup Legacy
-
       # @!group Deprecated
 
       # Find the index of an element within *browser* which has attribute *how* containing *what*