diff --git a/test/test_helper.rb b/test/test_helper.rb index 156add2..2289f87 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,47 +2,62 @@ require "bundler/setup" Bundler.require(:default) require "minitest/autorun" require "minitest/pride" -require "active_record" ENV["RACK_ENV"] = "test" -# for debugging -# ActiveRecord::Base.logger = Logger.new(STDOUT) - -# rails does this in activerecord/lib/active_record/railtie.rb -ActiveRecord::Base.default_timezone = :utc -ActiveRecord::Base.time_zone_aware_attributes = true - -# migrations -ActiveRecord::Base.establish_connection :adapter => "postgresql", :database => "searchkick_test" - -ActiveRecord::Migration.create_table :products, :force => true do |t| - t.string :name - t.integer :store_id - t.boolean :in_stock - t.boolean :backordered - t.integer :orders_count - t.string :color - t.timestamps -end - -ActiveRecord::Migration.create_table :store, :force => true do |t| -end - File.delete("elasticsearch.log") if File.exists?("elasticsearch.log") Tire.configure do logger "elasticsearch.log", :level => "debug" pretty true end -# Mongoid.configure do |config| -# config.connect_to "searchkick_test" -# end +if ENV["MONGOID"] + Mongoid.configure do |config| + config.connect_to "searchkick_test" + end -class Product < ActiveRecord::Base - # include Mongoid::Document - # include Mongoid::Attributes::Dynamic + class Product + include Mongoid::Document + # include Mongoid::Attributes::Dynamic + end + class Store + include Mongoid::Document + end +else + require "active_record" + + # for debugging + # ActiveRecord::Base.logger = Logger.new(STDOUT) + + # rails does this in activerecord/lib/active_record/railtie.rb + ActiveRecord::Base.default_timezone = :utc + ActiveRecord::Base.time_zone_aware_attributes = true + + # migrations + ActiveRecord::Base.establish_connection :adapter => "postgresql", :database => "searchkick_test" + + ActiveRecord::Migration.create_table :products, :force => true do |t| + t.string :name + t.integer :store_id + t.boolean :in_stock + t.boolean :backordered + t.integer :orders_count + t.string :color + t.timestamps + end + + ActiveRecord::Migration.create_table :store, :force => true do |t| + end + + class Product < ActiveRecord::Base + end + + class Store < ActiveRecord::Base + end +end + +class Product belongs_to :store searchkick \ @@ -70,10 +85,6 @@ class Product < ActiveRecord::Base end end -class Store < ActiveRecord::Base - # include Mongoid::Document -end - Product.tire.index.delete if Product.tire.index.exists? Product.reindex Product.reindex # run twice for both index paths -- libgit2 0.21.0