rwebspec-webdriver 0.3.3 → 0.3.4

data/CHANGELOG

@@ -1,5 +1,11 @@
 CHANGELOG
 =========
+
+== 0.3.4
+
+[Fix] not throwing select list's option not found
+[New] web_browser.driver returns underlying browser (web_driver instance)
+
 == 0.3.3
 
 * [Fix] Page class to include Utils module

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

data/lib/rwebspec-webdriver.rb

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

data/lib/rwebspec-webdriver/driver.rb

@@ -49,7 +49,7 @@ module RWebSpec
           :highlight_colour => 'yellow',
           :close_others => true,
           :start_new => true, # start a new browser always
-        :go => true}
+          :go => true }
 
         options = default_options.merge options
 
@@ -68,7 +68,7 @@ module RWebSpec
           uri_base = "#{uri.scheme}://#{uri.host}:#{uri.port}"
         end
 
-        if options[:start_new] || $celerity_loaded
+        if options[:start_new]
           # puts "[DEBUG] [SeleniumBrowser] creating a new browser"
           @web_browser = WebBrowser.new(uri_base, nil, options)
           # puts "[DEBUG] [SeleniumBrowser] browser: #{@web_browser.inspect}"

data/lib/rwebspec-webdriver/load_test_helper.rb

@@ -4,82 +4,17 @@ module RWebSpec
     module LoadTestHelper
 
       include RWebSpec::WebDriver::Utils
+      include RWebSpec::WebDriver::Driver
       include RWebSpec::WebDriver::Assert
 
       MAX_VU = 1000
 
       # only support firefox or Celerity
       def open_browser(base_url, options = {})
-        default_options = {:resynchronize => false, :firefox => false }
-        options = default_options.merge(options)
-        options[:firefox] ||= (ENV['LOADWISE_PREVIEW'] || $LOADWISE_PREVIEW)
-        RWebSpec::WebDriver::WebBrowser.new(base_url, nil, options)
-      end
-
-      # maybe attach_browser
-
-      # 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 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(timeout = $testwise_polling_timeout, polling_interval = $testwise_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
-
-      ##
-      #  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
+        options[:browser] ||= (ENV['LOADWISE_PREVIEW'] || $LOADWISE_PREVIEW)        
+        default_options = {:browser => :htmlunit , :go => true}
+        options = default_options.merge(options)        
+        @web_browser = WebBrowser.new(base_url, nil, options)
       end
 
       # monitor current execution using

data/lib/rwebspec-webdriver/web_browser.rb

@@ -29,30 +29,17 @@ module RWebSpec
         }
         options = default_options.merge options
         @context = Context.new base_url if base_url
-
-        case RUBY_PLATFORM
-        when /java/i
-          initialize_celerity_browser(base_url, options)
-        when /mswin|windows|mingw/i
-          options[:browser] ||= "ie"
-          case options[:browser].to_s.downcase
+        
+        options[:browser] ||= "ie" if RUBY_PLATFORM =~ /mingw/
+        case options[:browser].to_s.downcase
           when "firefox"
             initialize_firefox_browser(existing_browser, base_url, options)
           when "chrome"
             initialize_chrome_browser(existing_browser, base_url, options)
           when "ie"
             initialize_ie_browser(existing_browser, options)
-          end
-
-        else
-          puts "Ruby Linux or Mac platform: firefox"
-          options[:browser] ||= "firefox"
-          case options[:browser].to_s
-          when "firefox"
-            initialize_firefox_browser(existing_browser, base_url, options)
-          when "chrome"
-            initialize_chrome_browser(existing_browser, base_url, options)
-          end
+          when  "htmlunit"
+             initialize_htmlunit_browser(base_url, options)
         end
       end
 
@@ -77,11 +64,16 @@ module RWebSpec
       end
 
       def initialize_htmlunit_browser(base_url, options)
-        #      default_celerity_options = {:proxy => nil, :browser => :firefox, :resynchronize => true, :log_level => :off}
-        #      options = default_celerity_options.merge options
-        #      options.each { |k, v| options.delete(k) unless default_celerity_options.keys.include?(k) }
-        @browser = Selenium::WebDriver.for :htmlunit
-        @browser.navigate.to base_url
+        puts "XXXXX start HtmlUnit..."
+        require 'json'
+        caps = Selenium::WebDriver::Remote::Capabilities.htmlunit(:javascript_enabled => false)        
+        client = Selenium::WebDriver::Remote::Http::Default.new
+        # client.proxy = Selenium::WebDriver::Proxy.new(:http => "web-proxy.qdot.qld.gov.au:3128")
+        
+        @browser = Selenium::WebDriver.for(:remote, :http_client => client , :desired_capabilities => caps)         
+        if options[:go] 
+          @browser.navigate.to(base_url) 
+        end
       end
 
       def initialize_ie_browser(existing_browser, options)
@@ -284,12 +276,15 @@ module RWebSpec
         @context = Context.new base_url
       end
 
+      def driver
+        @browser
+      end
+      
       def underlying_browser
         @browser
       end
 
       def is_ie?
-        puts @browser.browser.to_s
         @browser.browser.to_s == "ie"
       end
 
@@ -307,11 +302,7 @@ module RWebSpec
 
       #TODO determine browser type, check FireWatir support or not
       def self.close_all_browsers
-        if RUBY_PLATFORM.downcase.include?("mswin")
-          Watir::IE.close_all
-        else
-          # raise "not supported in FireFox yet."
-        end
+        raise "not implemented"
       end
 
       def full_url(relative_url)
@@ -524,10 +515,14 @@ module RWebSpec
 
         options = select_box.find_elements(:tag_name, "option")
         options.each do |opt|
-          # puts opt.methods
-          opt.click if text ==  opt.text
+          opt.click 
+          if text ==  opt.text
+            opt.click
+            return true
+          end
         end
-        # select_list(:name, selectName).select(option)
+        
+        raise "no option with text '#{text}' found for select list name = '#{selectName}"
       end
 
       # submit first submit button

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rwebspec-webdriver
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Zhimin Zhan
@@ -14,16 +15,17 @@ autorequire: rwebspec-webdriver
 bindir: bin
 cert_chain: []
 
-date: 2012-01-23 00:00:00 +10:00
-default_executable: 
+date: 2012-03-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 1
@@ -35,9 +37,11 @@ dependencies:
   name: selenium-webdriver
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 2
         - 0
@@ -49,9 +53,11 @@ dependencies:
   name: sanitize
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
@@ -93,7 +99,6 @@ files:
 - lib/rwebspec-webdriver.rb
 - lib/webdriver_extensions.rb
 - lib/window_script_extensions.rb
-has_rdoc: true
 homepage: http://github.com/zhimin/rwebspec-webdriver/tree/master
 licenses: []
 
@@ -103,23 +108,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - none
 rubyforge_project: rwebspec-webdriver
-rubygems_version: 1.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Executable functional specification for web applications in RSpec syntax and Selenium-WebDriver