browser_shooter 0.3.11 → 0.3.13

data/README.md

@@ -154,6 +154,29 @@ Then you will be able to use this new command into the _test section_ like this:
 
 You can check the [custom extensions](https://github.com/fguillen/BrowserShooter/tree/master/lib/browser_shooter/commands) that are already integrated in BrowserShooter.
 
+###### External test files
+
+Instead of defining all the tests in this file you can create a folder and create **a File for each Tests**.
+
+These files have to have the **_.test_ extension**.
+
+Then you use the _tests_ key on the _config.yml_ file to indicate the **path to the external test files folder**.
+
+For example, if you have this file tree:
+
+    /config.yml
+    /external_tests/test1.test
+    /external_tests/test2.test
+
+Then you have to use this configuration:
+
+    tests: "./external_tests"
+
+The path is **relative to the _config.yml_ file path**.
+
+The name of the Test will be **the name of the File**. Use it in your _suite_ definition.
+
+Check the [config with external test](https://github.com/fguillen/BrowserShooter/blob/master/examples/config_with_external_tests.yml) example.
 
 ##### Browsers section
 

data/examples/config_with_external_tests.yml

@@ -0,0 +1,24 @@
+output_path: "~/browser_shoots"
+timeout: 5
+
+tests: "./external_tests"
+
+browsers:
+  ios-firefox:
+    url: "http://127.0.0.1:4444/wd/hub"
+    type: "firefox"
+    vm: "myVM"
+
+  ios-chrome:
+    url: "http://127.0.0.1:4444/wd/hub"
+    type: "chrome"
+    vm: "myVM"
+
+suites:
+  suite1:
+    tests:
+      - google
+      - miniclip
+    browsers:
+      - ios-firefox
+      - ios-chrome

data/examples/external_tests/google.test

@@ -0,0 +1,5 @@
+navigate.to "http://www.google.de"
+shot "before"
+type "input[name='q']", "beautiful houses"
+pause 3
+shot "after"

data/examples/external_tests/miniclip.test

@@ -0,0 +1,2 @@
+navigate.to "http://www.miniclip.com/games/de/"
+shot

data/lib/browser_shooter/configurator.rb

@@ -25,11 +25,37 @@ module BrowserShooter
 
       config.merge! YAML.load_file( config_file_path )
 
-      config["output_path"] = setup_output_path( config["output_path"] )
+      config["output_path"]       = setup_output_path( config["output_path"] )
+      config["config_root_path"]  = File.dirname( config_file_path )
+
+      # _tests_ key is a folder path for external test files
+      if( config["tests"].is_a?( String ) )
+        config["tests"] = BrowserShooter::Configurator.load_external_tests( config )
+      end
 
       config
     end
 
+    # If the _tests_ key in the _config.yml_ is an string
+    # we load of the files in this path as _tests_ and add
+    # them to the original config.
+    def self.load_external_tests( config )
+      tests_path = File.join( config["config_root_path"], config["tests"] )
+
+      BrowserShooter::Logger.log( "Loading external tests: #{tests_path}" )
+
+      raise ArgumentError, "External tests dir path doesn't exist: 'tests_path'" if !File.exists?( tests_path )
+
+      tests = {}
+
+      Dir.glob( "#{tests_path}/*.test" ).each do |test_path|
+        test_name = File.basename( test_path, ".test" )
+        tests[ test_name ] = File.read( test_path )
+      end
+
+      return tests
+    end
+
     # Creates the _tests_, _browsers_ and _suites_ arrays.
     def self.build_models( config )
       tests =

data/lib/browser_shooter/version.rb

@@ -1,3 +1,3 @@
 module BrowserShooter
-  VERSION = "0.3.11"
+  VERSION = "0.3.13"
 end

data/test/configurator_test.rb

@@ -46,6 +46,45 @@ class ConfiguratorTest < Test::Unit::TestCase
     assert_equal( models[:browsers].first, models[:suites].first.browsers.first )
   end
 
+  def test_build_models_from_external_tests
+    BrowserShooter::Configurator.stubs( :setup_output_path )
+    config = BrowserShooter::Configurator.load_config( "#{FIXTURES}/config_with_external_tests.yml" )
+    models = BrowserShooter::Configurator.build_models( config )
+
+    assert_equal( 2, models[:tests].size )
+    assert_equal( "google", models[:tests].first.name )
+    assert_equal( 2, models[:tests].first.commands.size )
+    assert_equal( "google command1", models[:tests].first.commands.first )
+  end
+
+  def test_load_external_tests
+    BrowserShooter::Configurator.stubs( :setup_output_path )
+    config = {
+      "tests"             => "./external_tests",
+      "config_root_path"  => "#{File.dirname(__FILE__)}/fixtures/"
+    }
+
+    tests = BrowserShooter::Configurator.load_external_tests( config )
+
+    assert_equal( 2, tests.size )
+    assert_equal( "google", tests.keys.first )
+    assert_equal( "google command1\ngoogle command2", tests.values.first )
+    assert_equal( "miniclip", tests.keys.last )
+    assert_equal( "miniclip command1\nminiclip command2", tests.values.last )
+  end
+
+  def test_load_external_tests_error_if_path_doesnot_exist
+    BrowserShooter::Configurator.stubs( :setup_output_path )
+    config = {
+      "tests"             => "./no/exists",
+      "config_root_path"  => "#{File.dirname(__FILE__)}/fixtures/"
+    }
+
+    assert_raise( ArgumentError ) do
+      BrowserShooter::Configurator.load_external_tests( config )
+    end
+  end
+
   def test_filter_suites
     BrowserShooter::Configurator.stubs( :setup_output_path )
     config = BrowserShooter::Configurator.load_config( "#{FIXTURES}/config.yml" )

data/test/fixtures/config_with_external_tests.yml

@@ -0,0 +1,14 @@
+tests: "./external_tests"
+
+browsers:
+  windows-firefox:
+    url: "http://10.211.55.4:4444/wd/hub"
+    type: "firefox"
+
+suites:
+  suite1:
+    tests:
+     - google
+     - miniclip
+    browsers:
+     - windows-firefox

data/test/fixtures/external_tests/google.test

@@ -0,0 +1,2 @@
+google command1
+google command2

data/test/fixtures/external_tests/miniclip.test

@@ -0,0 +1,2 @@
+miniclip command1
+miniclip command2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browser_shooter
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000Z
+date: 2012-04-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70295546959160 !ruby/object:Gem::Requirement
+  requirement: &70244954707340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0.rc.6
   type: :development
   prerelease: false
-  version_requirements: *70295546959160
+  version_requirements: *70244954707340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70295546958660 !ruby/object:Gem::Requirement
+  requirement: &70244954706840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70295546958660
+  version_requirements: *70244954706840
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70295546958280 !ruby/object:Gem::Requirement
+  requirement: &70244954706460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295546958280
+  version_requirements: *70244954706460
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &70295546957820 !ruby/object:Gem::Requirement
+  requirement: &70244954706000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295546957820
+  version_requirements: *70244954706000
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &70295546957400 !ruby/object:Gem::Requirement
+  requirement: &70244954705580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295546957400
+  version_requirements: *70244954705580
 description: Selenium RC wraper to create browser screenshots
 email:
 - fguillen.mail@gmail.com
@@ -86,7 +86,10 @@ files:
 - examples/config1.yml
 - examples/config2.yml
 - examples/config3_debug.yml
+- examples/config_with_external_tests.yml
 - examples/extension0.rb
+- examples/external_tests/google.test
+- examples/external_tests/miniclip.test
 - lib/browser_shooter.rb
 - lib/browser_shooter/argv_parser.rb
 - lib/browser_shooter/base.rb
@@ -113,6 +116,9 @@ files:
 - test/fixtures/config_empty.yml
 - test/fixtures/config_in_order.yml
 - test/fixtures/config_simple.yml
+- test/fixtures/config_with_external_tests.yml
+- test/fixtures/external_tests/google.test
+- test/fixtures/external_tests/miniclip.test
 - test/fixtures/logs/log.csv
 - test/fixtures/screenshot.base64
 - test/log_exporter_test.rb
@@ -156,6 +162,9 @@ test_files:
 - test/fixtures/config_empty.yml
 - test/fixtures/config_in_order.yml
 - test/fixtures/config_simple.yml
+- test/fixtures/config_with_external_tests.yml
+- test/fixtures/external_tests/google.test
+- test/fixtures/external_tests/miniclip.test
 - test/fixtures/logs/log.csv
 - test/fixtures/screenshot.base64
 - test/log_exporter_test.rb