testingbot 0.0.5 → 0.0.6

data/examples/capybara.rb

@@ -0,0 +1,32 @@
+require 'rspec'
+require 'capybara/rspec'
+require 'selenium/webdriver'
+require 'testingbot'
+
+RSpec.configure do |config|
+	caps = Selenium::WebDriver::Remote::Capabilities.firefox  
+	caps.version = "8"  
+	caps.platform = :WINDOWS 
+
+	Capybara.default_driver = :testingbot
+	Capybara.register_driver :testingbot do |app|
+		client = Selenium::WebDriver::Remote::Http::Default.new
+  		client.timeout = 120
+	  	Capybara::Selenium::Driver.new(app,
+		    :browser => :remote,
+		    :url => "http://key:secret@hub.testingbot.com:4444/wd/hub",
+		    :http_client => client,
+		    :desired_capabilities => caps)
+	end
+end
+
+describe "People", :type => :request do
+	before :all do
+	    Capybara.app_host = "http://testingbot.com"
+ 	end
+
+  it 'has a homepage with the word Selenium' do
+    visit '/'
+    page.should have_content('Selenium')
+  end
+end

data/examples/test_rspec.rb

@@ -1,36 +1,39 @@
 require 'rubygems'
-gem "rspec", ">=1.2.8"
-gem "selenium-client", ">=1.2.18"
 require "selenium/client"
-require "selenium/rspec/spec_helper"
-gem "testingbot"
-require "testingbot"
+require 'rspec'
+require 'testingbot'
+#require 'testingbot/tunnel'
 
-describe "People" do
+# rspec 2
+describe "People", :type => :selenium do
   attr_reader :selenium_driver
-  alias :page :selenium_driver
-  
-  before(:all) do
+    before(:all) do
+        #TestingBot::Tunnel.start_tunnel("selenium@tunnel.testingbot.com", 2052)
+
         @selenium_driver = Selenium::Client::Driver.new \
-            :host => "http://hub.testingbot.com",
+            :host => "hub.testingbot.com",
             :port => 4444, 
             :browser => "firefox", 
             :url => "http://www.google.com", 
             :timeout_in_second => 60,
             :platform => "WINDOWS",
-            :version => "6"
+            :version => "10"
     end
-
+  
     before(:each) do
-      selenium_driver.start_new_browser_session
+      @selenium_driver.start_new_browser_session
     end
-
-    append_after(:each) do 
+  
+    after(:each) do
       @selenium_driver.close_current_browser_session
     end
-
+      
     it "can find the right title" do    
-      page.open "/"
-      page.title.should eql("Google")   
+      @selenium_driver.open "/"
+      @selenium_driver.title.should eql("Google")   
     end
-end
+
+    # after(:all) do
+    #   TestingBot::Tunnel.stop_tunnel
+    # end
+end

data/examples/test_rspec1.rb

@@ -0,0 +1,36 @@
+require 'rubygems'
+gem "rspec", "<2"
+gem "selenium-client"
+require "selenium/client"
+require "selenium/rspec/spec_helper"
+gem "testingbot"
+require "testingbot"
+
+describe "People" do
+  attr_reader :selenium_driver
+  alias :page :selenium_driver
+  
+  before(:all) do
+        @selenium_driver = Selenium::Client::Driver.new \
+            :host => "hub.testingbot.com",
+            :port => 4444, 
+            :browser => "firefox", 
+            :url => "http://www.google.com", 
+            :timeout_in_second => 60,
+            :platform => "WINDOWS",
+            :version => "10"
+    end
+
+    before(:each) do
+      selenium_driver.start_new_browser_session
+    end
+
+    append_after(:each) do 
+      @selenium_driver.close_current_browser_session
+    end
+
+    it "can find the right title" do    
+      page.open "/"
+      page.title.should eql("Google")   
+    end
+end

data/examples/test_unit.rb

@@ -12,7 +12,7 @@ class ExampleTest < TestingBot::TestCase
 
   def setup
     @browser = Selenium::Client::Driver.new \
-:host => "hub.testingbot.com",
+        :host => "hub.testingbot.com",
         :port => 4444, 
         :browser => "iexplore", 
         :platform => "WINDOWS",
@@ -20,9 +20,6 @@ class ExampleTest < TestingBot::TestCase
         :url => "http://www.google.com", 
         :timeout_in_second => 60
       
