rwebspec-webdriver 0.2.1 → 0.3.0

data/CHANGELOG

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+== 0.3
+
+* move fail_safe, try_until, take_screenshot from driver to test_utils.rb
+
+
 == 0.2.1
 * add sum_of, average_of to overidding Array methods
 

data/Rakefile

@@ -69,7 +69,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec-webdriver"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
   s.summary = "Executable functional specification for web applications in RSpec syntax and Selenium-WebDriver"
   # s.description = ""
 

data/lib/rwebspec-webdriver/driver.rb

@@ -127,6 +127,7 @@ module RWebSpec
       #
       def close_all_browsers
         #TODO
+        close_browser
       end
 
       # Verify the next page following an operation.
@@ -590,59 +591,7 @@ module RWebSpec
       #= Convenient functions
       #
 
-      # Using Ruby block syntax to create interesting domain specific language,
-      # may be appeal to someone.
-
-      # Example:
-      #  on @page do |i|
-      #    i.enter_text('btn1')
-      #    i.click_button('btn1')
-      #  end
-      def on(page, & block)
-        yield page
-      end
-
-      # fail the test if user can perform the operation
-      #
-      # Example:
-      #  shall_not_allow { 1/0 }
-      def shall_not_allow(& block)
-        operation_performed_ok = false
-        begin
-          yield
-          operation_performed_ok = true
-        rescue
-        end
-        raise "Operation shall not be allowed" if operation_performed_ok
-      end
-
-      alias do_not_allow shall_not_allow
-
-      # Does not provide real function, other than make enhancing test syntax
-      #
-      # Example:
-      #   allow { click_button('Register') }
-      def allow(& block)
-        yield
-      end
-
-      alias shall_allow allow
-      alias allowing allow
-
-      # try operation, ignore if errors occur
-      #
-      # Example:
-      #   failsafe { click_link("Logout") }  # try logout, but it still OK if not being able to (already logout))
-      def failsafe(& block)
-        begin
-          yield
-        rescue =>e
-        end
-      end
-
-      alias fail_safe failsafe
-
-
+ 
       # Execute the provided block until either (1) it returns true, or
       # (2) the timeout (in seconds) has been reached. If the timeout is reached,
       # a TimeOutException will be raised. The block will always
@@ -749,84 +698,6 @@ module RWebSpec
 
 =end
 
-      # Try the operation up to specified times, and sleep given interval (in seconds)
-      # Error will be ignored until timeout
-      # Example
-      #    repeat_try(3, 2) { click_button('Search' } # 3 times, 6 seconds in total
-      #    repeat_try { click_button('Search' } # using default 5 tries, 2 second interval
-      def repeat_try(num_tries = @@default_timeout || 30, interval = @@default_polling_interval || 1, & block)
-        num_tries ||= 1
-        (num_tries - 1).times do |num|
-          begin
-            yield
-            return
-          rescue => e
-            # puts "debug: #{num} failed: #{e}"
-            sleep interval
-          end
-        end
-
-        # last try, throw error if still fails
-        begin
-          yield
-        rescue => e
-          raise e.to_s + " after trying #{num_tries} times every #{interval} seconds"
-        end
-        yield
-      end
-
-      # TODO: syntax
-
-      # Try the operation up to specified timeout (in seconds), and sleep given interval (in seconds).
-      # Error will be ignored until timeout
-      # Example
-      #    try { click_link('waiting')}
-      #    try(10, 2) { click_button('Search' } # try to click the 'Search' button upto 10 seconds, try every 2 seconds
-      #    try { click_button('Search' }
-      def try_until(timeout = @@default_timeout, polling_interval = @@default_polling_interval || 1, & block)
-        start_time = Time.now
-
-        last_error = nil
-        until (duration = Time.now - start_time) > timeout
-          begin
-            return if yield
-            last_error = nil
-          rescue => e
-            last_error = e
-          end
-          sleep polling_interval
-        end
-
-        raise "Timeout after #{duration.to_i} seconds with error: #{last_error}." if last_error
-        raise "Timeout after #{duration.to_i} seconds."
-      end
-
-      alias try_upto try_until
-
-	    def try(timeout = @@default_timeout, polling_interval = @@default_polling_interval || 1, &block)
-	      puts "Warning: method 'try' is deprecated (won't support in RWebSpec 3), use try_until instead."
-	      try_until(timeout, polling_interval) {
-	        yield
-	      }
-	    end
-	
-      ##
-      #  Convert :first to 1, :second to 2, and so on...
-      def symbol_to_sequence(symb)
-        value = {:zero => 0,
-          :first => 1,
-          :second => 2,
-          :third => 3,
-          :fourth => 4,
-          :fifth => 5,
-          :sixth => 6,
-          :seventh => 7,
-          :eighth => 8,
-          :ninth => 9,
-        :tenth => 10}[symb]
-        return value || symb.to_i
-      end
-
       # Clear popup windows such as 'Security Alert' or 'Security Information' popup window,
       #
       # Screenshot see http://kb2.adobe.com/cps/165/tn_16588.html
