Moved datamapper spec to spec/integration

carrierwaveuploader · Jul 25, 2011 · b1f3bf6 · b1f3bf6
1 parent 33d37bb
commit b1f3bf6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/spec/datamapper_spec.rb → spec/integration/datamapper_spec.rb b/spec/datamapper_spec.rb → spec/integration/datamapper_spec.rb
@@ -6,8 +6,6 @@
 require 'dm-validations'
 require 'dm-migrations'
 
-DataMapper.setup(:default, 'sqlite3::memory:')
-
 describe CarrierWave::DataMapper do
 
   before do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -5,6 +5,8 @@
 require 'carrierwave'
 require 'carrierwave/datamapper'
 
+DataMapper.setup(:default, 'sqlite3::memory:')
+
 def file_path( *paths )
   File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', *paths))
 end

diff --git a/spec/unit/carrier_wave/data_mapper/mount_uploader_spec.rb b/spec/unit/carrier_wave/data_mapper/mount_uploader_spec.rb