selenium_dsl 1.0.0 → 1.1.0

data/CHANGES

@@ -3,3 +3,7 @@
 == Version 1.0.0
 
 * Initial release.
+
+== Version 1.1.0
+
+* Internal redesign.

data/Gemfile

@@ -1,6 +1,7 @@
 source :rubygems
 
-gem "selenium-client"
+gem "selenium-webdriver"
+gem "selenium"
 
 group :development do
   gem "gemspec_deps_gen"
@@ -12,6 +13,19 @@ group :test do
   gem "rspec-core"
   gem "rspec-expectations"
   gem "mocha"
+  gem "watir-webdriver"
+  #gem "capybara", "1.1.4"
+  #gem "capybara-webkit", "0.8.0"
+
+  # Note: You need to install qt:
+  # Mac: brew install qt
+  # Ubuntu: sudo apt-get install libqt4-dev libqtwebkit-dev
+  # Debian: sudo apt-get install libqt4-dev
+  # Fedora: yum install qt-webkit-devell
+
+  unless File.exist? "/usr/local/Cellar/qt"
+    system "brew install qt"
+  end
 end
 
 group :debug do

data/Gemfile.lock

@@ -2,17 +2,23 @@ GEM
   remote: http://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
+    childprocess (0.3.8)
+      ffi (~> 1.0, >= 1.0.11)
     columnize (0.3.6)
     diff-lcs (1.1.3)
+    ffi (1.4.0)
     file_utils (1.0.6)
     gemcutter (0.7.1)
     gemspec_deps_gen (1.0.5)
       file_utils
+    jar_wrapper (0.1.7)
+      zip
     linecache19 (0.5.13)
       ruby_core_source (>= 0.1.4)
     metaclass (0.0.1)
     mocha (0.13.2)
       metaclass (~> 0.0.1)
+    multi_json (1.6.1)
     rake (10.0.3)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
@@ -31,7 +37,18 @@ GEM
       rake (>= 0.8.1)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    selenium-client (1.2.18)
+    rubyzip (0.9.9)
+    selenium (0.2.9)
+      jar_wrapper
+    selenium-webdriver (2.30.0)
+      childprocess (>= 0.2.5)
+      multi_json (~> 1.0)
+      rubyzip
+      websocket (~> 1.0.4)
+    watir-webdriver (0.6.2)
+      selenium-webdriver (>= 2.18.0)
+    websocket (1.0.7)
+    zip (2.0.2)
 
 PLATFORMS
   ruby
@@ -46,4 +63,6 @@ DEPENDENCIES
   rspec-expectations
   ruby-debug-base19x (= 0.11.30.pre10)
   ruby-debug-ide (= 0.4.17.beta14)
-  selenium-client
+  selenium
+  selenium-webdriver
+  watir-webdriver

data/lib/selenium_dsl.rb

@@ -1,6 +1,7 @@
 require 'rubygems' unless Object.const_defined?(:Gem)
 
-require 'selenium_dsl/proxy'
-require 'selenium_dsl/script'
-require 'selenium_dsl/dsl'
-require 'selenium_dsl/version'
+require 'selenium_dsl/version'
+require 'selenium_dsl/selenium_client/dsl'
+require 'selenium_dsl/selenium_webdriver/dsl'
+require 'selenium_dsl/watir_webdriver/dsl'
+#require 'selenium_dsl/capybara/dsl'

data/lib/selenium_dsl/capybara/dsl.rb

@@ -0,0 +1,68 @@
+require 'capybara'
+require 'capybara/dsl'
+require 'capybara/webkit'
+require 'selenium_dsl/proxy'
+require 'selenium_dsl/selenium_helper'
+require 'selenium_dsl/capybara/script'
+
+module SeleniumDSL::Capybara
+  class DSL
+    include SeleniumHelper
+
+    attr_reader :script, :driver
+
+    attr_writer :timeout_in_seconds
+
+    def initialize(selenium_host, selenium_port, browser, webapp_url, requested_driver, capabilities={})
+      Capybara.run_server = false
+      Capybara.app_host = webapp_url
+
+      if requested_driver == :selenium
+        requested_driver = "selenium_#{browser}".to_sym
+
+        Capybara.register_driver requested_driver do |app|
+          client = Selenium::WebDriver::Remote::Http::Default.new
+          client.timeout = 120
+          #caps = Selenium::WebDriver::Remote::Capabilities.firefox
+
+          Capybara::Selenium::Driver.new(app, {:url => construct_selenium_url(selenium_host, selenium_port),
+                                               :browser => :remote, :desired_capabilities => browser.to_sym,
+                                              :http_client => client})
+        end
+      end
+
+      Capybara.javascript_driver = requested_driver.to_sym
+      Capybara.current_driver = requested_driver.to_sym
+
+      @session = Capybara::Session.new(requested_driver.to_sym, nil)
+
+      @script = SeleniumDSL::Capybara::Script.new @session
+    end
+
+    def timeout_in_seconds= timeout_in_seconds
+      Capybara.default_wait_time = timeout_in_seconds.to_i
+    end
+
+    def start
+    end
+
+    def stop
+      @session.reset!
+
+      Capybara.use_default_driver
+      Capybara.app_host = nil
+
+      #Capybara::Driver::Webkit::Browser
+
+      #@session.driver.browser.close
+    end
+
+    def capybara(&block)
+      @script.instance_eval(&block)
+
+      @script
+    end
+
+  end
+
+end