-    browser.options = {
-    }
-    
     browser.extra = "First test" # some custom data you can pass with your tests
     
     browser.start_new_browser_session
@@ -33,11 +30,7 @@ class ExampleTest < TestingBot::TestCase
   end
 
   def test_page_search
-#    browser.window_maximize
     browser.open "/"
-#browser.type "q", "selenium rc"
-#browser.click "btnG"
-#sleep 150
     assert_equal "Google", browser.title
   end
-end
+end

data/lib/testingbot.rb

@@ -1,122 +1,200 @@
 require "testingbot/version"
 
-module Selenium
-  module Client
-    module Protocol
-      attr_writer :client_key, :client_secret
-      
-        def client_key
-          if @client_key.nil?
-            @client_key, @client_secret = get_testingbot_credentials
+# if selenium RC, add testingbot credentials to request
+if defined?(Selenium) && defined?(Selenium::Client) && defined?(Selenium::Client::Protocol)
+  module Selenium
+    module Client
+      module Protocol
+        attr_writer :client_key, :client_secret
+        
+          def client_key
+            if @client_key.nil?
+              @client_key, @client_secret = get_testingbot_credentials
+            end
+            @client_key
           end
-          @client_key
-        end
+          
+          def client_secret
+            if @client_secret.nil?
+              @client_key, @client_secret = get_testingbot_credentials
+            end
+            @client_secret
+          end
+          
+          def get_testingbot_credentials
+            if File.exists?(File.expand_path("~/.testingbot"))
+              str = File.open(File.expand_path("~/.testingbot")) { |f| f.readline }.chomp
+              str.split(':')
+            else
+              raise "Please run the testingbot install tool first"
+            end
+          end
+          
+          # add custom parameters for testingbot.com
+          def http_request_for_testingbot(verb, args)
+            data = http_request_for_original(verb, args)
+            data << "&client_key=#{client_key}&client_secret=#{client_secret}"
+          end
+
+          begin
+           alias http_request_for_original http_request_for
+           alias http_request_for http_request_for_testingbot
+         rescue
+         end
+      end
+    end
+  end
+end
+
+if defined?(Selenium) && defined?(Selenium::Client) && defined?(Selenium::Client::Base)
+  module Selenium
+    module Client
+      module Base
+        DEFAULT_OPTIONS = {
+          :screenshot => true
+        }
         
-        def client_secret
-          if @client_secret.nil?
-            @client_key, @client_secret = get_testingbot_credentials
+        alias :close_current_browser_session_old :close_current_browser_session
+        alias :start_new_browser_session_old :start_new_browser_session
+        alias :initialize_old :initialize
+        
+        attr_accessor :options
+        attr_accessor :session_id_backup
+        attr_accessor :extra
+        attr_accessor :platform
+        attr_accessor :version
+        
+        def initialize(*args)
+          if args[0].kind_of?(Hash)
+            options = args[0]
+            @platform = options[:platform] || "WINDOWS"
+            @version  = options[:version]  if options[:version]
           end
-          @client_secret
+          
+          @options = DEFAULT_OPTIONS
+          initialize_old(*args)
+          @host = "hub.testingbot.com" if @host.nil?
+          @port = 4444 if @port.nil?
         end
         
-        def get_testingbot_credentials
-          if File.exists?(File.expand_path("~/.testingbot"))
-            str = File.open(File.expand_path("~/.testingbot")) { |f| f.readline }.chomp
-            str.split(':')
-          else
-            raise "Please run the testingbot install tool first"
-          end
+        def close_current_browser_session
+          @session_id_backup = @session_id
+          close_current_browser_session_old
         end
         
-        # add custom parameters for testingbot.com
-        def http_request_for_testingbot(verb, args)
-          data = http_request_for_original(verb, args)
-          data << "&client_key=#{client_key}&client_secret=#{client_secret}"
+        def start_new_browser_session(options={})
+          options = @options.merge options
+          options[:platform] = @platform
+          options[:version] = @version unless @version.nil?
+          start_new_browser_session_old(options)
         end
         
-        alias http_request_for_original http_request_for
-        alias http_request_for http_request_for_testingbot
+        def extra=(str)
+          @extra = str
+        end
+        
+        def options=(opts = {})
+          @options = @options.merge opts
+        end
+      end
     end
   end
 end
 
