From 7ec1b2a3fcbfeacebcc6211b346b683f422ecfd5 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Fri, 15 Apr 2016 01:05:06 +0900
Subject: [PATCH] Skip DM models test if kaminari-data_mapper is loaded

---
 spec/models/data_mapper/data_mapper_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/data_mapper/data_mapper_spec.rb b/spec/models/data_mapper/data_mapper_spec.rb
index 3b5938e..6df3486 100644
--- a/spec/models/data_mapper/data_mapper_spec.rb
+++ b/spec/models/data_mapper/data_mapper_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-if defined? DataMapper
+if defined?(DataMapper) && !defined?(Kaminari::DataMapper)
   # tests for issue #203
   describe Kaminari::DataMapperCollectionMethods do
     before do