@@ -966,32 +837,6 @@ module RWebSpec
       end
 
 
-      # use win32screenshot library to save curernt active window, which shall be IE
-      #
-      def take_screenshot
-        if $testwise_screenshot_supported && is_windows?
-          begin
-            screenshot_image_filename =  "screenshot_" + Time.now.strftime("%m%d%H%M%S") + ".jpg"
-            the_dump_dir = default_dump_dir
-            FileUtils.mkdir_p(the_dump_dir) unless File.exists?(the_dump_dir)
-            screenshot_image_filepath = File.join(the_dump_dir, screenshot_image_filename)
-            screenshot_image_filepath.gsub!("/", "\\") if is_windows?
-
-            FileUtils.rm_f(screenshot_image_filepath) if File.exist?(screenshot_image_filepath)
-
-            case @web_browser.underlying_browser.browser
-              when :internet_explorer
-                Win32::Screenshot::Take.of(:window, :title => /internet\sexplorer/i).write(screenshot_image_filepath)
-              else
-                Win32::Screenshot::Take.of(:foreground).write(screenshot_image_filepath)
-            end
-            notify_screenshot_location(screenshot_image_filepath)
-          rescue => e
-            puts "error on taking screenshot: #{e}"
-          end
-        end
-      end
-
     end
 
   end

data/lib/rwebspec-webdriver/test_utils.rb

@@ -9,6 +9,167 @@ module RWebSpec
   module WebDriver
     module Utils
 