data/lib/selenium_dsl/capybara/script.rb

@@ -0,0 +1,19 @@
+require 'capybara'
+require 'selenium_dsl/proxy'
+
+module SeleniumDSL::Capybara
+  class Script < SeleniumDSL::Proxy
+    attr_reader :driver
+
+    attr_accessor :timeout_in_seconds
+
+    def initialize driver
+      super driver, [:open, :select, :type]
+
+      @driver = driver
+
+      @timeout_in_seconds = 60
+    end
+
+  end
+end

data/lib/selenium_dsl/selenium_client/dsl.rb

@@ -0,0 +1,50 @@
+require "selenium/client"
+require 'selenium_dsl/proxy'
+require 'selenium_dsl/selenium_helper'
+require 'selenium_dsl/selenium_client/script'
+
+module SeleniumDSL::SeleniumClient
+  class DSL
+    include SeleniumHelper
+
+    attr_reader :script, :driver
+
+    def initialize(selenium_host, selenium_port, browser, webapp_url, capabilities={})
+      @selenium = Selenium::Client::Driver.new \
+      :host => selenium_host,
+      :port => selenium_port.to_i,
+      :browser => "*webdriver",
+      :url => webapp_url
+
+      @driver = Selenium::WebDriver.for :remote,
+                                        :url => construct_selenium_url(selenium_host, selenium_port),
+                                        :desired_capabilities => browser.to_sym
+
+      @driver.capabilities.merge(capabilities) unless capabilities.empty?
+
+      @script = SeleniumDSL::SeleniumClient::Script.new @selenium, @driver
+    end
+
+    def timeout_in_seconds= timeout_in_seconds
+      @script.timeout_in_seconds = timeout_in_seconds
+    end
+
+    def start
+      #@selenium.start_new_browser_session
+      @selenium.start :driver => @driver
+    end
+
+    def stop
+      #@selenium.close_current_browser_session
+      @driver.quit
+      @selenium.stop
+    end
+
+    def selenium_client(&block)
+      @script.instance_eval(&block)
+
+      @script
+    end
+
+  end
+end

data/lib/selenium_dsl/{script.rb → selenium_client/script.rb}

@@ -1,35 +1,35 @@
 require 'selenium_dsl/proxy'
 
-module SeleniumDSL
-  class Script < Proxy
+module SeleniumDSL::SeleniumClient
+  class Script < SeleniumDSL::Proxy
+    attr_reader :selenium, :driver
 
-    def initialize selenium_driver, timeout_in_seconds
-      super selenium_driver, [:open, :select, :type]
+    attr_accessor :timeout_in_seconds
 
-      @page = selenium_driver
-      @timeout_in_seconds = timeout_in_seconds
-    end
+    def initialize selenium, driver
+      super selenium, [:open, :select, :type]
 
-    def timeout_in_seconds
-      @timeout_in_seconds
+      @selenium = selenium
+      @driver = driver
+      @timeout_in_seconds = 60
     end
 
     def click locator, *params
-      @page.click locator, *params
+      selenium.click locator, *params
 
       if params.size > 0
-        @page.wait_for_condition "selenium.browserbot.getCurrentWindow().jQuery.active == 0" if params[0][:ajax] == true
+        selenium.wait_for_condition "selenium.browserbot.getCurrentWindow().jQuery.active == 0" if params[0][:ajax]
 
-        @page.wait_for_page_to_load @timeout_in_seconds if params[0][:wait] == true
+        selenium.wait_for_page_to_load @timeout_in_seconds if params[0][:wait]
       end
     end
 
 # def select_value value, element, prefix
-# @page.select "#{prefix}_#{element}", "value=#{value}"
+# selenium.select "#{prefix}_#{element}", "value=#{value}"
 # end
 
     def check_select value, element, prefix
-      @page.click full_input_name(prefix, element)
+      selenium.click full_input_name(prefix, element)
     end
 
     def full_input_name(prefix, input_name)
@@ -37,23 +37,23 @@ module SeleniumDSL
     end
 
     def session_id
-      /session_id=(\w+)/.match(@page.get_cookie)[1]
+      /session_id=(\w+)/.match(selenium.get_cookie)[1]
     end
 
 # def enter value, element, prefix
-# @page.type "#{prefix}_#{element}", value
+# selenium.type "#{prefix}_#{element}", value
 # end
 
     def radio_select value, element, prefix
       if prefix.nil?
-        @page.click "id=#{value}"
+        selenium.click "id=#{value}"
       else