-module Selenium
-  module Client
-    module Base
-      DEFAULT_OPTIONS = {
-        :screenshot => true
-      }
-      
-      alias :close_current_browser_session_old :close_current_browser_session
-      alias :start_new_browser_session_old :start_new_browser_session
-      alias :initialize_old :initialize
-      
-      attr_accessor :options
-      attr_accessor :session_id_backup
-      attr_accessor :extra
-      attr_accessor :platform
-      attr_accessor :version
-      
-      def initialize(*args)
-        if args[0].kind_of?(Hash)
-          options = args[0]
-          @platform = options[:platform] || "WINDOWS"
-          @version  = options[:version]  if options[:version]
-        end
+# rspec 1
+begin
+  require 'spec'
+  require "selenium/rspec/spec_helper"
+    Spec::Runner.configure do |config|
+      config.prepend_after(:each) do
+        if File.exists?(File.expand_path("~/.testingbot"))
+          str = File.open(File.expand_path("~/.testingbot")) { |f| f.readline }.chomp
+          client_key, client_secret = str.split(':')
+          
+          session_id = nil
+          
+          if !@selenium_driver.nil?
+            session_id = @selenium_driver.session_id_backup
+          elsif defined?(Capybara)
+            session_id = Capybara.drivers[:testingbot].call.browser.instance_variable_get("@bridge").instance_variable_get("@session_id")
+          end
+          
+          if session_id.nil?
+            return
+          end
+          
+          params = {
+            "session_id" => session_id,
+            "client_key" => client_key,
+            "client_secret" => client_secret,
+            "status_message" => @execution_error,
+            "success" => !actual_failure?,
+            "name" => description.to_s,
+            "kind" => 2,
+            "extra" => @selenium_driver.extra
+          }
         
-        @options = DEFAULT_OPTIONS
-        initialize_old(*args)
-        @host = "hub.testingbot.com" if @host.nil?
-        @port = 4444 if @port.nil?
+          url = URI.parse('http://testingbot.com/hq')
+          http = Net::HTTP.new(url.host, url.port)
+          response = http.post(url.path, params.map { |k, v| "#{k.to_s}=#{v}" }.join("&"))
+        else
+            puts "Can't post test results to TestingBot since I could not a .testingbot file in your home-directory."
+        end
       end
-      
-      def close_current_browser_session
-        @session_id_backup = @session_id
-        close_current_browser_session_old
+    end
+rescue LoadError
+end
+
+# rspec 2
+begin
+  require 'rspec'
+  
+  ::RSpec.configuration.after :each do
+    if File.exists?(File.expand_path("~/.testingbot"))
+      str = File.open(File.expand_path("~/.testingbot")) { |f| f.readline }.chomp
+      client_key, client_secret = str.split(':')
+    
+      test_name = ""
+      if example.metadata && example.metadata[:example_group]
+        if example.metadata[:example_group][:description_args]
+          test_name = example.metadata[:example_group][:description_args].join(" ")
+        end
       end
       
-      def start_new_browser_session(options={})
-        options = @options.merge options
-        options[:platform] = @platform
-        options[:version] = @version unless @version.nil?
-        start_new_browser_session_old(options)
-      end
+      session_id = nil
       
-      def extra=(str)
-        @extra = str
+      if !@selenium_driver.nil?
+        session_id = @selenium_driver.session_id_backup
+      elsif defined?(Capybara)
+        session_id = Capybara.drivers[:testingbot].call.browser.instance_variable_get("@bridge").instance_variable_get("@session_id")
       end
       
-      def options=(opts = {})
-        @options = @options.merge opts
+      if session_id.nil?
+        return
       end
-    end
-  end
-end
-
-if defined?(Spec)
-  Spec::Runner.configure do |config|
-    config.prepend_after(:each) do
-      if File.exists?(File.expand_path("~/.testingbot"))
-        str = File.open(File.expand_path("~/.testingbot")) { |f| f.readline }.chomp
-        client_key, client_secret = str.split(':')
       
