Permalink
Browse files

Get testing working again with combustion

  • Loading branch information...
1 parent 717498f commit 05a6a19d17f75d4d7a504ed3cfb7347321cebf2d @parndt committed Nov 27, 2012
@@ -13,7 +13,7 @@ def self.up
end
add_index :seo_meta, :id
- add_index :seo_meta, [:seo_meta_id, :seo_meta_type]
+ add_index :seo_meta, [:seo_meta_id, :seo_meta_type], :name => :id_type_index_on_seo_meta
end
def self.down
View
@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
s.summary = 'SEO Meta tags plugin'
s.require_paths = %w(lib)
s.files = Dir['lib/**/*', 'db/**/*', 'app/**/*', 'config/**/*', '*.md']
+ s.license = %q{MIT}
s.add_development_dependency 'combustion'
s.add_development_dependency 'rspec-rails'
@@ -1,4 +1,3 @@
test:
- adapter: <%= "jdbc" if defined? JRUBY_VERSION %>sqlite3
- database: db/test.sqlite3
- timeout: 5000
+ adapter: <%= "jdbc" if defined? JRUBY_VERSION %>sqlite3
+ database: db/combustion_test.sqlite
Binary file not shown.
View
@@ -1,21 +1,7 @@
-# Defined based on the migrations and the dummy spec model.
+# Defined based on the dummy spec model.
::ActiveRecord::Schema.define do
-
- create_table 'seo_meta', :force => true do |t|
- t.integer 'seo_meta_id'
- t.string 'seo_meta_type'
-
- t.string 'browser_title'
- t.text 'meta_description'
-
- t.timestamps
- end
-
- add_index 'seo_meta', 'id'
- add_index 'seo_meta', ['seo_meta_id', 'seo_meta_type']
-
create_table 'seo_meta_dummy_for_specs', :force => true do |t|
t.timestamps
end
-end
+end
@@ -2,7 +2,7 @@
module SeoMeta
class DummyForSpec < ActiveRecord::Base
- set_table_name 'seo_meta_dummy_for_specs'
+ self.table_name = 'seo_meta_dummy_for_specs'
is_seo_meta
end
@@ -53,4 +53,4 @@ module SeoMeta
end
end
-end
+end
View
@@ -5,7 +5,7 @@ def setup_environment
# Configure Rails Environment
ENV["RAILS_ENV"] ||= 'test'
- Bundler.require(:default, :development)
+ Bundler.require :default, :development
Combustion.initialize! :active_record

0 comments on commit 05a6a19

Please sign in to comment.