rwebspec-webdriver 0.3.0 → 0.3.1

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.3.0"
+  s.version = "0.3.1"
   s.summary = "Executable functional specification for web applications in RSpec syntax and Selenium-WebDriver"
   # s.description = ""
 

data/lib/rwebspec-webdriver/driver.rb

@@ -19,9 +19,6 @@ module RWebSpec
       include RWebSpec::WebDriver::TestWisePlugin
       include RWebSpec::WebDriver::Popup
 
-      @@default_polling_interval = 1 # second
-      @@default_timeout = 30 # seconds
-
       # open a browser, and set base_url via hash, but does not acually
       #
       # example:
@@ -602,7 +599,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)
         end_time = ::Time.now + timeout
 
         until ::Time.now > end_time
@@ -633,7 +630,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
@@ -653,7 +650,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-webdriver/load_test_helper.rb

@@ -46,7 +46,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-webdriver/test_utils.rb

@@ -9,9 +9,6 @@ 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.
 
@@ -70,7 +67,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
@@ -99,7 +96,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_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
@@ -119,7 +116,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

data/lib/rwebspec-webdriver.rb

@@ -17,10 +17,16 @@ require 'spec'
 require 'selenium-webdriver'
 
 unless defined? RWEBSPEC_WEBDRIVER_VERSION
-  RWEBSPEC_WEBDRIVER_VERSION = "0.3.0"
+  RWEBSPEC_WEBDRIVER_VERSION = "0.3.1"
 end
 
-		
+
+## Polling settings
+#
+$testwise_polling_interval = 1 # seconds
+
+$testwise_polling_timeout = 30 # seconds
+   		
 if  RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /mingw/
  $testwise_screenshot_supported = false
  begin

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Zhimin Zhan