+      @@default_polling_interval = 1 # second
+      @@default_timeout = 30 # seconds
+
+      # Using Ruby block syntax to create interesting domain specific language,
+       # may be appeal to someone.
+
+       # Example:
+       #  on @page do |i|
+       #    i.enter_text('btn1')
+       #    i.click_button('btn1')
+       #  end
+       def on(page, & block)
+         yield page
+       end
+
+       # fail the test if user can perform the operation
+       #
+       # Example:
+       #  shall_not_allow { 1/0 }
+       def shall_not_allow(& block)
+         operation_performed_ok = false
+         begin
+           yield
+           operation_performed_ok = true
+         rescue
+         end
+         raise "Operation shall not be allowed" if operation_performed_ok
+       end
+
+       alias do_not_allow shall_not_allow
+
+       # Does not provide real function, other than make enhancing test syntax
+       #
+       # Example:
+       #   allow { click_button('Register') }
+       def allow(& block)
+         yield
+       end
+
+       alias shall_allow allow
+       alias allowing allow
+
+       # try operation, ignore if errors occur
+       #
+       # Example:
+       #   failsafe { click_link("Logout") }  # try logout, but it still OK if not being able to (already logout))
+       def failsafe(& block)
+         begin
+           yield
+         rescue =>e
+         end
+       end
+
+       alias fail_safe failsafe
+
+
+       # Try the operation up to specified times, and sleep given interval (in seconds)
+       # Error will be ignored until timeout
+       # Example
+       #    repeat_try(3, 2) { click_button('Search' } # 3 times, 6 seconds in total
+       #    repeat_try { click_button('Search' } # using default 5 tries, 2 second interval
+       def repeat_try(num_tries = @@default_timeout || 30, interval = @@default_polling_interval || 1, & block)
+         num_tries ||= 1
+         (num_tries - 1).times do |num|
+           begin
+             yield
+             return
+           rescue => e
+             # puts "debug: #{num} failed: #{e}"
+             sleep interval
+           end
+         end
+
+         # last try, throw error if still fails
+         begin
+           yield
+         rescue => e
+           raise e.to_s + " after trying #{num_tries} times every #{interval} seconds"
+         end
+         yield
+       end
+
+       # TODO: syntax
+
+       # Try the operation up to specified timeout (in seconds), and sleep given interval (in seconds).
+       # Error will be ignored until timeout
+       # Example
+       #    try { click_link('waiting')}
+       #    try(10, 2) { click_button('Search' } # try to click the 'Search' button upto 10 seconds, try every 2 seconds
+       #    try { click_button('Search' }
+       def try_until(timeout = @@default_timeout, polling_interval = @@default_polling_interval || 1, & block)
+         start_time = Time.now
+
+         last_error = nil
+         until (duration = Time.now - start_time) > timeout
+           begin
+             return if yield
+             last_error = nil
+           rescue => e
+             last_error = e
+           end
+           sleep polling_interval
+         end
+
+         raise "Timeout after #{duration.to_i} seconds with error: #{last_error}." if last_error
+         raise "Timeout after #{duration.to_i} seconds."
+       end
+
+       alias try_upto try_until
+
+ 	    def try(timeout = @@default_timeout, polling_interval = @@default_polling_interval || 1, &block)
+ 	      puts "Warning: method 'try' is deprecated (won't support in RWebSpec 3), use try_until instead."
+ 	      try_until(timeout, polling_interval) {
+ 	        yield
+ 	      }
+ 	    end
+
+       ##
+       #  Convert :first to 1, :second to 2, and so on...
+       def symbol_to_sequence(symb)
+         value = {:zero => 0,
+           :first => 1,
+           :second => 2,
+           :third => 3,
+           :fourth => 4,
+           :fifth => 5,
+           :sixth => 6,
+           :seventh => 7,
+           :eighth => 8,
+           :ninth => 9,
+         :tenth => 10}[symb]
+         return value || symb.to_i
+       end
+
+
+       # use win32screenshot library to save curernt active window, which shall be IE
+       #
+       def take_screenshot
+         if $testwise_screenshot_supported && is_windows?
+           begin
+             screenshot_image_filename =  "screenshot_" + Time.now.strftime("%m%d%H%M%S") + ".jpg"
+             the_dump_dir = default_dump_dir
+             FileUtils.mkdir_p(the_dump_dir) unless File.exists?(the_dump_dir)
+             screenshot_image_filepath = File.join(the_dump_dir, screenshot_image_filename)
+             screenshot_image_filepath.gsub!("/", "\\") if is_windows?
+
+             FileUtils.rm_f(screenshot_image_filepath) if File.exist?(screenshot_image_filepath)
+
+             case @web_browser.underlying_browser.browser
+               when :internet_explorer
+                 Win32::Screenshot::Take.of(:window, :title => /internet\sexplorer/i).write(screenshot_image_filepath)
+               else
+                 Win32::Screenshot::Take.of(:foreground).write(screenshot_image_filepath)
+             end
+             notify_screenshot_location(screenshot_image_filepath)
+           rescue => e
+             puts "error on taking screenshot: #{e}"
+           end
+         end
+       end
+
       # default date format returned is 29/12/2007.
       # if supplied parameter is not '%m/%d/%Y' -> 12/29/2007
       # Otherwise, "2007-12-29", which is most approiate date format

data/lib/rwebspec-webdriver/web_browser.rb

@@ -35,7 +35,7 @@ module RWebSpec
           initialize_celerity_browser(base_url, options)
         when /mswin|windows|mingw/i
           options[:browser] ||= "ie"
-          case options[:browser].to_s
+          case options[:browser].to_s.downcase
           when "firefox"
             initialize_firefox_browser(existing_browser, base_url, options)
           when "chrome"

data/lib/rwebspec-webdriver.rb

@@ -17,7 +17,7 @@ require 'spec'
 require 'selenium-webdriver'
 
 unless defined? RWEBSPEC_WEBDRIVER_VERSION
-  RWEBSPEC_WEBDRIVER_VERSION = "0.2.1"
+  RWEBSPEC_WEBDRIVER_VERSION = "0.3.0"
 end
 
 		

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Zhimin Zhan
@@ -14,7 +14,7 @@ autorequire: rwebspec-webdriver
 bindir: bin
 cert_chain: []
 
-date: 2011-12-29 00:00:00 +10:00
+date: 2012-01-19 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency