spec_helper.rb in amee-data-persistence-1.2.0

- old
+ new

@@ -4,18 +4,22 @@
 require 'yaml'
 require 'logger'
 gem 'amee-data-abstraction'
 require 'amee-data-abstraction'
 
-RAILS_ROOT = '.'
-
 DB_CONFIG = YAML.load_file(File.dirname(__FILE__) + '/database.yml')
 DB_MIGRATION = File.join(File.dirname(__FILE__), '..','generators','persistence','templates','db','migrate')
 
+class Rails
+  def self.root
+    File.dirname(__FILE__) + '/amee/fixtures'
+  end
+end
+
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'amee-data-persistence'
-require 'amee/data_abstraction/persistence_support'
+require 'amee/data_abstraction/ongoing_calculation_persistence_support'
 
 ActiveRecord::Base.logger = Logger.new(File.open('database.log', 'a'))
 AMEE::DataAbstraction::OngoingCalculation.class_eval { include AMEE::DataAbstraction::PersistenceSupport }
 
 ActiveRecord::Base.establish_connection(DB_CONFIG)
@@ -64,73 +68,5 @@
 
   [ calculation_one, calculation_two, calculation_three ].each do |attr|
     AMEE::Db::Calculation.new { |calc| calc.update_calculation! attr }
   end
 end
-
-def initialize_calculation_set
-  eval "Calculations = AMEE::DataAbstraction::CalculationSet.new {
-      calculation{
-        name 'Electricity'
-        label :electricity
-        path '/business/energy/electricity/grid'
-        drill {
-          label :country
-          path 'country'
-          fixed 'Argentina'
-        }
-        profile {
-          label :usage
-          name 'Electricity Used'
-          path 'energyPerTime'
-        }
-        output {
-          label :co2
-          name 'Carbon Dioxide'
-          path :default
-        }
-      }
-    }"
-end
-
-
-# Stub activerecord for rails tests
-# Taken from http://muness.blogspot.com/2006/12/unit-testing-rails-activerecord-classes.html
-#class ActiveRecordUnitTestHelper
-# attr_accessor :klass
-#
-# def initialize klass
-#   self.klass = klass
-#   self
-# end
-#
-# def where attributes
-#   klass.stubs(:columns).returns(columns(attributes))
-#   instance = klass.new(attributes)
-#   instance.id = attributes[:id] if attributes[:id] #the id attributes works differently on active record classes
-#   instance
-# end
-#
-#protected
-# def columns attributes
-#   attributes.keys.collect{|attribute| column attribute.to_s, attributes[attribute]}
-# end
-#
-# def column column_name, value
-#   ActiveRecord::ConnectionAdapters::Column.new(column_name, nil, ActiveRecordUnitTestHelper.active_record_type(value.class), false)
-# end
-#
-# def self.active_record_type klass
-#   return case klass.name
-#     when "Fixnum"         then "integer"
-#     when "Float"          then "float"
-#     when "Time"           then "time"
-#     when "Date"           then "date"
-#     when "String"         then "string"
-#     when "Object"         then "boolean"
-#   end
-# end
-#end
-#
-#def disconnected klass
-# ActiveRecordUnitTestHelper.new(klass)
-#ßend