establish_connetion unless in test environment

Jeremy Steinberg committed Aug 31, 2011

commit 051ff2ee532739271ee6f7c5b63822177a8d2e5c

app/models/cms/block.rb +3 -1

@@	@@ -1,5 +1,7 @@
	class Cms::Block < ActiveRecord::Base
-	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
+	unless Rails.env == 'test'
+	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
+	end

	set_table_name :cms_blocks

app/models/cms/categorization.rb +4 -2

@@	@@ -1,6 +1,8 @@
	class Cms::Categorization < ActiveRecord::Base
-	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
-
+	unless Rails.env == 'test'
+	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
+	end
+
	set_table_name :cms_categorizations

	# -- Relationships --------------------------------------------------------

app/models/cms/category.rb +4 -2

@@	@@ -1,6 +1,8 @@
	class Cms::Category < ActiveRecord::Base
-	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
-
+	unless Rails.env == 'test'
+	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
+	end
+
	set_table_name :cms_categories

	# -- Relationships --------------------------------------------------------

app/models/cms/file.rb +4 -2

@@	@@ -1,6 +1,8 @@
	class Cms::File < ActiveRecord::Base
-	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
-
+	unless Rails.env == 'test'
+	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
+	end
+
	set_table_name :cms_files

	cms_is_categorized

app/models/cms/layout.rb +4 -2

@@	@@ -1,6 +1,8 @@
	class Cms::Layout < ActiveRecord::Base
-	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
-
+	unless Rails.env == 'test'
+	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
+	end
+
	set_table_name :cms_layouts

	cms_acts_as_tree

app/models/cms/page.rb +4 -2

@@	@@ -1,6 +1,8 @@
	class Cms::Page < ActiveRecord::Base
-	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
-
+	unless Rails.env == 'test'
+	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
+	end
+
	set_table_name :cms_pages

	cms_acts_as_tree :counter_cache => :children_count

app/models/cms/revision.rb +4 -2

@@	@@ -1,6 +1,8 @@
	class Cms::Revision < ActiveRecord::Base
-	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
-
+	unless Rails.env == 'test'
+	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
+	end
+
	set_table_name :cms_revisions

	serialize :data

app/models/cms/site.rb +4 -2

@@	@@ -1,6 +1,8 @@
	class Cms::Site < ActiveRecord::Base
-	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
-
+	unless Rails.env == 'test'
+	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
+	end
+
	set_table_name :cms_sites

	# -- Relationships --------------------------------------------------------

app/models/cms/snippet.rb +4 -2

@@	@@ -1,6 +1,8 @@
	class Cms::Snippet < ActiveRecord::Base
-	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
-
+	unless Rails.env == 'test'
+	establish_connection "#{ComfortableMexicanSofa.config.database_prefix}#{Rails.env}"
+	end
+
	set_table_name :cms_snippets

	cms_is_categorized

test/unit/configuration_test.rb +1 -0

@@	@@ -16,6 +16,7 @@ class ConfigurationTest < ActiveSupport::TestCase
	assert_equal 25, config.revisions_limit
	assert_equal ({:en => 'English', :es => 'Español'}), config.locales
	assert_equal nil, config.admin_locale
+	assert_equal nil, config.database_prefix
	end

	def test_initialization_overrides