From 838a2a5c58876d8036b34d21c079c7db5bb1cad2 Mon Sep 17 00:00:00 2001
From: Christian Ratz <c.ratz@finn.de>
Date: Tue, 21 May 2013 11:38:13 +0200
Subject: [PATCH 1/2] added inclusion of Gemfile.plugins

- should be used to add OP plugins
- added Gemfile.plugins to gitignore
---
 .gitignore | 1 +
 Gemfile    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4cfdab72b8..ec37fb8da7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@
 /doc/app
 #/Gemfile.lock
 /Gemfile.local
+/Gemfile.plugins
 /.rvmrc*
 /.ruby-version
 
diff --git a/Gemfile b/Gemfile
index 23a3c5ba39..5dde767102 100644
--- a/Gemfile
+++ b/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

From 637f125a3f8a6b3e59c420e38996bf7c62b99bd1 Mon Sep 17 00:00:00 2001
From: Philipp Tessenow <philipp@tessenow.org>
Date: Tue, 21 May 2013 13:33:26 +0200
Subject: [PATCH 2/2] remove database_cleaner in comment test

---
 test/unit/comment_test.rb | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index 22c09229b0..7878906166 100644
--- a/test/unit/comment_test.rb
+++ b/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?