browser_shooter 0.3.7 → 0.3.9

data/README.md

@@ -37,7 +37,8 @@ Repeat these steps in every VM.
 Create a YAML file like this:
 
     # myconfig.yml
-    output_path: "/tmp/shoots"
+    output_path: "~/browser_shooter"
+    timeout: 40
     extensions:
       - ~/browser_shooter/my_extension_1.rb
       - ~/browser_shooter/my_extension_2.rb
@@ -87,6 +88,12 @@ Create a YAML file like this:
 
 Look in the [examples folder](https://github.com/fguillen/BrowserShooter/tree/master/examples) for more complete examples.
 
+##### Root section
+
+* **output_path**:  Root folder for the _logs_ and _screenshots_. Optional, showing the default value.
+* **timeout**:      WebDriver global timeout for all commands. Optional. showing the default value.
+* **extensions**:   List of files with _Custom Extended Commands_ implementations. Optional, empty is default. Please check the section _Custom Extended Commands_ for more information.
+
 ##### Tests section
 
 ###### WebDriver commands

data/lib/browser_shooter/base.rb

@@ -20,7 +20,7 @@ module BrowserShooter
               suite,
               test,
               browser,
-              config["output_path"]
+              config
             )
           end
         end
@@ -31,9 +31,9 @@ module BrowserShooter
       BrowserShooter::Logger.log( "BYE!" )
     end
 
-    def self.run_test( suite, test, browser, output_path )
+    def self.run_test( suite, test, browser, config )
       BrowserShooter::Logger.log( "Executing #{suite.name} | #{test.name} | #{browser.name}", true )
-      output_path = "#{output_path}/#{suite.name}/#{test.name}/#{browser.name}"
+      output_path = "#{config["output_path"]}/#{suite.name}/#{test.name}/#{browser.name}"
 
       driver = nil
 
@@ -45,7 +45,7 @@ module BrowserShooter
             :desired_capabilities => browser.type.to_sym
           )
 
-        driver.manage.timeouts.implicit_wait = 40
+        driver.manage.timeouts.implicit_wait = config["timeout"]
 
         logs =
           BrowserShooter::Commander.script(

data/lib/browser_shooter/configurator.rb

@@ -79,7 +79,8 @@ module BrowserShooter
 
     def self.load_config( config_file_path )
       config = {
-        "output_path" => "~/browser_shooter"
+        "output_path" => "~/browser_shooter",
+        "timeout"    => 40
       }
 
       config.merge! YAML.load_file( config_file_path )

data/lib/browser_shooter/version.rb

@@ -1,3 +1,3 @@
 module BrowserShooter
-  VERSION = "0.3.7"
+  VERSION = "0.3.9"
 end

data/test/base_test.rb

@@ -26,10 +26,10 @@ class BaseTest < Test::Unit::TestCase
     config_mock.stubs( :[] ).returns( "config_value" )
     config_mock.expects( :suites ).returns( [@suite1] )
 
-    BrowserShooter::Base.expects( :run_test ).with( @suite1, @test1, @browser1, "config_value" )
-    BrowserShooter::Base.expects( :run_test ).with( @suite1, @test1, @browser2, "config_value" )
-    BrowserShooter::Base.expects( :run_test ).with( @suite1, @test2, @browser1, "config_value" )
-    BrowserShooter::Base.expects( :run_test ).with( @suite1, @test2, @browser2, "config_value" )
+    BrowserShooter::Base.expects( :run_test ).with( @suite1, @test1, @browser1, config_mock )
+    BrowserShooter::Base.expects( :run_test ).with( @suite1, @test1, @browser2, config_mock )
+    BrowserShooter::Base.expects( :run_test ).with( @suite1, @test2, @browser1, config_mock )
+    BrowserShooter::Base.expects( :run_test ).with( @suite1, @test2, @browser2, config_mock )
 
     BrowserShooter::Base.new( opts ).run
   end
@@ -40,12 +40,24 @@ class BaseTest < Test::Unit::TestCase
       :desired_capabilities   => "type1".to_sym
     }
 
-    driver = mock()
-    driver.expects( :quit )
-    Selenium::WebDriver.expects( :for ).with( :remote, expected_opts ).returns( driver )
-    BrowserShooter::Commander.expects( :script ).with( @test1.commands, driver, @browser1, "output_path/suite1/test1/browser1" ).returns( "log1" )
+    config = {
+      "output_path" => "output_path",
+      "timeout"    => 66
+    }
+
+    timeouts_mock = mock()
+    manage_mock   = mock()
+    driver_mock   = mock()
+
+    driver_mock.stubs( :manage ).returns( manage_mock )
+    manage_mock.stubs( :timeouts ).returns( timeouts_mock )
+
+    timeouts_mock.expects( :implicit_wait= ).with( 66 )
+    driver_mock.expects( :quit )
+    Selenium::WebDriver.expects( :for ).with( :remote, expected_opts ).returns( driver_mock )
+    BrowserShooter::Commander.expects( :script ).with( @test1.commands, driver_mock, @browser1, "output_path/suite1/test1/browser1" ).returns( "log1" )
     BrowserShooter::LogExporter.expects( :export ).with( "log1", "output_path/suite1/test1/browser1/logs" )
 