-        @page.click "#{prefix}_#{element}_#{value}"
+        selenium.click "#{prefix}_#{element}_#{value}"
       end
     end
 
     def go_back
-      @page.go_back
+      selenium.go_back
     end
 
 # def new_session(path)
@@ -61,16 +61,16 @@ module SeleniumDSL
 # end
 
 # def goto path
-# @page.open path
+# selenium.open path
 # end
 
 # def reset_session
-# @page.delete_cookie('_proteus_session', '/')
-# @page.delete_cookie('login', '/')
+# selenium.delete_cookie('_proteus_session', '/')
+# selenium.delete_cookie('login', '/')
 # end
 
 # def select_value value, element, prefix
-# @page.select "#{prefix}_#{element}", "value=#{value}"
+# selenium.select "#{prefix}_#{element}", "value=#{value}"
 # end
 
     def wait_for_text value, element_id, timeout=10000
@@ -80,7 +80,7 @@ var included = false;
 if (element.value == '#{value}') included = true;
 included;
       EOF
-      @page.wait_for_condition(script, timeout)
+      selenium.wait_for_condition(script, timeout)
     end
 
     def wait_for_option(value, element, prefix, timeout=30000)
@@ -100,11 +100,11 @@ if( option_list[x].value == '#{value}' ) included = true;
 included;
       EOF
 
-      @page.wait_for_condition(script, timeout)
+      selenium.wait_for_condition(script, timeout)
     end
 
     def wait_until_enabled( element_id, timeout=10000)
-      @page.wait_for_condition(
+      selenium.wait_for_condition(
           "selenium.browserbot.getCurrentWindow()." +
               "document.getElementById('#{element_id}').disabled == false;",
           timeout
@@ -112,7 +112,7 @@ included;
     end
 
 # def assert_title(expected_value)
-# assert_equal expected_value, @page.get_title, "Expected title to be: '#{expected_value}' but was '#{@page.get_title}'"
+# assert_equal expected_value, selenium.get_title, "Expected title to be: '#{expected_value}' but was '#{selenium.get_title}'"
 # end
 #
 # def assert_contains text, message=nil
@@ -124,20 +124,20 @@ included;
 # end
 #
 # def assert_value(expected_value, element)
-# assert_equal expected_value, @page.get_value(element)
+# assert_equal expected_value, selenium.get_value(element)
 # end
 
     def contains? text
-      /#{text}/ =~ @page.get_html_source
+      /#{text}/ =~ selenium.get_html_source
     end
 
 # def assert_selected value, element, prefix
 # id = prefix.blank? ? "#{element}" : "#{prefix}[#{element}]"
-# assert_equal value, @page.get_selected_value("#{id}")
+# assert_equal value, selenium.get_selected_value("#{id}")
 # end
 
     def match_element id
-      Regexp.new("<([^>]*)(id *= *['\"]?#{id}['\"]?)([^>]*)>", Regexp::IGNORECASE).match(@page.get_html_source)
+      Regexp.new("<([^>]*)(id *= *['\"]?#{id}['\"]?)([^>]*)>", Regexp::IGNORECASE).match(selenium.get_html_source)
     end
 
     def visible? element
@@ -187,11 +187,11 @@ included;
     end
 
     def response_body
-      @page.get_html_source
+      selenium.get_html_source
     end
 
     def text_for id
-      @page.get_text(id)
+      selenium.get_text(id)
     end
 
   end

data/lib/selenium_dsl/selenium_helper.rb

@@ -0,0 +1,5 @@
+module SeleniumHelper
+  def construct_selenium_url host, port
+    "http://#{host}:#{port}/wd/hub/"
+  end
+end

data/lib/selenium_dsl/selenium_webdriver/dsl.rb

@@ -0,0 +1,42 @@
+require 'selenium/webdriver'
+require 'selenium_dsl/proxy'
+require 'selenium_dsl/selenium_helper'
+require 'selenium_dsl/selenium_webdriver/script'
+
+module SeleniumDSL::SeleniumWebdriver
+  class DSL
+    include SeleniumHelper
+
+    attr_reader :script, :driver
+
+    attr_writer :timeout_in_seconds
+
+    def initialize(selenium_host, selenium_port, browser, capabilities={})
+      @driver = Selenium::WebDriver.for(:remote, :url => construct_selenium_url(selenium_host, selenium_port),
+                                        :desired_capabilities => browser.to_sym)
+
+      @driver.capabilities.merge(capabilities) unless capabilities.empty?
+
+      @script = SeleniumDSL::SeleniumWebdriver::Script.new @driver
+    end
+
+    def timeout_in_seconds= timeout_in_seconds
+      #@driver.manage.timeouts.implicit_wait = timeout_in_seconds.to_i
+      @script.timeout_in_seconds = timeout_in_seconds.to_i
+    end
+
+    def start
+    end
+
+    def stop
+      @driver.quit
+    end
+
+    def selenium_webdriver(&block)
+      @script.instance_eval(&block)
+
+      @script
+    end
+  end
+
+end