browser_shooter 0.3.3 → 0.3.5

data/README.md

@@ -38,18 +38,21 @@ Create a YAML file like this:
 
     # myconfig.yml
     output_path: "/tmp/shoots"
+    extensions:
+      - ~/browser_shooter/my_extension_1.rb
+      - ~/browser_shooter/my_extension_2.rb
 
     tests:
       google: |
         navigate.to "http://www.google.de"
-        shot before
+        shot "before"
         type "input[name='q']", "beautiful houses"
         click "input[name='btnG']"
         pause 3
         click "a.kls"
         pause 3
-        shot after
-        shot_system final_shot
+        shot "after"
+        shot_system "final_shot"
 
       miniclip: |
         navigate.to "http://www.miniclip.com/games/de/"
@@ -86,17 +89,65 @@ Look in the [examples folder](https://github.com/fguillen/BrowserShooter/tree/ma
 
 ##### Tests section
 
-Commands are WebDriver commands, except:
+###### WebDriver commands
 
-* **shot** command which receive an optional param with the 'sufix' of the page screenshot png
-* **shot_system** equal to 'shot' but use the "VirtualBox" system command "VBoxManage" to make an screenshot of the OS screen.
-* **pause** command which use a Ruby 'sleep' command to pause
-* **click** command which receive a 'css_selector' as a param, find the element and click on it
-* **type** command which receive two params: 'css_selector' ana a 'message', find the element and type the message on it
-* **wait_for_element** command which receive two params: 'css_selector', and a 'timeout' in seconds
+You can use any command from the [WebDriver API](http://selenium.googlecode.com/svn/trunk/docs/api/rb/index.html).
+
+Any command you can call from a `driver` instance like:
+
+    driver.navigate.to "http://google.com"
+
+You can use in the _test section_ just removing the `driver` word:
+
+    navigate.to "http://google.com"
+
+###### Extended Commands
+
+Also you can use this list of _extended commands_:
+
+* **shot**              receives an optional param with the 'sufix' of the page screenshot png
+* **shot_system**       equal to 'shot' but uses the "VirtualBox" system command "VBoxManage" to make an screenshot of the OS screen.
+* **pause**             uses a Ruby 'sleep' command to pause
+* **click**             receives a 'css_selector' as a param, find the element and click on it
+* **type**              receives two params: 'css_selector' ana a 'message', find the element and type the message on it
+* **wait_for_element**  receives two params: 'css_selector', and a 'timeout' in seconds
+* **try**               receives an string wich is Ruby code, you have access here to variables like `driver`, `browser` and `output_path`.
+* **debug**             receives no argument. When the test arrives to this command a Ruby console will be open and you will be able to write Ruby commands on the air. Until you write `exit`.
 
 You can define as much tests as you want. Every test is composed by a list of **one line** commands.
 
+###### Custom Extended Commands
+
+If you need to add new commands to the _test section_ you can implement your own ones.
+
+Write a file like this:
+
+    # my_extension.rb
+    module MyExtension
+      def log( arg1, arg2 )
+        puts "This is the log extension method"
+        puts "arg1: #{arg1}"
+        puts "arg2: #{arg2}"
+        puts "driver: #{driver}"
+        puts "browser: #{browser}"
+        puts "output_path: #{output_path}"
+      end
+    end
+    BrowserShooter::Commands::Base.plug( MyExtension )
+
+Declare this extension file in the _extensions section_:
+
+    # config.yml
+    extensions:
+      - path/to/my_extension.rb
+
+Then you will be able to use this new command into the _test section_ like this:
+
+    log "myarg1", "myarg2"
+
+You can check the [custom extensions](https://github.com/fguillen/BrowserShooter/tree/master/lib/browser_shooter/commands) that are already integrated in BrowserShooter.
+
+
 ##### Browsers section
 
 All the available browsers with the **selenium server url** and the **selenium browser type**.

data/examples/config0.yml

@@ -3,8 +3,8 @@ output_path: "~/browser_shoots"
 tests:
   google: |
     navigate.to "http://www.google.com"
-    shot browser
-    shot_system system
+    shot "browser"
+    shot_system "system"
 
   miniclip: |
     navigate.to "http://www.miniclip.com/games/de/"

data/examples/config1.yml

@@ -3,13 +3,13 @@ output_path: "~/browser_shoots"
 tests:
   google: |
     navigate.to "http://www.google.de"
-    shot before
+    shot "before"
     type "input[name='q']", "beautiful houses"
     click "input[name='btnG']"
     pause 3
     click "a.kls"
     pause 3
-    shot after
+    shot "after"
 
   miniclip: |
     navigate.to "http://www.miniclip.com/games/de/"

data/examples/config2.yml

@@ -3,27 +3,27 @@ output_path: "~/browser_shooter"
 tests:
   lightbox: |
     navigate.to "http://192.168.70.70/test/browser_shooter/lightbox_bareplayer.html"
-    shot 01_first
+    shot "01_first"
     pause 5
     switch_to.alert.accept
     click "a"
     pause 5
-    shot 02_video
+    shot "02_video"
     switch_to.frame "_sp_wiframe"
     execute_script "$f().play()"
     pause 3
-    shot 03_video_start
+    shot "03_video_start"
     wait_for_element "span.enabled", 40
-    shot 04_green_button
+    shot "04_green_button"
     click "span.enabled"
     pause 8
     switch_to.alert.accept
-    shot 05_spinner
+    shot "05_spinner"
     switch_to.default_content
     click "#sp_close_x"
     switch_to.alert.accept
     pause 4
-    shot 06_hidden
+    shot "06_hidden"
 
 browsers:
   osx-chrome:

data/examples/config3_debug.yml

@@ -0,0 +1,23 @@
+output_path: "~/browser_shoots"
+extensions:
+  - "./examples/extension0.rb"
+
+tests:
+  debug: |
+    log "argument1", "argument2"
+    try "puts driver.to_s"
+    debug
+    try "puts 'ending'"
+
+browsers:
+  ios-chrome:
+    url: "http://127.0.0.1:4444/wd/hub"
+    type: "chrome"
+    vm: "My VM"
+
+suites:
+  suite1:
+    tests:
+      - debug
+    browsers:
+      - ios-chrome

data/examples/extension0.rb

@@ -0,0 +1,13 @@
+module Extension0
+
+  def log( arg1, arg2 )
+    puts "This is the log extension method"
+    puts "arg1: #{arg1}"
+    puts "arg2: #{arg2}"
+    puts "driver: #{driver}"
+    puts "browser: #{browser}"
+    puts "output_path: #{output_path}"
+  end
+
+end
+BrowserShooter::Commands::Base.plug( Extension0 )

data/lib/browser_shooter/commander.rb

@@ -1,14 +1,20 @@
 module BrowserShooter::Commander
 
   def self.script( commands, driver, browser, output_path )
+
+    command_executor =
+      BrowserShooter::Commands::Base.new(
+        driver,
+        browser,
+        output_path
+      )
+
     test_result =
       commands.map do |command|
         command_result =
           BrowserShooter::Commander.wrapper_execute(
-            command.strip,
-            driver,
-            browser,
-            output_path
+            command_executor,
+            command.strip
           )
 
         BrowserShooter::Logger.command_result( command_result )
@@ -21,63 +27,7 @@ module BrowserShooter::Commander
     test_result
   end
 
-  def self.execute( command, driver, browser, output_path )
-    BrowserShooter::Logger.log "command: #{command}"
-
-    if( command.split[0].strip == "shot" )
-      sufix = command.split[1] ? command.split[1].strip : nil
-
-      BrowserShooter::Commander.shot(
-        driver,
-        output_path,
-        sufix
-      )
-
-    elsif( command.split[0].strip == "shot_system" )
-      sufix = command.split[1] ? command.split[1].strip : nil
-
-      BrowserShooter::Commander.shot_system(
-        driver,
-        browser,
-        output_path,
-        sufix
-      )
-
-    elsif( command.split[0].strip == "pause" )
-      BrowserShooter::Commander.pause( command.split[1].strip.to_i )
-
-    elsif( command.split[0].strip == "wait_for_element" )
-      params = command.match /wait_for_element "(.*)"\s?,\s?(\d*)/
-
-      BrowserShooter::Commander.wait_for_element(
-        driver,
-        params[1],
-        params[2].to_i
-      )
-
-    elsif( command.split[0].strip == "type" )
-      params = command.match /type "(.*)"\s?,\s?"(.*)"/
-
-      BrowserShooter::Commander.type(
-        driver,
-        params[1],
-        params[2]
-      )
-
-    elsif( command.split[0].strip == "click" )
-      params = command.match /click "(.*)"/
-      BrowserShooter::Commander.click(
-        driver,
-        params[1]
-      )
-
-    else
-      eval "driver.#{command}"
-
-    end
-  end
-
-  def self.wrapper_execute( command, driver, browser, output_path )
+  def self.wrapper_execute( command_executor, command )
     result = {
       :time     => Time.now.to_i,
       :command  => command
@@ -86,10 +36,8 @@ module BrowserShooter::Commander
     begin
       message =
         BrowserShooter::Commander.execute(
-          command,
-          driver,
-          browser,
-          output_path
+          command_executor,
+          command
         )
 
 
@@ -114,60 +62,15 @@ module BrowserShooter::Commander
     return result
   end
 
-  def self.shot( driver, output_path, sufix = nil )
-    sufix     = timestamp unless sufix
-    shot_path = "#{output_path}/shots/#{sufix}.png"
-
-    BrowserShooter::Logger.log "shooting in '#{shot_path}'"
-
-    FileUtils.mkdir_p( File.dirname( shot_path ) )
-    driver.save_screenshot( shot_path )
-
-    return shot_path
-  end
-
-  def self.shot_system( driver, browser, output_path, sufix = nil )
-    sufix     = timestamp unless sufix
-    shot_path = "#{output_path}/shots/#{sufix}.png"
-
-    BrowserShooter::Logger.log "shooting system in '#{shot_path}'"
-
-    FileUtils.mkdir_p( File.dirname( shot_path ) )
-
-    command = "VBoxManage controlvm '#{browser.vm}' screenshotpng '#{shot_path}'"
-    success = Kernel.system( command )
-
-    if( !success )
-      raise SystemCallError, "Shoot system command [#{command}] returns error: '#{$?}'"
-    end
-
-    return shot_path
-  end
-
-  def self.wait_for_element( driver, css_selector, timeout )
-    wait = Selenium::WebDriver::Wait.new( :timeout => timeout )
+  def self.execute( command_executor, command )
+    BrowserShooter::Logger.log "command: #{command}"
+    command_name = command.split( /[\s\(]/ )[0].strip
 
-    wait.until do
-      driver.find_element( "css", css_selector )
+    if( command_executor.respond_to?( command_name.to_sym ) )
+      eval "command_executor.#{command}"
+    else
+      eval "command_executor.driver.#{command}"
     end
   end
 
-  def self.click( driver, css_selector )
-    driver.find_element( "css", css_selector ).click
-  end
-
-  def self.type( driver, css_selector, text )
-    driver.find_element( "css", css_selector ).send_keys( text )
-  end
-
-  def self.pause( seconds )
-    BrowserShooter::Logger.log "pausing #{seconds} seconds"
-    Kernel.sleep seconds
-
-    return "#{seconds} seconds later..."
-  end
-
-  def self.timestamp
-    Time.now.to_i
-  end
 end

data/lib/browser_shooter/commands/base.rb

@@ -0,0 +1,17 @@
+module BrowserShooter
+  module Commands
+    class Base
+      attr_reader :driver, :browser, :output_path
+
+      def initialize( driver, browser, output_path )
+        @driver       = driver
+        @browser      = browser
+        @output_path  = output_path
+      end
+
+      def self.plug( _module )
+        include( _module )
+      end
+    end
+  end
+end

data/lib/browser_shooter/commands/basics.rb

@@ -0,0 +1,30 @@
+module BrowserShooter
+  module Commands
+    module Basic
+      def wait_for_element( css_selector, timeout )
+        wait = Selenium::WebDriver::Wait.new( :timeout => timeout )
+
+        wait.until do
+          driver.find_element( "css", css_selector )
+        end
+      end
+
+      def click( css_selector )
+        driver.find_element( "css", css_selector ).click
+      end
+
+      def type( css_selector, text )
+        driver.find_element( "css", css_selector ).send_keys( text )
+      end
+
+      def pause( seconds )
+        BrowserShooter::Logger.log "pausing #{seconds} seconds"
+        Kernel.sleep seconds
+
+        return "#{seconds} seconds later..."
+      end
+
+    end
+  end
+end
+BrowserShooter::Commands::Base.plug( BrowserShooter::Commands::Basic )

data/lib/browser_shooter/commands/debug.rb

@@ -0,0 +1,22 @@
+module BrowserShooter
+  module Commands
+    module Debug
+      def try( ruby_code )
+        eval ruby_code
+      end
+
+      def debug
+        while( true )
+          print "BrowserShooter > "
+          line = STDIN.gets.chomp
+
+          break if line == "exit"
+
+          eval line
+        end
+      end
+    end
+  end
+end
+
+BrowserShooter::Commands::Base.plug( BrowserShooter::Commands::Debug )

data/lib/browser_shooter/commands/screenshots.rb

@@ -0,0 +1,38 @@
+module BrowserShooter
+  module Commands
+    module Screenshots
+
+      def shot( sufix = nil )
+        sufix     = BrowserShooter::Utils.timestamp unless sufix
+        shot_path = "#{output_path}/shots/#{sufix}.png"
+
+        BrowserShooter::Logger.log "shooting in '#{shot_path}'"
+
+        FileUtils.mkdir_p( File.dirname( shot_path ) )
+        driver.save_screenshot( shot_path )
+
+        return shot_path
+      end
+
+      def shot_system( sufix = nil )
+        sufix     = BrowserShooter::Utils.timestamp unless sufix
+        shot_path = "#{output_path}/shots/#{sufix}.png"
+
+        BrowserShooter::Logger.log "shooting system in '#{shot_path}'"
+
+        FileUtils.mkdir_p( File.dirname( shot_path ) )
+
+        command = "VBoxManage controlvm '#{browser.vm}' screenshotpng '#{shot_path}'"
+        success = Kernel.system( command )
+
+        if( !success )
+          raise SystemCallError, "Shoot system command [#{command}] returns error: '#{$?}'"
+        end
+
+        return shot_path
+      end
+
+    end
+  end
+end
+BrowserShooter::Commands::Base.plug( BrowserShooter::Commands::Screenshots )

data/lib/browser_shooter/configurator.rb

@@ -4,8 +4,10 @@ module BrowserShooter
 
     def initialize( opts )
       @config = BrowserShooter::Configurator.load_config( opts[:config_file] )
-      models = BrowserShooter::Configurator.build_models( @config )
+      models  = BrowserShooter::Configurator.build_models( @config )
       @suites = BrowserShooter::Configurator.filter_suites( models, opts )
+
+      BrowserShooter::Configurator.load_extensions( @config["extensions"] ) if @config["extensions"]
     end
 
     def [](value)
@@ -77,24 +79,31 @@ module BrowserShooter
 
     def self.load_config( config_file_path )
       config = {
-        "output_path" => "~/browser_shooter",
-        "logs_format" => "csv"
+        "output_path" => "~/browser_shooter"
       }
 
       config.merge! YAML.load_file( config_file_path )
 
-      config["output_path"] = set_up_output_path( config["output_path"] )
+      config["output_path"] = setup_output_path( config["output_path"] )
 
       config
     end
 
-    def self.set_up_output_path( output_path )
+    def self.setup_output_path( output_path )
       output_path = File.expand_path( "#{output_path}/#{timestamp}" )
       BrowserShooter::Logger.log( "output_path: #{output_path}" )
 
       output_path
     end
 
+    def self.load_extensions( extensions_paths )
+      extensions_paths.each do |extension_path|
+        extension_path = File.expand_path( extension_path )
+        BrowserShooter::Logger.log( "Loading extension: #{extension_path}" )
+        Kernel.require( extension_path )
+      end
+    end
+
     def self.timestamp
       Time.now.strftime("%Y%m%d%H%M%S")
     end

data/lib/browser_shooter/utils.rb

@@ -0,0 +1,7 @@
+module BrowserShooter
+  module Utils
+    def self.timestamp
+      Time.now.to_i
+    end
+  end
+end

data/lib/browser_shooter/version.rb

@@ -1,3 +1,3 @@
 module BrowserShooter
-  VERSION = "0.3.3"
+  VERSION = "0.3.5"
 end

data/lib/browser_shooter.rb

@@ -4,6 +4,7 @@ require "yaml"
 require "json"
 
 require_relative "./browser_shooter/base"
+require_relative "./browser_shooter/utils"
 require_relative "./browser_shooter/models/suite"
 require_relative "./browser_shooter/models/test"
 require_relative "./browser_shooter/models/browser"
@@ -13,5 +14,9 @@ require_relative "./browser_shooter/logger"
 require_relative "./browser_shooter/commander"
 require_relative "./browser_shooter/log_exporter"
 require_relative "./browser_shooter/argv_parser"
+require_relative "./browser_shooter/commands/base"
+require_relative "./browser_shooter/commands/basics"
+require_relative "./browser_shooter/commands/screenshots"
+require_relative "./browser_shooter/commands/debug"
 
 

data/test/base_test.rb

@@ -16,7 +16,7 @@ class BaseTest < Test::Unit::TestCase
   end
 
   def test_run
-    BrowserShooter::Configurator.stubs( :set_up_output_path )
+    BrowserShooter::Configurator.stubs( :setup_output_path )
 
     opts = {}
 

data/test/commander_test.rb

@@ -7,8 +7,10 @@ class CommanderTest < Test::Unit::TestCase
       "  command2 "
     ]
 
-    BrowserShooter::Commander.expects( :wrapper_execute ).with( "command1", "driver", "browser", "output_path" ).returns( "result1" )
-    BrowserShooter::Commander.expects( :wrapper_execute ).with( "command2", "driver", "browser", "output_path" ).returns( "result2" )
+    BrowserShooter::Commands::Base.expects( :new ).with( "driver", "browser", "output_path" ).returns( "command_executor" )
+
+    BrowserShooter::Commander.expects( :wrapper_execute ).with( "command_executor", "command1" ).returns( "result1" )
+    BrowserShooter::Commander.expects( :wrapper_execute ).with( "command_executor", "command2" ).returns( "result2" )
     BrowserShooter::Logger.expects( :command_result ).twice
     BrowserShooter::Logger.expects( :test_result )
 
@@ -18,8 +20,8 @@ class CommanderTest < Test::Unit::TestCase
   end
 
   def test_wrapper_execute
-    BrowserShooter::Commander.expects( :execute ).with( "command", "driver", "browser", "output_path" ).returns( "message" )
-    result = BrowserShooter::Commander.wrapper_execute( "command", "driver", "browser", "output_path" )
+    BrowserShooter::Commander.expects( :execute ).with( "command_executor", "command" ).returns( "message" )
+    result = BrowserShooter::Commander.wrapper_execute( "command_executor", "command" )
 
     assert_equal( "command", result[:command] )
     assert_equal( false, result[:time].nil? )
@@ -28,8 +30,8 @@ class CommanderTest < Test::Unit::TestCase
   end
 
   def test_wrapper_execute_when_error
-    BrowserShooter::Commander.expects( :execute ).with( "command", "driver", "browser", "output_path" ).raises( Exception.new( "error" ) )
-    result = BrowserShooter::Commander.wrapper_execute( "command", "driver", "browser", "output_path" )
+    BrowserShooter::Commander.expects( :execute ).with( "command_executor", "command" ).raises( Exception.new( "error" ) )
+    result = BrowserShooter::Commander.wrapper_execute( "command_executor", "command" )
 
     assert_equal( "command", result[:command] )
     assert_equal( false, result[:time].nil? )
@@ -37,135 +39,32 @@ class CommanderTest < Test::Unit::TestCase
     assert_equal( "error", result[:message] )
   end
 
-  def test_execute_when_shot_with_sufix
-    BrowserShooter::Commander.expects( :shot ).with( "driver", "shoot-path", "sufix" )
-    BrowserShooter::Commander.execute( "shot sufix", "driver", "browser", "shoot-path" )
-  end
-
-  def test_execute_when_shot_without_sufix
-    BrowserShooter::Commander.expects( :shot ).with( "driver", "shoot-path", nil )
-    BrowserShooter::Commander.execute( "shot", "driver", "browser", "shoot-path" )
-  end
-
-  def test_execute_when_shot_system_with_sufix
-    BrowserShooter::Commander.expects( :shot_system ).with( "driver", "browser", "shoot-path", "sufix" )
-    BrowserShooter::Commander.execute( "shot_system sufix", "driver", "browser", "shoot-path" )
-  end
-
-  def test_execute_when_shot_system_without_sufix
-    BrowserShooter::Commander.expects( :shot_system ).with( "driver", "browser", "shoot-path", nil )
-    BrowserShooter::Commander.execute( "shot_system", "driver", "browser", "shoot-path" )
-  end
-
-  def test_execute_when_pause
-    BrowserShooter::Commander.expects( :pause ).with( 10 )
-    BrowserShooter::Commander.execute( "pause 10", "driver", "browser", "shoot-path" )
-  end
-
-  def test_execute_when_wait_for_element
-    BrowserShooter::Commander.expects( :wait_for_element ).with( "driver", "css_selector", 10 )
-    BrowserShooter::Commander.execute( "wait_for_element \"css_selector\", 10", "driver", "browser", nil )
-  end
-
-  def test_execute_when_click
-    BrowserShooter::Commander.expects( :click ).with( "driver", "css_selector" )
-    BrowserShooter::Commander.execute( "click \"css_selector\"", "driver", "browser", nil )
-  end
-
-  def test_execute_when_type
-    BrowserShooter::Commander.expects( :type ).with( "driver", "css_selector", "message a b" )
-    BrowserShooter::Commander.execute( "type \"css_selector\", \"message a b\"", "driver", "browser", nil )
-  end
-
-  def test_shot_with_sufix
-    driver = mock()
-
-    FileUtils.expects( :mkdir_p ).with( "output_path/shots" )
-    driver.expects( :save_screenshot ).with( "output_path/shots/sufix.png" )
-
-    BrowserShooter::Commander.shot( driver, "output_path", "sufix" )
-  end
-
-  def test_shot_without_sufix
-    BrowserShooter::Commander.stubs( :timestamp ).returns( "timestamp" )
-
-    driver = mock()
-
-    FileUtils.expects( :mkdir_p ).with( "output_path/shots" )
-    driver.expects( :save_screenshot ).with( "output_path/shots/timestamp.png" )
-
-    BrowserShooter::Commander.shot( driver, "output_path", nil )
-  end
-
-  def test_shot_system_with_sufix
-    browser  = mock()
-    command  = "VBoxManage controlvm 'VMName' screenshotpng 'output_path/shots/sufix.png'"
-
-    browser.stubs( :vm ).returns( "VMName" )
-    FileUtils.expects( :mkdir_p ).with( "output_path/shots" )
-    Kernel.expects( :system ).with( command ).returns( true )
-
-    BrowserShooter::Commander.shot_system( "driver", browser, "output_path", "sufix" )
-  end
-
-  def test_shot_system_without_sufix
-    browser  = mock()
-    command  = "VBoxManage controlvm 'VMName' screenshotpng 'output_path/shots/timestamp.png'"
+  def test_execute_in_command_executor
+    command_executor = mock()
 
-    BrowserShooter::Commander.stubs( :timestamp ).returns( "timestamp" )
-    browser.stubs( :vm ).returns( "VMName" )
-    FileUtils.expects( :mkdir_p ).with( "output_path/shots" )
-    Kernel.expects( :system ).with( command ).returns( true )
+    command_executor.expects( :respond_to? ).with( :command_name ).returns( true )
+    command_executor.expects( :command_name ).with( "arg1", "arg2" )
 
-    BrowserShooter::Commander.shot_system( "driver", browser, "output_path" )
+    BrowserShooter::Commander.execute( command_executor, "command_name 'arg1', 'arg2'" )
   end
 
-  def test_shot_system_with_error
-    browser  = mock()
-    command  = "VBoxManage controlvm 'VMName' screenshotpng 'output_path/shots/sufix.png'"
+  def test_execute_in_command_executor_command_with_params
+    command_executor = mock()
 
-    browser.stubs( :vm ).returns( "VMName" )
-    FileUtils.expects( :mkdir_p ).with( "output_path/shots" )
-    Kernel.expects( :system ).with( command ).returns( false )
+    command_executor.expects( :respond_to? ).with( :command_name ).returns( true )
+    command_executor.expects( :command_name ).with( "arg1", "arg2" )
 
-    assert_raise( SystemCallError ) do
-      BrowserShooter::Commander.shot_system( "driver", browser, "output_path", "sufix" )
-    end
+    BrowserShooter::Commander.execute( command_executor, "command_name('arg1', 'arg2')" )
   end
 
-  def test_wait_for_element
-    wait    = mock()
-    driver  = mock()
+  def test_execute_in_driver
+    command_executor = mock()
+    driver           = mock()
 
-    Selenium::WebDriver::Wait.expects( :new ).with( :timeout => 10 ).returns( wait )
-    wait.expects( :until ).yields
-    driver.expects( :find_element ).with( "css", "css_selector" )
-
-    BrowserShooter::Commander.wait_for_element( driver, "css_selector", 10 )
-  end
-
-  def test_click
-    driver  = mock()
-    element = mock()
-
-    driver.expects( :find_element ).with( "css", "css_selector" ).returns( element )
-    element.expects( :click )
-
-    BrowserShooter::Commander.click( driver, "css_selector" )
-  end
-
-  def test_type
-    driver  = mock()
-    element = mock()
-
-    driver.expects( :find_element ).with( "css", "css_selector" ).returns( element )
-    element.expects( :send_keys ).with( "message" )
-
-    BrowserShooter::Commander.type( driver, "css_selector", "message" )
-  end
+    command_executor.expects( :respond_to? ).with( :command_name ).returns( false )
+    command_executor.expects( :driver ).returns( driver )
+    driver.expects( :command_name ).with( "arg1", "arg2" )
 
-  def test_pause
-    Kernel.expects( :sleep ).with( 1 )
-    BrowserShooter::Commander.pause( 1 )
+    BrowserShooter::Commander.execute( command_executor, "command_name 'arg1', 'arg2'" )
   end
 end

data/test/commands/basics_test.rb

@@ -0,0 +1,49 @@
+require_relative "../test_helper"
+
+class BasicsTest < Test::Unit::TestCase
+  def setup
+    @driver       = mock()
+    @browser      = mock()
+    @output_path  = "output_path"
+
+    @command_executor =
+      BrowserShooter::Commands::Base.new(
+        @driver,
+        @browser,
+        @output_path
+      )
+  end
+
+  def test_wait_for_element
+    wait = mock()
+
+    Selenium::WebDriver::Wait.expects( :new ).with( :timeout => 10 ).returns( wait )
+    wait.expects( :until ).yields
+    @driver.expects( :find_element ).with( "css", "css_selector" )
+
+    @command_executor.wait_for_element( "css_selector", 10 )
+  end
+
+  def test_click
+    element = mock()
+
+    @driver.expects( :find_element ).with( "css", "css_selector" ).returns( element )
+    element.expects( :click )
+
+    @command_executor.click( "css_selector" )
+  end
+
+  def test_type
+    element = mock()
+
+    @driver.expects( :find_element ).with( "css", "css_selector" ).returns( element )
+    element.expects( :send_keys ).with( "message" )
+
+    @command_executor.type( "css_selector", "message" )
+  end
+
+  def test_pause
+    Kernel.expects( :sleep ).with( 1 )
+    @command_executor.pause( 1 )
+  end
+end

data/test/commands/screenshots_test.rb

@@ -0,0 +1,64 @@
+require_relative "../test_helper"
+
+class ScreenshotsTest < Test::Unit::TestCase
+  def setup
+    @driver       = mock()
+    @browser      = mock()
+    @output_path  = "output_path"
+
+    @command_executor =
+      BrowserShooter::Commands::Base.new(
+        @driver,
+        @browser,
+        @output_path
+      )
+  end
+
+  def test_shot_with_sufix
+    FileUtils.expects( :mkdir_p ).with( "output_path/shots" )
+    @driver.expects( :save_screenshot ).with( "output_path/shots/sufix.png" )
+
+    @command_executor.shot( "sufix" )
+  end
+
+  def test_shot_without_sufix
+    BrowserShooter::Utils.stubs( :timestamp ).returns( "timestamp" )
+    FileUtils.expects( :mkdir_p ).with( "output_path/shots" )
+    @driver.expects( :save_screenshot ).with( "output_path/shots/timestamp.png" )
+
+    @command_executor.shot
+  end
+
+  def test_shot_system_with_sufix
+    shell_command = "VBoxManage controlvm 'VMName' screenshotpng 'output_path/shots/sufix.png'"
+
+    @browser.stubs( :vm ).returns( "VMName" )
+    FileUtils.expects( :mkdir_p ).with( "output_path/shots" )
+    Kernel.expects( :system ).with( shell_command ).returns( true )
+
+    @command_executor.shot_system( "sufix" )
+  end
+
+  def test_shot_system_without_sufix
+    shell_command = "VBoxManage controlvm 'VMName' screenshotpng 'output_path/shots/timestamp.png'"
+
+    BrowserShooter::Utils.stubs( :timestamp ).returns( "timestamp" )
+    @browser.stubs( :vm ).returns( "VMName" )
+    FileUtils.expects( :mkdir_p ).with( "output_path/shots" )
+    Kernel.expects( :system ).with( shell_command ).returns( true )
+
+    @command_executor.shot_system
+  end
+
+  def test_shot_system_with_error
+    shell_command = "VBoxManage controlvm 'VMName' screenshotpng 'output_path/shots/sufix.png'"
+
+    @browser.stubs( :vm ).returns( "VMName" )
+    FileUtils.expects( :mkdir_p ).with( "output_path/shots" )
+    Kernel.expects( :system ).with( shell_command ).returns( false )
+
+    assert_raise( SystemCallError ) do
+      @command_executor.shot_system( "sufix" )
+    end
+  end
+end

data/test/configurator_test.rb

@@ -2,21 +2,28 @@ require_relative "test_helper"
 
 class ConfiguratorTest < Test::Unit::TestCase
   def test_initialize
-    opts    = { :config_file => "config_file" }
-    config  = { :key1 => "value1" }
+    opts = {
+      :config_file  => "config_file",
+    }
+
+    config = {
+      "key1"         => "value1",
+      "extensions"   => [ "extension1.rb", "extension2.rb" ]
+    }
 
     BrowserShooter::Configurator.expects( :load_config ).with( "config_file" ).returns( config )
     BrowserShooter::Configurator.expects( :build_models ).with( config ).returns( "models" )
     BrowserShooter::Configurator.expects( :filter_suites ).with( "models", opts ).returns( "suites" )
+    BrowserShooter::Configurator.expects( :load_extensions ).with( ["extension1.rb", "extension2.rb"] )
 
     configurator = BrowserShooter::Configurator.new( opts )
 
-    assert_equal( "value1", configurator[:key1] )
+    assert_equal( "value1", configurator["key1"] )
     assert_equal( "suites", configurator.suites )
   end
 
   def test_build_models
-    BrowserShooter::Configurator.stubs( :set_up_output_path )
+    BrowserShooter::Configurator.stubs( :setup_output_path )
     config = BrowserShooter::Configurator.load_config( "#{FIXTURES}/config.yml" )
     models = BrowserShooter::Configurator.build_models( config )
 
@@ -40,7 +47,7 @@ class ConfiguratorTest < Test::Unit::TestCase
   end
 
   def test_filter_suites
-    BrowserShooter::Configurator.stubs( :set_up_output_path )
+    BrowserShooter::Configurator.stubs( :setup_output_path )
     config = BrowserShooter::Configurator.load_config( "#{FIXTURES}/config.yml" )
     models = BrowserShooter::Configurator.build_models( config )
 
@@ -80,4 +87,10 @@ class ConfiguratorTest < Test::Unit::TestCase
     assert_equal( "script-one", config["scripts"]["script-one"] )
     assert_equal( "browser-one", config["browsers"]["browser-one"] )
   end
+
+  def test_load_extensions
+    Kernel.expects( :require ).with( File.expand_path( "extension1.rb" ) )
+    Kernel.expects( :require ).with( File.expand_path( "extension2.rb" ) )
+    BrowserShooter::Configurator.load_extensions( ["extension1.rb", "extension2.rb"] )
+  end
 end

data/test/fixtures/config.yml

@@ -1,4 +1,7 @@
 output_path: "/tmp/output"
+extensions:
+  - "~/browser_shooter/extensions/extension1.rb"
+  - "~/browser_shooter/extensions/extension2.rb"
 
 tests:
   google: |

data/test/fixtures/config_simple.yml

@@ -1,5 +1,4 @@
 output_path: "/output_path"
-logs_format: "csv"
 
 scripts:
   script-one: "script-one"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browser_shooter
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000Z
+date: 2012-03-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70311807614080 !ruby/object:Gem::Requirement
+  requirement: &70207374341860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0.rc.6
   type: :development
   prerelease: false
-  version_requirements: *70311807614080
+  version_requirements: *70207374341860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70311807613580 !ruby/object:Gem::Requirement
+  requirement: &70207374341360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70311807613580
+  version_requirements: *70207374341360
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70311807613200 !ruby/object:Gem::Requirement
+  requirement: &70207374340980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70311807613200
+  version_requirements: *70207374340980
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &70311807612740 !ruby/object:Gem::Requirement
+  requirement: &70207374340520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70311807612740
+  version_requirements: *70207374340520
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &70311807612320 !ruby/object:Gem::Requirement
+  requirement: &70207374340100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70311807612320
+  version_requirements: *70207374340100
 description: Selenium RC wraper to create browser screenshots
 email:
 - fguillen.mail@gmail.com
@@ -85,20 +85,29 @@ files:
 - examples/config0.yml
 - examples/config1.yml
 - examples/config2.yml
+- examples/config3_debug.yml
+- examples/extension0.rb
 - lib/browser_shooter.rb
 - lib/browser_shooter/argv_parser.rb
 - lib/browser_shooter/base.rb
 - lib/browser_shooter/commander.rb
+- lib/browser_shooter/commands/base.rb
+- lib/browser_shooter/commands/basics.rb
+- lib/browser_shooter/commands/debug.rb
+- lib/browser_shooter/commands/screenshots.rb
 - lib/browser_shooter/configurator.rb
 - lib/browser_shooter/log_exporter.rb
 - lib/browser_shooter/logger.rb
 - lib/browser_shooter/models/browser.rb
 - lib/browser_shooter/models/suite.rb
 - lib/browser_shooter/models/test.rb
+- lib/browser_shooter/utils.rb
 - lib/browser_shooter/version.rb
 - test/argv_parser_test.rb
 - test/base_test.rb
 - test/commander_test.rb
+- test/commands/basics_test.rb
+- test/commands/screenshots_test.rb
 - test/configurator_test.rb
 - test/fixtures/config.yml
 - test/fixtures/config_simple.yml
@@ -138,6 +147,8 @@ test_files:
 - test/argv_parser_test.rb
 - test/base_test.rb
 - test/commander_test.rb
+- test/commands/basics_test.rb
+- test/commands/screenshots_test.rb
 - test/configurator_test.rb
 - test/fixtures/config.yml
 - test/fixtures/config_simple.yml