testingbot 0.0.8 → 0.0.9

data/README.rdoc

@@ -32,7 +32,7 @@ You can find an example in our examples folder, try something like this:
   		:url => "http://www.google.com",
   		:platform => "WINDOWS",
   		:version => 10,
-  		:timeout_in_second => 60
+  		:timeout_in_second => 90
   		
   		browser.options = {
   			:screenshot     => true
@@ -67,7 +67,7 @@ This example uses RSpec 2. You can run it with rspec test_rspec.rb
             :port => 4444, 
             :browser => "firefox", 
             :url => "http://www.google.com", 
-            :timeout_in_second => 60,
+            :timeout_in_second => 90,
             :platform => "WINDOWS",
             :version => "10"
     end
@@ -107,7 +107,7 @@ This example uses RSpec 1. You can run it with spec test_rspec1.rb
               :port => 4444, 
               :browser => "firefox", 
               :url => "http://www.google.com", 
-              :timeout_in_second => 60,
+              :timeout_in_second => 90,
               :platform => "WINDOWS",
               :version => "10"
       end
@@ -162,6 +162,10 @@ This example uses RSpec 2 together with capybara and Selenium webdriver. You can
     end
   end
 
+== Capybara and Cucumber
+The examples directory contains an example of testing with Capybara and Cucumber
+More info available on http://testingbot.com/support/getting-started/cucumber.html
+
 == Extra options
 You can specify extra options like enabling/disabling the screenrecording or screenshot feature. (browser.options)
 
@@ -170,7 +174,7 @@ For example a build number, or other custom data. (browser.extra = "")
 
 == More information
 
-Get more information on http://www.testingbot.com
+Get more information on http://testingbot.com
 
 == Copyright
 

data/examples/cucumber/features/support/env.rb

@@ -4,17 +4,35 @@ require 'rspec'
 require 'selenium/webdriver'
 require 'testingbot/cucumber'
 
-caps = Selenium::WebDriver::Remote::Capabilities.firefox  
-caps.version = "8"  
-caps.platform = :WINDOWS 
+if ENV['TESTINGBOT_BROWSER']
+	caps = {}
+	caps[:browser] = ENV['TESTINGBOT_BROWSER']
+	caps[:version] = ENV['TESTINGBOT_BROWSERVERSION'] || ""
+	caps[:platform] = ENV['TESTINGBOT_BROWSEROS'] || :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
+	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://251ca561ab0f7557bb34c3ee3dbde285:3fc22e44f086fa036d8b01eadf66740b@hub.testingbot.com:4444/wd/hub",
+		    :http_client => client,
+		    :desired_capabilities => caps)
+	end
+else
+	caps = Selenium::WebDriver::Remote::Capabilities.firefox
+	caps.version = "10"  
+	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://251ca561ab0f7557bb34c3ee3dbde285:3fc22e44f086fa036d8b01eadf66740b@hub.testingbot.com:4444/wd/hub",
+		    :http_client => client,
+		    :desired_capabilities => caps)
+	end
+end

data/lib/testingbot.rb

@@ -1,39 +1,15 @@
 require "testingbot/version"
+require "testingbot/config"
 
 # 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
-          
-          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}"
+            data << "&client_key=#{TestingBot.get_config[:client_key]}&client_secret=#{TestingBot.get_config[:client_secret]}"
           end
 
           begin
@@ -107,9 +83,10 @@ begin
   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(':')
+        client_key = TestingBot.get_config[:client_key]
+        client_secret = TestingBot.get_config[:client_secret]
+        
+        if !client_key.nil?
           
           session_id = nil
           
@@ -152,10 +129,11 @@ 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(':')
     
+    client_key = TestingBot.get_config[:client_key]
+    client_secret = TestingBot.get_config[:client_secret]
+    
+    if !client_key.nil?
       test_name = ""
       if example.metadata && example.metadata[:example_group]
         if example.metadata[:example_group][:description_args]
@@ -208,7 +186,7 @@ begin
 rescue LoadError
 end
 
-if defined?(Test::Unit::TestCase)
+if defined?(Test::Unit::TestCase) && (Test::Unit::TestCase.respond_to?('run_teardown'))
   module TestingBot
     class TestingBot::TestCase < Test::Unit::TestCase
       alias :run_teardown_old :run_teardown
@@ -217,7 +195,9 @@ if defined?(Test::Unit::TestCase)
       attr_accessor :exception
       
       def run_teardown
-        client_key, client_secret = get_testingbot_credentials
+        client_key = TestingBot.get_config[:client_key]
+        client_secret = TestingBot.get_config[:client_secret]
+        
         params = {
           "session_id" => browser.session_id,
           "client_key" => client_key,
@@ -239,15 +219,6 @@ if defined?(Test::Unit::TestCase)
         @exception = e.to_s
         handle_exception_old(e)
       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
     end
   end
 end

data/lib/testingbot/config.rb

@@ -0,0 +1,66 @@
+module TestingBot
+  @@config = nil
+  
+  def self.get_config
+    @@config = TestingBot::Config.new if @@config.nil?
+    @@config
+  end
+  
+  class Config
+    
+    attr_reader :options
+    
+    def initialize(options = {})
+      @options = options
+      @options = @options.merge(load_config_file)
+      @options = @options.merge(load_config_environment)
+    end
+    
+    def [](key)
+      @options[key]
+    end
+
+    def []=(key, value)
+      @options[key] = value
+    end
+    
+    def client_key
+      @options[:client_key]
+    end
+    
+    def client_secret
+      @options[:client_secret]
+    end
+    
+    private
+    
+    def load_config_file
+      options = {}
+      
+      is_windows = (RUBY_PLATFORM =~ /w.*32/)
+      
+      if is_windows
+        config_file = "#{ENV['HOMEDRIVE']}\\.testingbot"
+      else
+        config_file = File.expand_path("~/.testingbot")
+      end
+      
+      if File.exists?(config_file)
+        str = File.open(config_file) { |f| f.readline }.chomp
+        options[:client_key], options[:client_secret] = str.split(':')
+      end
+      
+      options
+    end
+    
+    def load_config_environment
+      options = {}
+      options[:client_key] = ENV['TESTINGBOT_CLIENTKEY']
+      options[:client_secret] = ENV['TESTINGBOT_CLIENTSECRET']
+      
+      options.delete_if { |key, value| value.nil?}
+      
+      options
+    end
+  end
+end

data/lib/testingbot/cucumber.rb

@@ -1,26 +1,30 @@
+require 'testingbot/config'
+
 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
+    client_key = TestingBot.get_config[:client_key]
+    client_secret = TestingBot.get_config[:client_secret]
+    
+	  if Capybara.drivers.include?(:testingbot) && !TestingBot.get_config[:client_key].nil?
+	    begin
+        session_id = page.driver.browser.instance_variable_get("@bridge").instance_variable_get("@session_id")
+          
+        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("&"))
+      rescue Exception => e
+        p "Could not determine sessionID, can not send results to TestingBot.com #{e.message}"
+      end
 	  end
 	end
 end

data/lib/testingbot/version.rb

@@ -1,3 +1,3 @@
 module Testingbot
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testingbot
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies: []
 description: This gem makes using our Selenium grid on testingbot.com easy
 email:
@@ -34,6 +34,7 @@ files:
 - examples/test_rspec1.rb
 - examples/test_unit.rb
 - lib/testingbot.rb
+- lib/testingbot/config.rb
 - lib/testingbot/cucumber.rb
 - lib/testingbot/tunnel.rb
 - lib/testingbot/version.rb