-        params = {
-          "session_id" => @selenium_driver.session_id_backup,
-          "client_key" => client_key,
-          "client_secret" => client_secret,
-          "status_message" => @execution_error,
-          "success" => !actual_failure?,
-          "name" => description.to_s,
-          "kind" => 2,
-          "extra" => @selenium_driver.extra
-        }
-        
-        url = URI.parse('http://testingbot.com/hq')
-        http = Net::HTTP.new(url.host, url.port)
-        response = http.post(url.path, params.map { |k, v| "#{k.to_s}=#{v}" }.join("&"))
+      params = {
+        "session_id" => session_id,
+        "client_key" => client_key,
+        "client_secret" => client_secret,
+        "status_message" => @execution_error,
+        "success" => example.exception.nil?,
+        "name" => test_name,
+        "kind" => 2
+      }
+      
+      if @selenium_driver && @selenium_driver.extra
+        params["extra"] = @selenium_driver.extra
       end
+    
+      url = URI.parse('http://testingbot.com/hq')
+      http = Net::HTTP.new(url.host, url.port)
+      response = http.post(url.path, params.map { |k, v| "#{k.to_s}=#{v}" }.join("&"))
+    else
+      puts "Can't post test results to TestingBot since I could not a .testingbot file in your home-directory."
     end
   end
+rescue LoadError
 end
 
 if defined?(Test::Unit::TestCase)

data/lib/testingbot/cucumber.rb

@@ -0,0 +1,26 @@
+if defined?(Cucumber)
+	After do |scenario|
+	  if Capybara.drivers.include?(:testingbot) && File.exists?(File.expand_path("~/.testingbot"))
+	  	unless Capybara.drivers[:testingbot].call.browser.nil?
+	  		session_id = Capybara.drivers[:testingbot].call.browser.instance_variable_get("@bridge").instance_variable_get("@session_id")
+
+			str = File.open(File.expand_path("~/.testingbot")) { |f| f.readline }.chomp
+		    client_key, client_secret = str.split(':')
+		    
+		    params = {
+		        "session_id" => session_id,
+		        "client_key" => client_key,
+		        "client_secret" => client_secret,
+		        "status_message" => (scenario.failed? ? scenario.exception.message : ""),
+		        "success" => !scenario.failed?,
+		        "name" => scenario.title,
+		        "kind" => 2
+		    }
+		    
+		    url = URI.parse('http://testingbot.com/hq')
+		    http = Net::HTTP.new(url.host, url.port)
+		    response = http.post(url.path, params.map { |k, v| "#{k.to_s}=#{v}" }.join("&"))
+	  	end
+	  end
+	end
+end

data/lib/testingbot/tunnel.rb

@@ -0,0 +1,16 @@
+module TestingBot
+  module Tunnel
+    def self.start_tunnel(host, port, localport = 80)
+      @@pid = fork do
+        exec "ssh -gNR #{port}:localhost:#{localport} #{host}"
+      end
+    end
+
+    def self.stop_tunnel
+      if @@pid
+        Process.kill "TERM", @@pid
+        Process.wait @@pid
+      end
+    end
+  end
+end

data/lib/testingbot/version.rb

@@ -1,3 +1,3 @@
 module Testingbot
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/testingbot.gemspec

@@ -17,8 +17,4 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency "rspec", "<= 1.3.4"
-  s.add_dependency "selenium-client"
-
-  s.requirements << "Selenium-Client and RSpec 1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testingbot
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70105967496820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 1.3.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *70105967496820
-- !ruby/object:Gem::Dependency
-  name: selenium-client
-  requirement: &70105967495920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70105967495920
+date: 2012-02-23 00:00:00.000000000 Z
+dependencies: []
 description: This gem makes using our Selenium grid on testingbot.com easy
 email:
 - info@testingbot.com
@@ -47,9 +25,13 @@ files:
 - README.rdoc
 - Rakefile
 - bin/testingbot
+- examples/capybara.rb
 - examples/test_rspec.rb
+- examples/test_rspec1.rb
 - examples/test_unit.rb
 - lib/testingbot.rb
+- lib/testingbot/cucumber.rb
+- lib/testingbot/tunnel.rb
 - lib/testingbot/version.rb
 - testingbot.gemspec
 homepage: http://www.testingbot.com
@@ -70,8 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- Selenium-Client and RSpec 1
+requirements: []
 rubyforge_project: testingbot
 rubygems_version: 1.8.10
 signing_key: