Merge branch 'feature/rails3' into feature/rails3_update_dependencies

.gitignore

@@ -41,6 +41,7 @@
 /doc/app
 #/Gemfile.lock
 /Gemfile.local
+/Gemfile.plugins
 /.rvmrc*
 /.ruby-version
 

Gemfile

@@ -171,8 +171,8 @@ platforms :jruby do
   end
 end
 
-# Load Gemfile.local and plugins' Gemfiles
-Dir.glob File.expand_path("../{Gemfile.local,lib/plugins/*/Gemfile}", __FILE__) do |file|
+# Load Gemfile.local, Gemfile.plugins and plugins' Gemfiles
+Dir.glob File.expand_path("../{Gemfile.local,Gemfile.plugins,lib/plugins/*/Gemfile}", __FILE__) do |file|
   next unless File.readable?(file)
   instance_eval File.read(file)
 end

test/unit/comment_test.rb

@@ -16,17 +16,6 @@ require_relative '../test_helper'
 class CommentTest < ActiveSupport::TestCase
   include MiniTest::Assertions # refute
 
-  def setup
-    super
-    DatabaseCleaner.clean_with :truncation
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.start
-  end
-
-  def teardown
-    DatabaseCleaner.clean
-  end
-
   def test_validations
     # factory valid
     assert FactoryGirl.build(:comment).valid?