gondola 1.1.9 → 1.2.0

data/Gemfile

@@ -7,4 +7,6 @@ group :development do
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
+  gem "vcr", "~> 1.7.1"
+  gem "fakeweb", "~> 1.3.0"
 end

data/Gemfile.lock

@@ -4,6 +4,7 @@ GEM
     childprocess (0.1.7)
       ffi (~> 0.6.3)
     cmdparse (2.0.3)
+    fakeweb (1.3.0)
     ffi (0.6.3)
       rake (>= 0.8.7)
     git (1.2.5)
@@ -38,13 +39,16 @@ GEM
       json_pure
       rubyzip
     shoulda (2.11.3)
+    vcr (1.7.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  fakeweb (~> 1.3.0)
   jeweler (~> 1.5.2)
   parallel (>= 0.5.2)
   sauce (>= 0.17.5)
   shoulda
+  vcr (~> 1.7.1)

data/README.markdown

@@ -71,12 +71,14 @@ The `[tests]` attribute refers to a list of test cases or test suites:
     runner = Gondola::TestRunner.new
     runner.add_test "example.html"
     runner.run({:base_url => "http://www.google.com", :browsers => browsers})
+    results = runner.results
 
 The above code does several things:
 
 * `runner.add_test "example.html"` adds the test case "example.html" to the list of tests that this runner will execute when you tell it to
 * `runner.run(opts={})` runs all the tests that you've added with the options specified. The list of available options is long and a work in progress
   with the rest of the documentation.
+* `runner.results` returns a multidimentional array of hashes which contain detailed reports of how each test performed on each browser
 
 The end result here is that the test case that you have written with Selenium IDE, "example.html", is converted to ruby on the fly and then sent
 to Sauce Labs with two browser settings in parallel.

data/bin/gondola

@@ -58,6 +58,24 @@ class RunCommand < CmdParse::Command
       end
     end
     runner.run(@opts)
+    puts
+    runner.results.each do |r|
+      puts "Sauce Labs ID: #{r[:id]}"
+      puts "Test Name: #{r[:name]}"
+      puts "Browser: #{r[:browser]}"
+      if r[:result] == "OK"
+        puts "Test Passed"
+      else
+        puts "Test Failed - #{r[:result].size} error(s)"
+        r[:result].each_with_index do |e,i|
+          puts "- Error #{i+1}:"
+          puts "    Selenese Command: #{e[:command][:original]}" if e[:command][:original]
+          puts "    Ruby Command: #{e[:command][:ruby]}" if e[:command][:ruby]
+          puts "    #{e[:error]}"
+        end
+      end
+      puts
+    end
   end
 end
 cmd.add_command(RunCommand.new)

data/gondola.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gondola}
-  s.version = "1.1.9"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Perry"]
-  s.date = %q{2011-03-21}
+  s.date = %q{2011-03-24}
   s.default_executable = %q{gondola}
   s.description = %q{
     Gondola is Ruby command line utility and as well as a library  which helps
@@ -31,9 +31,6 @@ Gem::Specification.new do |s|
     "README.markdown",
     "Rakefile",
     "bin/gondola",
-    "examples/config.yml",
-    "examples/gondola_agora_fail.html",
-    "examples/gondola_agora_pass.html",
     "gondola.gemspec",
     "lib/gondola.rb",
     "lib/gondola/converter.rb",
@@ -42,7 +39,17 @@ Gem::Specification.new do |s|
     "lib/gondola/testrunner.rb",
     "lib/gondola/version.rb",
     "test/helper.rb",
-    "test/test_gondola.rb"
+    "test/test_converter.rb",
+    "test/test_fail.rb",
+    "test/test_pass.rb",
+    "test/test_projects/config.yml",
+    "test/test_projects/example1/config.yml",
+    "test/test_projects/example1/gondola_agora_fail.html",
+    "test/test_projects/example1/gondola_agora_pass.html",
+    "test/test_projects/example2/config.yml",
+    "test/test_projects/example2/gondola_agora_fail.rb",
+    "test/test_projects/example2/gondola_agora_pass.rb",
+    "test/test_testrunner.rb"
   ]
   s.homepage = %q{http://github.com/perrym5/gondola}
   s.licenses = ["MIT"]
@@ -51,7 +58,12 @@ Gem::Specification.new do |s|
   s.summary = %q{Ruby command line utility and library for integrating the Selenium IDE more tightly with Sauce Labs' Ondemand services}
   s.test_files = [
     "test/helper.rb",
-    "test/test_gondola.rb"
+    "test/test_converter.rb",
+    "test/test_fail.rb",
+    "test/test_pass.rb",
+    "test/test_projects/example2/gondola_agora_fail.rb",
+    "test/test_projects/example2/gondola_agora_pass.rb",
+    "test/test_testrunner.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -63,12 +75,16 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<vcr>, ["~> 1.7.1"])
+      s.add_development_dependency(%q<fakeweb>, ["~> 1.3.0"])
     else
       s.add_dependency(%q<sauce>, [">= 0.17.5"])
       s.add_dependency(%q<parallel>, [">= 0.5.2"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<vcr>, ["~> 1.7.1"])
+      s.add_dependency(%q<fakeweb>, ["~> 1.3.0"])
     end
   else
     s.add_dependency(%q<sauce>, [">= 0.17.5"])
@@ -76,6 +92,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<vcr>, ["~> 1.7.1"])
+    s.add_dependency(%q<fakeweb>, ["~> 1.3.0"])
   end
 end
 

data/lib/gondola/converter.rb

@@ -5,13 +5,14 @@
 module Gondola
   class Converter
     attr_writer :name
-    attr_reader :file
+    attr_reader :file, :commands
 
     # Constructor that opens a file
     def initialize(filename, sel="@sel")
       File.open(filename, "r") do |f|
         @body = f.read
       end
+      @commands = []
       @s_obj = sel
       @file = filename
       ruby()
@@ -19,7 +20,7 @@ module Gondola
 
     def name
       unless @name
-        @name = @file
+        @name = File.basename(@file, ".rb")
       end
       @name
     end
@@ -31,8 +32,11 @@ module Gondola
       unless @ruby
         @ruby = ""
         enum = @body.lines
-        enum = enum.map { |l| l + "cmd_inc\n" }
-        enum.each { |l| @ruby << l }
+        enum.each do |l|
+          @commands.push({ :ruby => l })
+          l = l + "cmd_inc\n"
+          @ruby << l
+        end
       end  
       @ruby
     end

data/lib/gondola/html_converter.rb

@@ -42,9 +42,16 @@ module Gondola
             elsif cmd[2] != ""
               cmd[2] = cmd[2].inspect
             end
-            # Append commands to a result string
+
+            # Append commands to a result string and to
+            # the internal list of commands
             args = [ cmd[1], cmd[2] ]
-            @ruby << html_to_ruby(cmd[0], args)
+            selenese = "#{cmd[0]}(#{cmd[1]}"
+            selenese = selenese + ", #{cmd[2]}" if cmd[2] != ""
+            selenese = selenese + ")"
+            ruby = html_to_ruby(cmd[0], args)
+            @commands.push({ :original => selenese, :ruby => ruby })
+            @ruby << ruby
             @ruby << "\ncmd_inc\n"
           end
         end         

data/lib/gondola/tester.rb

@@ -5,27 +5,34 @@
 
 module Gondola
   class Tester
-    attr_reader :cmd_num, :sel, :converter, :job_id
+    attr_reader :cmd_num, :errors, :job_id
+    attr_accessor :sel
 
     def initialize(sel, converter)
       @sel = sel
       @converter = converter
-      @cmd_num = 1
+      @cmd_num = 0
+      @errors = []
     end
 
     def begin
-      @sel.start()
-      @job_id = @sel.session_id
       begin
+        @sel.start()
+        @job_id = @sel.session_id
         eval(@converter.ruby)
-      rescue => e
-        $stderr.puts e.message + " - stopping test."
-      rescue Selenium::Client::CommandError
+      rescue RuntimeError => e
+        $stderr.puts e.message
       ensure
-        @sel.stop()
+        begin
+          @sel.stop()
+        rescue Selenium::Client::CommandError => e
+          $stderr.puts e.message + "(Most likely, the test was closed on Sauce Labs' end)"
+        end
       end
     end
 
+    private
+
     def cmd_inc
       @cmd_num+=1
     end
@@ -37,26 +44,27 @@ module Gondola
     end
 
     def assert_not(expr)
-      unless verifyNot(expr)
+      unless verify_not(expr)
         raise "Assertion Failed"
       end
     end
 
     def assert_equal(eq, expr)
-      unless verify(eq, expr)
+      unless verify_equal(eq, expr)
         raise "Assertion Failed"
       end
     end
 
     def assert_not_equal(eq, expr)
-      unless verifyNot(eq, expr)
+      unless verify_not_equal(eq, expr)
         raise "Assertion Failed"
       end
     end
 
     def verify(expr)
       unless expr
-        $stderr.puts "Command #{@cmd_num} returned false, expecting true"
+        @errors.push({ :command => @converter.commands[@cmd_num],
+                       :error => "returned false, expecting true" })
         return false
       end
       return true
@@ -64,7 +72,8 @@ module Gondola
 
     def verify_not(expr)
       if expr
-        $stderr.puts "Command #{@cmd_num} returned true, expecting false"
+        @errors.push({ :command => @converter.commands[@cmd_num],
+                       :error => "returned true, expecting false" })
         return false
       end
       return true
@@ -72,7 +81,8 @@ module Gondola
 
     def verify_equal(eq, expr)
       unless eq == expr
-        @stderr.puts "Command #{@cmd_num} returned '#{expr}', expecting '#{eq}'"
+        @errors.push({ :command => @converter.commands[@cmd_num],
+                       :error => "returned '#{expr}', expecting '#{eq}'" })
         return false
       end
       return true
@@ -80,7 +90,8 @@ module Gondola
 
     def verify_not_equal(eq, expr)
       if eq == expr
-        @stderr.puts "Command #{@cmd_num} returned '#{expr}', expecting '#{eq}'"
+        @errors.push({ :command => @converter.commands[@cmd_num],
+                       :error => "returned '#{expr}', expecting anything but" })
         return false
       end
       return true

data/lib/gondola/testrunner.rb

@@ -4,10 +4,11 @@
 
 module Gondola
   class TestRunner
-    attr_reader :tests
+    attr_reader :tests, :results
 
     def initialize
       @tests = []
+      @results = []
     end
 
     # Function to add a test to the member array of
@@ -83,11 +84,11 @@ module Gondola
 
     # Function to read any config files which contain data for this
     # test case or suite
-    def config_from_file(file, api=true, data=true)
+    def config_from_file(file, api=true)
       # If the given test is just a file then start your search in
       # its parent directory
       unless File.directory? file
-        return config_from_file(File.dirname(file))
+        return config_from_file(File.expand_path(File.dirname(file)))
       end
       # Load any config files in the current directory only if
       # a config hasn't already been found
@@ -99,17 +100,15 @@ module Gondola
             api = false
           end
         end
-        if data
-          if File.exists? "config.yml"
-            conf.merge! YAML.load_file("config.yml")
-            data = false
-          end
+        if File.exists? "config.yml"
+          conf.merge! YAML.load_file("config.yml")
+          data = false
         end
       end
       # Recurse through the parent directories and merge the
       # current configuration
       unless file == File.dirname(file)
-        return config_from_file(File.dirname(file), api, data).merge(conf)
+        return config_from_file(File.expand_path(File.dirname(file)), api).merge(conf)
       end
       return conf
     end
@@ -125,11 +124,17 @@ module Gondola
         # Begin test using a tester object
         tester = Gondola::Tester.new(selenium, converter)
         browser_string = "#{request[:os]} #{request[:browser]} #{request[:browser_version]}"
-        puts "Starting test case \"#{converter.name}\" with: #{browser_string}"
+        puts "Starting test \"#{converter.name}\" with #{browser_string}"
         tester.begin
-        puts "#{converter.name} finished - Sauce Job ID: #{tester.job_id}"
+        puts "Test \"#{converter.name}\" on #{browser_string} finished with #{tester.errors.size} error(s)"
+        result = { :name => converter.name, :browser => browser_string, :id => tester.job_id }
+        if tester.errors.empty?
+          result[:result] = "OK"
+        else
+          result[:result] = tester.errors
+        end
+        @results.push(result)
       end
-      puts
     end
   end
 end

data/lib/gondola/version.rb

@@ -1,3 +1,3 @@
 module Gondola
-    VERSION = "1.1.9"
+    VERSION = "1.2.0"
 end

data/test/test_converter.rb

@@ -0,0 +1,107 @@
+require 'helper'
+
+class TestConverter < Test::Unit::TestCase
+  context "A Ruby Converter" do
+    setup do
+      @converter = Gondola::Converter.new("test/test_projects/example2/gondola_agora_pass.rb")  
+    end
+
+    should "properly convert a ruby file to a gondola ruby file" do
+      expected = %q{ @sel.open "/"
+        cmd_inc
+        @sel.wait_for_page_to_load "30000"
+        cmd_inc
+        @sel.type "q", "agora games"
+        cmd_inc
+        @sel.click "btnG"
+        cmd_inc
+        @sel.click "link=Careers"
+        cmd_inc
+        @sel.wait_for_page_to_load "30000"
+        cmd_inc
+        verify_equal "Agora Games", @sel.get_title
+        cmd_inc
+        verify @sel.is_text_present("At Agora")
+        cmd_inc
+        assert @sel.is_text_present("Platform Engineer")
+        cmd_inc
+        @sel.click "link=Application Engineer"
+        cmd_inc
+        assert @sel.is_text_present("Application Engineer")
+        cmd_inc
+        @sel.click "link=Producer"
+        cmd_inc
+        assert @sel.is_text_present("Producer")
+        cmd_inc
+        @sel.click "link=work at Agora."
+        cmd_inc
+        @sel.wait_for_page_to_load "30000"
+        cmd_inc
+        @sel.click "link=Fun at Agora"
+        cmd_inc
+        @sel.click "link=Hack-a-thon"
+        cmd_inc
+        @sel.click "link=Our Town"
+        cmd_inc
+        @sel.click "link=Communication at Agora"
+        cmd_inc
+      }.lines.map { |l| l.strip! }.join("\n")
+      assert_equal expected, @converter.ruby
+    end
+
+    should "properly extract the name of the test from the given file" do
+      assert_equal "gondola_agora_pass", @converter.name
+    end
+  end
+
+  context "An HTML Converter" do
+    setup do
+      @converter = Gondola::HtmlConverter.new("test/test_projects/example1/gondola_agora_pass.html")
+    end
+
+    should "properly convert a selenese HTML file to a gondola ruby file" do
+      expected = %q{ @sel.open "/"
+        cmd_inc
+        @sel.wait_for_page_to_load "30000"
+        cmd_inc
+        @sel.type "q", "agora games"
+        cmd_inc
+        @sel.click "btnG"
+        cmd_inc
+        @sel.click "link=Careers"
+        @sel.wait_for_page_to_load "30000"
+        cmd_inc
+        verify_equal "Agora Games", @sel.get_title
+        cmd_inc
+        verify @sel.is_text_present("At Agora")
+        cmd_inc
+        assert @sel.is_text_present("Platform Engineer")
+        cmd_inc
+        @sel.click "link=Application Engineer"
+        cmd_inc
+        assert @sel.is_text_present("Application Engineer")
+        cmd_inc
+        @sel.click "link=Producer"
+        cmd_inc
+        assert @sel.is_text_present("Producer")
+        cmd_inc
+        @sel.click "link=work at Agora."
+        @sel.wait_for_page_to_load "30000"
+        cmd_inc
+        @sel.click "link=Fun at Agora"
+        cmd_inc
+        @sel.click "link=Hack-a-thon"
+        cmd_inc
+        @sel.click "link=Our Town"
+        cmd_inc
+        @sel.click "link=Communication at Agora"
+        cmd_inc
+      }.lines.map { |l| l.strip! }.join("\n")
+      assert_equal expected, @converter.ruby
+    end
+
+    should "properly extract the name of the test from the given file" do
+      assert_equal "gondola_agora_pass", @converter.name
+    end
+  end
+end

data/test/test_fail.rb

@@ -0,0 +1,60 @@
+require 'helper'
+require 'vcr'
+
+VCR.config do |c|
+  c.cassette_library_dir = "test/fixtures/vcr_cassettes"
+  c.stub_with :fakeweb
+end
+
+class TestFail < Test::Unit::TestCase
+  context "A Ruby Failing Test" do
+    setup do
+      @runner = Gondola::TestRunner.new
+      @runner.add_test "test/test_projects/example2/gondola_agora_fail.rb"
+    end
+
+    should "result in a failing test" do
+      VCR.use_cassette('failing_test1', :record => :new_episodes) do
+        @runner.run({ :browsers => [{:os => "Windows 2003", :browser => "firefox", :browser_version => "3.6"}] })
+        expected = {
+          :name=>"gondola_agora_fail", 
+          :browser=>"Windows 2003 firefox 3.6", 
+          :id=>"e3faafda8d5b76e3cb1ca4c58a708f97", 
+          :result=>[{
+            :command=>{
+              :ruby=>"assert @sel.is_text_present(\"Producer FAIL\")\n"
+            }, 
+            :error=>"returned false, expecting true"
+        }]}
+        assert @runner.results.size == 1
+        assert_equal expected, @runner.results[0]
+      end
+    end
+  end
+
+  context "An HTML Failing Test" do
+    setup do
+      @runner = Gondola::TestRunner.new
+      @runner.add_test "test/test_projects/example1/gondola_agora_fail.html"
+    end
+
+    should "result in a failing test" do
+      VCR.use_cassette('failing_test2', :record => :new_episodes) do
+        @runner.run({ :browsers => [{:os => "Windows 2003", :browser => "firefox", :browser_version => "3.6"}] })
+        expected = {
+          :name=>"gondola_agora_fail", 
+          :browser=>"Windows 2003 firefox 3.6", 
+          :id=>"e3faafda8d5b76e3cb1ca4c58a7152d9", 
+          :result=>[{
+            :command=>{
+              :original=>"assertTextPresent(\"Producer FAIL\")", 
+              :ruby=>"assert @sel.is_text_present(\"Producer FAIL\")"
+            }, 
+            :error=>"returned false, expecting true"
+        }]}
+        assert @runner.results.size == 1
+        assert_equal expected, @runner.results[0]
+      end
+    end
+  end
+end

data/test/test_pass.rb

@@ -0,0 +1,39 @@
+require 'helper'
+require 'vcr'
+
+VCR.config do |c|
+  c.cassette_library_dir = "test/fixtures/vcr_cassettes"
+  c.stub_with :fakeweb
+end
+
+class TestPass < Test::Unit::TestCase
+  context "A Ruby Failing Test" do
+    setup do
+      @runner = Gondola::TestRunner.new
+      @runner.add_test "test/test_projects/example2/gondola_agora_pass.rb"
+    end
+
+    should "result in a passing test" do
+      VCR.use_cassette('passing_test1', :record => :new_episodes) do
+        @runner.run({ :browsers => [{:os => "Windows 2003", :browser => "firefox", :browser_version => "3.6"}] })
+        assert @runner.results.size == 1
+        assert_equal "OK", @runner.results[0][:result]
+      end
+    end
+  end
+
+  context "An HTML Failing Test" do
+    setup do
+      @runner = Gondola::TestRunner.new
+      @runner.add_test "test/test_projects/example1/gondola_agora_pass.html"
+    end
+
+    should "result in a passing test" do
+      VCR.use_cassette('passing_test2', :record => :new_episodes) do
+        @runner.run({ :browsers => [{:os => "Windows 2003", :browser => "firefox", :browser_version => "3.6"}] })
+        assert @runner.results.size == 1
+        assert_equal "OK", @runner.results[0][:result]
+      end
+    end
+  end
+end

data/test/test_projects/config.yml

@@ -0,0 +1,9 @@
+:browsers:
+  -
+    :os: "Windows 2003"
+    :browser: "firefox"
+    :browser_version: "3.6"
+  -
+    :os: "Windows 2003"
+    :browser: "iexplore"
+    :browser_version: "8"

data/{examples → test/test_projects/example1}/gondola_agora_fail.html

@@ -16,6 +16,11 @@
 	<td>/</td>
 	<td></td>
 </tr>
+<tr>
+    <td>waitForPageToLoad</td>
+    <td></td>
+    <td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>q</td>

data/{examples → test/test_projects/example1}/gondola_agora_pass.html

@@ -16,6 +16,11 @@
 	<td>/</td>
 	<td></td>
 </tr>
+<tr>
+    <td>waitForPageToLoad</td>
+    <td></td>
+    <td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>q</td>

data/test/test_projects/example2/config.yml

@@ -0,0 +1,2 @@
+:project_name: "Test Project"
+:base_url: "http://www.google.com"

data/test/test_projects/example2/gondola_agora_fail.rb

@@ -0,0 +1,19 @@
+@sel.open "/"
+@sel.wait_for_page_to_load "30000"
+@sel.type "q", "agora games"
+@sel.click "btnG"
+@sel.click "link=Careers"
+@sel.wait_for_page_to_load "30000"
+verify_equal "Agora Games", @sel.get_title
+verify @sel.is_text_present("At Agora")
+assert @sel.is_text_present("Platform Engineer")
+@sel.click "link=Application Engineer"
+assert @sel.is_text_present("Application Engineer")
+@sel.click "link=Producer"
+assert @sel.is_text_present("Producer FAIL")
+@sel.click "link=work at Agora."
+@sel.wait_for_page_to_load "30000"
+@sel.click "link=Fun at Agora"
+@sel.click "link=Hack-a-thon"
+@sel.click "link=Our Town"
+@sel.click "link=Communication at Agora"

data/test/test_projects/example2/gondola_agora_pass.rb

@@ -0,0 +1,19 @@
+@sel.open "/"
+@sel.wait_for_page_to_load "30000"
+@sel.type "q", "agora games"
+@sel.click "btnG"
+@sel.click "link=Careers"
+@sel.wait_for_page_to_load "30000"
+verify_equal "Agora Games", @sel.get_title
+verify @sel.is_text_present("At Agora")
+assert @sel.is_text_present("Platform Engineer")
+@sel.click "link=Application Engineer"
+assert @sel.is_text_present("Application Engineer")
+@sel.click "link=Producer"
+assert @sel.is_text_present("Producer")
+@sel.click "link=work at Agora."
+@sel.wait_for_page_to_load "30000"
+@sel.click "link=Fun at Agora"
+@sel.click "link=Hack-a-thon"
+@sel.click "link=Our Town"
+@sel.click "link=Communication at Agora"

data/test/test_testrunner.rb

@@ -0,0 +1,68 @@
+require 'helper'
+
+class MockTestRunner < Gondola::TestRunner
+  attr_accessor :files_ran
+
+  def initialize
+    super
+    @files_ran = []
+  end
+
+  def run_test(converter, global, browser)
+    @files_ran.push converter.file
+    return [converter, global, browser]
+  end
+end
+
+class TestRunner < Test::Unit::TestCase
+  context "Recursive projects" do
+    setup do
+      @runner = MockTestRunner.new
+      @runner.add_test "test/test_projects/"
+      @runner.run :recursive => true
+    end
+
+    should "run all of the relevant files" do
+      expected = []
+      Dir.chdir("test/test_projects/") do
+        expected = Dir.glob("**/*.html")
+        expected.concat(Dir.glob("**/*.rb"))
+      end
+      assert_equal expected, @runner.files_ran
+    end
+  end
+
+  context "Configs" do
+    setup do
+      @runner = MockTestRunner.new
+      @runner.add_test "test/test_projects/"
+    end
+
+    should "extract data from config files and merge correctly" do
+      file_conf = @runner.send :config_from_file, "test/test_projects/example1/gondola_agora_pass.html"
+      expected = {
+        :browsers=>[
+          {:os=>"Windows 2003", :browser=>"firefox", :browser_version=>"3.6"}, 
+          {:os=>"Windows 2003", :browser=>"iexplore", :browser_version=>"8"}
+        ], 
+        :project_name=>"Test Project", 
+        :base_url=>"http://www.google.com"
+      }
+      assert_equal expected, file_conf      
+
+      file_conf = @runner.send :config_from_file, "test/test_projects/example2/gondola_agora_fail.html"
+      assert_equal expected, file_conf      
+    end
+
+    should "aggregate data correctly from files, options and globally" do
+      c,g,b = @runner.send :aggregate_data, "test/test_projects/example1/gondola_agora_pass.html", {}
+      expected_g = {:job_name=>"Test Project - gondola_agora_pass", :browser_url=>"http://www.google.com"}
+      expected_b = [
+        {:os=>"Windows 2003", :browser=>"firefox", :browser_version=>"3.6"},
+        {:os=>"Windows 2003", :browser=>"iexplore", :browser_version=>"8"}
+      ]
+      assert_equal expected_g, g
+      assert_equal expected_b, b
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: gondola
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors: 
 - Matthew Perry
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -04:00
+date: 2011-03-24 00:00:00 -04:00
 default_executable: gondola
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,6 +68,28 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: vcr
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.7.1
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *id007
 description: "\n    Gondola is Ruby command line utility and as well as a library  which helps\n    for integrate the Selenium IDE more tightly with Sauce Labs' Ondemand services and\n    provide greater ease for those who would like to use both tools but do not have\n    enough technical knowledge\n  "
 email: mperry@agoragames.com
 executables: 
@@ -85,9 +107,6 @@ files:
 - README.markdown
 - Rakefile
 - bin/gondola
-- examples/config.yml
-- examples/gondola_agora_fail.html
-- examples/gondola_agora_pass.html
 - gondola.gemspec
 - lib/gondola.rb
 - lib/gondola/converter.rb
@@ -96,7 +115,17 @@ files:
 - lib/gondola/testrunner.rb
 - lib/gondola/version.rb
 - test/helper.rb
-- test/test_gondola.rb
+- test/test_converter.rb
+- test/test_fail.rb
+- test/test_pass.rb
+- test/test_projects/config.yml
+- test/test_projects/example1/config.yml
+- test/test_projects/example1/gondola_agora_fail.html
+- test/test_projects/example1/gondola_agora_pass.html
+- test/test_projects/example2/config.yml
+- test/test_projects/example2/gondola_agora_fail.rb
+- test/test_projects/example2/gondola_agora_pass.rb
+- test/test_testrunner.rb
 has_rdoc: true
 homepage: http://github.com/perrym5/gondola
 licenses: 
@@ -111,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 635731009
+      hash: 131885875
       segments: 
       - 0
       version: "0"
@@ -130,4 +159,9 @@ specification_version: 3
 summary: Ruby command line utility and library for integrating the Selenium IDE more tightly with Sauce Labs' Ondemand services
 test_files: 
 - test/helper.rb
-- test/test_gondola.rb
+- test/test_converter.rb
+- test/test_fail.rb
+- test/test_pass.rb
+- test/test_projects/example2/gondola_agora_fail.rb
+- test/test_projects/example2/gondola_agora_pass.rb
+- test/test_testrunner.rb

data/test/test_gondola.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestGondola < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end