dbrady-tourbus 0.0.6 → 0.0.7

data/lib/runner.rb

@@ -15,43 +15,33 @@ class Runner
     runs,passes,fails,errors = 0,0,0,0
     1.upto(number) do |num|
       log("Starting #{@runner_type} run #{num}/#{number}")
-      begin
-        @tours.each do |tour|
-          runs += 1
-          tour = Tour.make_tour(tour,@host,@tours,@number,@runner_id)
-          tour.tests.each do |test|
+      @tours.each do |tour|
+        runs += 1
+        tour = Tour.make_tour(tour,@host,@tours,@number,@runner_id)
+        tour.tests.each do |test|
+          begin
             tour.run_test test
-          end
-        end
-        passes += 1
-      rescue TourBusException => e
-        log("***********************************")
-        log("********** ERROR IN RUN! **********")
-        log("***********************************")
-        log e.message
-        e.backtrace.each do |trace|
-          log trace
-        end
-        fails += 1
-      rescue WebsickleException => e
-        log("***********************************")
-        log("********** ERROR IN RUN! **********")
-        log("***********************************")
-        log e.message
-        e.backtrace.each do |trace|
-          log trace
-        end
-        fails += 1
-      rescue Exception => e
-        log("***********************************")
-        log("********** ERROR IN RUN! **********")
-        log("***********************************")
-        log e.message
-        e.backtrace.each do |trace|
-          log trace
+          rescue TourBusException, WebsickleException => e
+            log("********** FAILURE IN RUN! **********")
+            log e.message
+            e.backtrace.each do |trace|
+              log trace
+            end
+            fails += 1
+          rescue Exception => e
+            log("*************************************")
+            log("*********** ERROR IN RUN! ***********")
+            log("*************************************")
+            log e.message
+            e.backtrace.each do |trace|
+              log trace
+            end
+            errors += 1
+          end 
+
         end
-        errors += 1
-      end 
+      end
+      passes += 1
       log("Finished #{@runner_type} run #{num}/#{number}")
     end
     log("Finished all #{@runner_type} runs.")

data/lib/web-sickle/lib/web_sickle.rb

@@ -29,7 +29,10 @@ module WebSickle
   def select_form(identifier = {})
     identifier = make_identifier(identifier, [:name, :action, :method])
     @form = find_in_collection(@page.forms, identifier)
-    report_error("Couldn't find form on page at #{@page.uri} with attributes #{identifier.inspect}") if @form.nil?
+    unless @form
+      valid_forms = @page.forms.map {|f| "name: #{f.name}, method: #{f.method}, action: #{f.action}"} * "\n"
+      report_error("Couldn't find form on page at #{@page.uri} with attributes #{identifier.inspect}. Valid forms on this page are: \n#{valid_forms}")
+    end
     @form
   end
   
@@ -98,7 +101,7 @@ module WebSickle
       end
       identifier = make_identifier(identifier, [:name, :value])
       find_in_collection(@form.radiobuttons + @form.fields + @form.checkboxes + @form.file_uploads, identifier) ||
-        report_error("Tried to find field identified by #{identifier.inspect}, but failed.\nForm fields are: #{(@form.radiobuttons + @form.fields + @form.checkboxes + @form.file_uploads).map{|f| f.inspect} * ", \n  "}") 
+        report_error("Tried to find field identified by #{identifier.inspect}, but failed.\nForm fields are: #{(@form.radiobuttons + @form.fields + @form.checkboxes + @form.file_uploads).map{|f| f.name} * ", \n  "}") 
     end
     
     def find_link(identifier)
@@ -115,7 +118,7 @@ module WebSickle
     def find_button(identifier)
       identifier = make_identifier(identifier, [:value, :name])
       find_in_collection(@form.buttons, identifier) ||
-        report_error("Tried to find button identified by #{identifier.inspect}, but failed.  Buttons on selected form are: #{@form.buttons.map{|f| f.inspect} * ','}")
+        report_error("Tried to find button identified by #{identifier.inspect}, but failed.  Buttons on selected form are: #{@form.buttons.map{|f| f.name} * ','}")
     end
   
     # the magic method that powers find_button, find_field.  Does not throw an error if not found

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dbrady-tourbus
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - David Brady
@@ -14,6 +14,7 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mechanize
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: trollop
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: faker
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: