rwebspec 2.1.0 → 2.1.1

data/CHANGELOG

@@ -1,5 +1,8 @@
 CHANGELOG
 =========
+ 2.1.1
+ [Change] use Global variable for retry settings (instead of class variables)
+
  2.1
   [Change] Move try_until, fail_safe from driver.rb to utils.rb 
 

data/Rakefile

@@ -71,7 +71,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "2.1.0"
+  s.version = "2.1.1"
   s.summary = "Web application functional specification in Ruby"
   s.description = "Executable functional specification for web applications in RSpec syntax and Watir"
 

data/lib/rwebspec/driver.rb

@@ -19,10 +19,6 @@ module RWebSpec
   module Driver
     include RWebSpec::TestWisePlugin
     include RWebSpec::Popup
-    # include Watir::ScreenCapture if RUBY_PLATFORM.downcase.include?("mswin") or RUBY_PLATFORM.downcase.include?("mingw")
-
-    @@default_polling_interval = 1 # second
-    @@default_timeout = 30 # seconds
 
     # open a browser, and set base_url via hash, but does not acually
     #
@@ -624,7 +620,7 @@ module RWebSpec
     #   wait_until {puts 'hello'}
     #   wait_until { div(:id, :receipt_date).exists? }
     #
-    def wait_until(timeout = @@default_timeout || 30, polling_interval = @@default_polling_interval || 1, & block)
+    def wait_until(timeout = $testwise_polling_timeout || 30, polling_interval = $testwise_polling_interval || 1, & block)
       waiter = Watir::Waiter.new(timeout, polling_interval)
       waiter.wait_until { yield }
     end
@@ -644,7 +640,7 @@ module RWebSpec
     #
     # Warning: this method has not been fully tested, if you are not using Rails, change your parameter accordingly.
     #
-    def ajax_wait_for_element(element_id, seconds, status='show', check_interval = @@default_polling_interval)
+    def ajax_wait_for_element(element_id, seconds, status='show', check_interval = $testwise_polling_interval)
       count = 0
       check_interval = 1 if check_interval < 1 or check_interval > seconds
       while count < (seconds / check_interval) do
@@ -664,7 +660,7 @@ module RWebSpec
     #Wait the element with given id to be present in web page
     #
     # Warning: this not working in Firefox, try use wait_util or try instead
-    def wait_for_element(element_id, timeout = @@default_timeout, interval = @@default_polling_interval)
+    def wait_for_element(element_id, timeout = $testwise_polling_timeout, interval = $testwise_polling_interval)
       start_time = Time.now
       #TODO might not work with Firefox
       until @web_browser.element_by_id(element_id) do

data/lib/rwebspec/load_test_helper.rb

@@ -45,7 +45,7 @@ module RWebSpec
     #    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(timeout = @@default_timeout, polling_interval = @@default_polling_interval || 1, &block)
+    def try(timeout = $testwise_polling_timeout, polling_interval = $testwise_polling_interval || 1, &block)
       start_time = Time.now
 
       last_error = nil

data/lib/rwebspec/test_utils.rb

@@ -16,7 +16,7 @@ module RWebSpec
     #    try_until { click_link('waiting')}
     #    try_until(10, 2) { click_button('Search' } # try to click the 'Search' button upto 10 seconds, try every 2 seconds
     #    try_until { click_button('Search' }
-    def try_until(timeout = @@default_timeout, polling_interval = @@default_polling_interval || 1, &block)
+    def try_until(timeout = $testwise_polling_timeout, polling_interval = $testwise_polling_interval || 1, &block)
       start_time = Time.now
 
       last_error = nil
@@ -37,7 +37,7 @@ module RWebSpec
 
     alias try_upto try_until
     
-    def try(timeout = @@default_timeout, polling_interval = @@default_polling_interval || 1, &block)
+    def try(timeout = $testwise_polling_timeout, polling_interval = $testwise_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
@@ -50,7 +50,7 @@ module RWebSpec
     # 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)
+    def repeat_try(num_tries = $testwise_polling_timeout || 30, interval = $testwise_polling_interval || 1, & block)
       num_tries ||= 1
       (num_tries - 1).times do |num|
         begin

data/lib/rwebspec.rb

@@ -30,9 +30,14 @@ end
 require 'spec'
 
 unless defined? RWEBSPEC_VERSION
-  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "2.1.0"
+  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "2.1.1"
 end
 
+$testwise_polling_interval = 1 # seconds
+
+$testwise_polling_timeout = 30 # seconds
+
+
 if RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /mingw/
  $screenshot_supported = false
  begin
@@ -42,6 +47,7 @@ if RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /mingw/
  end  
 end
 
+
 # Extra full path to load libraries
 require File.dirname(__FILE__) + "/rwebspec/using_pages"
 require File.dirname(__FILE__) + "/rwebspec/test_utils"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Zhimin Zhan