-    BrowserShooter::Base.run_test( @suite1, @test1, @browser1, "output_path" )
+    BrowserShooter::Base.run_test( @suite1, @test1, @browser1, config )
   end
 end

data/test/configurator_test.rb

@@ -55,6 +55,13 @@ class ConfiguratorTest < Test::Unit::TestCase
     suites = BrowserShooter::Configurator.filter_suites( models, opts )
     assert_equal( 2, suites.size )
 
+    opts = { :suite => "suite1" }
+    suites = BrowserShooter::Configurator.filter_suites( models, opts )
+    assert_equal( 1, suites.size )
+    assert_equal( 2, suites.first.tests.size )
+    assert_equal( "google", suites.first.tests.first.name )
+    assert_equal( "miniclip", suites.first.tests.last.name )
+
     opts = { :suite => "suite2" }
     suites = BrowserShooter::Configurator.filter_suites( models, opts )
     assert_equal( 1, suites.size )
@@ -84,10 +91,20 @@ class ConfiguratorTest < Test::Unit::TestCase
     config = BrowserShooter::Configurator.load_config( "#{FIXTURES}/config_simple.yml" )
 
     assert_equal( "/output_path/timestamp", config["output_path"] )
-    assert_equal( "script-one", config["scripts"]["script-one"] )
+    assert_equal( 20, config["timeout"] )
+    assert_equal( "script-one", config["tests"]["script-one"] )
     assert_equal( "browser-one", config["browsers"]["browser-one"] )
   end
 
+  def test_load_config_with_defaults
+    BrowserShooter::Configurator.expects( :timestamp ).returns( "timestamp" )
+
+    config = BrowserShooter::Configurator.load_config( "#{FIXTURES}/config_empty.yml" )
+
+    assert_equal( File.expand_path( "~/browser_shooter/timestamp" ), config["output_path"] )
+    assert_equal( 40, config["timeout"] )
+  end
+
   def test_load_extensions
     Kernel.expects( :require ).with( File.expand_path( "extension1.rb" ) )
     Kernel.expects( :require ).with( File.expand_path( "extension2.rb" ) )

data/test/fixtures/config_empty.yml

@@ -0,0 +1,3 @@
+tests:
+browsers:
+suites:

data/test/fixtures/config_simple.yml

@@ -1,13 +1,15 @@
 output_path: "/output_path"
+timeout: 20
 
-scripts:
+tests:
   script-one: "script-one"
   script-two: "script-two"
 
-suites:
-  suite-one: "suite-one"
-
 browsers:
   browser-one: "browser-one"
   browser-two: "browser-two"
-  browser-three: "browser-three"
+  browser-three: "browser-three"
+
+suites:
+  suite-one: "suite-one"
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browser_shooter
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000Z
+date: 2012-04-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70241112217880 !ruby/object:Gem::Requirement
+  requirement: &70301246657780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0.rc.6
   type: :development
   prerelease: false
-  version_requirements: *70241112217880
+  version_requirements: *70301246657780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70241112217380 !ruby/object:Gem::Requirement
+  requirement: &70301246657280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70241112217380
+  version_requirements: *70301246657280
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70241112217000 !ruby/object:Gem::Requirement
+  requirement: &70301246656900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241112217000
+  version_requirements: *70301246656900
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &70241112216540 !ruby/object:Gem::Requirement
+  requirement: &70301246656440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241112216540
+  version_requirements: *70301246656440
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &70241112216120 !ruby/object:Gem::Requirement
+  requirement: &70301246656020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241112216120
+  version_requirements: *70301246656020
 description: Selenium RC wraper to create browser screenshots
 email:
 - fguillen.mail@gmail.com
@@ -110,6 +110,7 @@ files:
 - test/commands/screenshots_test.rb
 - test/configurator_test.rb
 - test/fixtures/config.yml
+- test/fixtures/config_empty.yml
 - test/fixtures/config_simple.yml
 - test/fixtures/logs/log.csv
 - test/fixtures/screenshot.base64
@@ -151,6 +152,7 @@ test_files:
 - test/commands/screenshots_test.rb
 - test/configurator_test.rb
 - test/fixtures/config.yml
+- test/fixtures/config_empty.yml
 - test/fixtures/config_simple.yml
 - test/fixtures/logs/log.csv
 - test/fixtures/screenshot.base64