overcome merge conflict

benchmarks/rails/README_HOW_TO_RUN_THE_RAILS_TESTS

@@ -0,0 +1,17 @@
+To run these, you'll need:
+
+Linux MRI, rubinius:
+ sqlite3-ruby gem install
+
+jruby:
+ none required
+
+mingw MRI on windows:
+ none required
+
+Note that you might have to install rake, and the builder gem, though it seems VM dependent somehow, and typically they're installed by default for your VM.
+
+To check if they're working, do a verbose run, like
+$ rake bench:file FILE=benchmarks/rails/bm_substruct_test_all.rb ITERATIONS=1 VERBOSE=1  
+
+To make sure they're working well.

benchmarks/rails/bm_substruct_test_all.rb

@@ -2,7 +2,7 @@
 ENV['RAILS_ENV'] = 'test' # use this database
 
 DROP_DB_EACH_TIME = true
-require 'substruct_start_and_bootstrap_if_necessary.rb'
+require './substruct_start_and_bootstrap_if_necessary.rb'
 
 start = Time.now
 begin

benchmarks/rails/substruct/config/boot.rb

@@ -2,7 +2,7 @@
 # Configure your app in config/environment.rb and config/environments/*.rb
 
 RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-
+$: << '.'
 require RAILS_ROOT + '/lib/os-0.7.2/lib/os'
 
 if OS.windows? && !OS.iron_ruby?

benchmarks/rails/substruct/test.bat

@@ -1 +1,2 @@
-rake test:plugins:all PLUGIN=substruct
+echo may need to preceded with RAILS_ENV=test db:create substruct:db:bootstrap 
+rake test:plugins:all PLUGIN=substruct

benchmarks/rails/substruct/vendor/plugins/substruct/app/models/order.rb

@@ -453,13 +453,13 @@ def total
     logger.info "LINE ITEMS TOTAL: #{self.line_items_total}"
     logger.info "SHIPPING COST: #{self.shipping_cost}"
     logger.info "TAX COST: #{self.tax_cost}"
-    self.line_items_total + self.shipping_cost + self.tax_cost
+    self.line_items_total + self.shipping_cost.to_f + self.tax_cost.to_f
   end
 
   # The tax of items if applied.
   #
   def tax_cost
-    (self.line_items_total) * (self.tax/100)
+    (self.line_items_total) * (self.tax.to_f/100)
   end
 
   def name

benchmarks/rails/substruct/vendor/plugins/substruct/app/models/order_line_item.rb

@@ -17,7 +17,7 @@ def self.for_product(item)
   end
 
   def total
-    self.quantity * self.unit_price
+    self.quantity * self.unit_price.to_i
   end
 
   # We still have view code referencing product_id

benchmarks/rails/substruct/vendor/plugins/substruct/test/functional/accounts_controller_test.rb

@@ -1,3 +1,4 @@
+$: << '.'
 require File.dirname(__FILE__) + '/../test_helper'
 
 class AccountsControllerTest < ActionController::TestCase

benchmarks/rails/substruct/vendor/plugins/substruct/test/functional/admin/base_controller_test.rb

@@ -1,3 +1,4 @@
+$: << '.'
 require File.dirname(__FILE__) + '/../../test_helper'
 
 class Admin::BaseControllerTest < ActionController::TestCase

benchmarks/rails/substruct/vendor/plugins/substruct/test/functional/admin/content_nodes_controller_test.rb

@@ -1,3 +1,4 @@
+$: << '.'
 require File.dirname(__FILE__) + '/../../test_helper'
 
 class Admin::ContentNodesControllerTest < ActionController::TestCase

benchmarks/rails/substruct/vendor/plugins/substruct/test/functional/admin/files_controller_test.rb

@@ -1,3 +1,4 @@
+$: << '.'
 require File.dirname(__FILE__) + '/../../test_helper'
 
 class Admin::FilesControllerTest < ActionController::TestCase

benchmarks/rails/substruct/vendor/plugins/substruct/test/functional/admin/general_controller_test.rb

@@ -1,3 +1,4 @@
+$: << '.'
 require File.dirname(__FILE__) + '/../../test_helper'
 
 class Admin::GeneralControllerTest < ActionController::TestCase

benchmarks/rails/substruct/vendor/plugins/substruct/test/functional/admin/orders_controller_test.rb

@@ -1,3 +1,4 @@
+$: << '.'
 require File.dirname(__FILE__) + '/../../test_helper'
 
 class Admin::OrdersControllerTest < ActionController::TestCase