testingbot 0.1.0 → 0.1.1

data/README.rdoc

@@ -22,6 +22,7 @@ Type testingbot in your commandline and fill in the API key and API secret you o
 You can find an example in our examples folder, try something like this:
 
   require "rubygems"
+  require "test/unit"
   require "testingbot"
   class ExampleTest < TestingBot::TestCase
   	attr_reader :browser
@@ -138,7 +139,7 @@ This example uses RSpec 2 together with capybara and Selenium webdriver. You can
   end
 
   describe "People", :type => :request do
-    before :all do
+    before :each do
       Capybara.current_driver = :testingbot
       Capybara.app_host = "http://testingbot.com"
     end
@@ -171,12 +172,18 @@ Add the example below in spec/integration/home_spec.rb
   end
 
   describe 'home page' do
-    before :all do
+    before :each do
       Capybara.server_port = 3011
       Capybara.current_driver = :testingbot
       Capybara.app_host = "http://127.0.0.1:3011"
     end
 
+    after :each do
+      # this is a workaround to push test status/details back to testingbot
+      # we need to use this because capybara overwrites the driver with a rack-test driver
+      @selenium_driver = page.driver.browser.send(:bridge)
+    end
+
     it "shows the home page", :type => :request do
       visit '/'
       page.should have_content('Selenium')
@@ -185,6 +192,7 @@ Add the example below in spec/integration/home_spec.rb
 
 === Example RSpec 2 run on multiple browsers
 Use the :multibrowser => true statement to indicate you want to test on multiple browsers.
+This should work together with Capybara as well.
 
   require 'rubygems'
   require "selenium/client"

data/examples/android.rb

@@ -4,11 +4,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/testingbot/config.rb'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/testingbot/selenium.rb')
 
 TestingBot::config do |config|
-	config[:desired_capabilities] = Selenium::WebDriver::Remote::Capabilities.android
+	config[:desired_capabilities] = Selenium::WebDriver::Remote::Capabilities.iphone
+#config[:desired_capabilities] = { "platform" => "ANDROID", "browserName" => "galaxytab" }
 end
 
 driver = TestingBot::SeleniumWebdriver.new
 
-driver.navigate.to "http://testingbot.com/"
+driver.navigate.to "http://www.google.com"
 puts driver.title
-driver.quit
+#sleep 140
+driver.quit

data/examples/capybara.rb

@@ -4,12 +4,11 @@ require 'testingbot'
 require 'testingbot/capybara'
 
 TestingBot::config do |config|
-	config[:desired_capabilities] = { :browserName => "firefox", :version => 9, :platform => "WINDOWS" }
-	config[:options] = { :screenshot => false, :extra => "Some extra data" }
+	config[:desired_capabilities] = [{ :browserName => "internet explorer", :version => 9, :platform => "WINDOWS" }, { :browserName => "firefox", :version => 11, :platform => "WINDOWS" }]
 	#config.require_tunnel
 end
 
-describe "People", :type => :request do
+describe "People", :type => :request, :multibrowser => true do
 	before :all do
 		Capybara.current_driver = :testingbot
 	    Capybara.app_host = "http://testingbot.com"
@@ -17,6 +16,9 @@ describe "People", :type => :request do
 
 	it 'has a homepage with the word Selenium' do
 		visit '/'
+#sleep 150
+p "inspect"
+p page.inspect
 		page.should have_content('Selenium')
 	end
-end
+end

data/examples/test_rspec.rb

@@ -5,7 +5,7 @@ require 'testingbot'
 require 'testingbot/tunnel'
 
 TestingBot::config do |config|
-  config[:desired_capabilities] = [{ :browserName => "firefox", :version => 9, :platform => "WINDOWS" }, { :browserName => "firefox", :version => 11, :platform => "WINDOWS" }]
+  config[:desired_capabilities] = [{ :browserName => "chrome", :platform => "WINDOWS" }]
 end
 
 # rspec 2
@@ -14,4 +14,4 @@ describe "People", :type => :selenium, :multibrowser => true do
       page.navigate.to "http://www.google.com"
       page.title.should eql("Google")   
     end
-end
+end

data/lib/testingbot/capybara.rb

@@ -17,13 +17,18 @@ module TestingBot
     end
 
     class CustomDriver < ::Capybara::Selenium::Driver
+
+        def session_id
+          @browser.session_id
+        end
+
         def browser
           unless @browser
             if TestingBot.get_config[:require_tunnel]
               TestingBot::Capybara.start_tunnel
             end
 
-            @browser = TestingBot::SeleniumWebdriver.new
+            @browser = TestingBot::SeleniumWebdriver.new(@options || {})
 
             main = Process.pid
             at_exit do
@@ -44,6 +49,18 @@ module TestingBot
   end
 end
 
+module Capybara
+  class Session
+    def stop
+      driver.quit
+    end
+
+    def session_id
+      driver.session_id
+    end
+  end
+end
+
 Capybara.register_driver :testingbot do |app|
   TestingBot::Capybara::CustomDriver.new(app)
 end

data/lib/testingbot/hooks.rb

@@ -78,7 +78,17 @@ begin
         base.around do |test|
           if TestingBot.get_config.desired_capabilities.instance_of?(Array)
             TestingBot.get_config.desired_capabilities.each do |browser|
-              @selenium_driver = TestingBot::SeleniumWebdriver.new({ :desired_capabilities => browser })
+
+              if defined?(Capybara)
+                ::Capybara.register_driver :multibrowser do |app|
+                  TestingBot::Capybara::CustomDriver.new(app, { :desired_capabilities => browser })
+                end
+
+                @selenium_driver = ::Capybara::Session.new(:multibrowser)
+              else
+                @selenium_driver = TestingBot::SeleniumWebdriver.new({ :desired_capabilities => browser })
+              end
+
               begin
                 test.run
               ensure
@@ -86,7 +96,11 @@ begin
               end
             end
           else
-            @selenium_driver = TestingBot::SeleniumWebdriver.new({ :desired_capabilities => TestingBot.get_config.desired_capabilities })
+            if defined?(Capybara)
+              @selenium_driver = ::Capybara::Session.new(:testingbot)
+            else
+              @selenium_driver = TestingBot::SeleniumWebdriver.new({ :desired_capabilities => TestingBot.get_config.desired_capabilities })
+            end
             begin
               test.run
             ensure
@@ -167,6 +181,13 @@ begin
         rescue Exception => e
           p "Could not determine sessionID, can not send results to TestingBot.com #{e.message}"
         end
+
+        if session_id.nil? || session_id.empty?
+          begin
+            session_id = page.driver.browser.send(:bridge).session_id
+          rescue
+          end
+        end
       end
       
       if !session_id.nil?

data/lib/testingbot/selenium.rb

@@ -16,6 +16,10 @@ module TestingBot
       @options = @options.merge(options)
 
       http_client = ::Selenium::WebDriver::Remote::Http::Persistent.new
+      if ENV['TESTINGBOT_CLIENT_PROXY']
+        require 'ostruct'
+        http_client.proxy = OpenStruct.new(:http => ENV['TESTINGBOT_CLIENT_PROXY'])
+      end
       http_client.timeout = 400
       @driver = ::Selenium::WebDriver.for(:remote, :url => "http://#{@options[:client_key]}:#{@options[:client_secret]}@#{@options[:host]}:#{@options[:port]}/wd/hub", :desired_capabilities => @options[:desired_capabilities], :http_client => http_client)
       http_client.timeout = 120

data/lib/testingbot/version.rb

@@ -1,3 +1,3 @@
 module Testingbot
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testingbot
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-09 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70361245219640 !ruby/object:Gem::Requirement
+  requirement: &70309646999820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361245219640
+  version_requirements: *70309646999820
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &70361253323120 !ruby/object:Gem::Requirement
+  requirement: &70309646999400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361253323120
+  version_requirements: *70309646999400
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &70361253322700 !ruby/object:Gem::Requirement
+  requirement: &70309646998980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361253322700
+  version_requirements: *70309646998980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70361253322180 !ruby/object:Gem::Requirement
+  requirement: &70309646998460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70361253322180
+  version_requirements: *70309646998460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70361253321760 !ruby/object:Gem::Requirement
+  requirement: &70309646998040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361253321760
+  version_requirements: *70309646998040
 description: This gem makes using our Selenium grid on testingbot.com easy
 email:
 - info@testingbot.com