Merge branch 'master' into action_store

hassox · Jul 15, 2008 · 73f95ea · 73f95ea
2 parents 6c77c34 + 72e894b
commit 73f95ea
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/.../merb-cache/stores/abstract_store_spec.rb → ...stores/fundamental/abstract_store_spec.rb b/.../merb-cache/stores/abstract_store_spec.rb → ...stores/fundamental/abstract_store_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe Merb::Cache::AbstractStore do
   shared_examples_for 'all stores' do

diff --git a/spec/merb-cache/stores/file_store_spec.rb → ...che/stores/fundamental/file_store_spec.rb b/spec/merb-cache/stores/file_store_spec.rb → ...che/stores/fundamental/file_store_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 require File.dirname(__FILE__) + '/abstract_store_spec'
 
 describe Merb::Cache::FileStore do

diff --git a/...merb-cache/stores/memcached_store_spec.rb → ...tores/fundamental/memcached_store_spec.rb b/...merb-cache/stores/memcached_store_spec.rb → ...tores/fundamental/memcached_store_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 require File.dirname(__FILE__) + '/abstract_store_spec'
 
 begin

diff --git a/.../merb-cache/stores/strategy_store_spec.rb → .../strategy/abstract_strategy_store_spec.rb b/.../merb-cache/stores/strategy_store_spec.rb → .../strategy/abstract_strategy_store_spec.rb
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/abstract_store_spec'
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../fundamental/abstract_store_spec'
 
 
 describe Merb::Cache::AbstractStrategyStore do

diff --git a/spec/merb-cache/stores/adhoc_store_spec.rb → ...cache/stores/strategy/adhoc_store_spec.rb b/spec/merb-cache/stores/adhoc_store_spec.rb → ...cache/stores/strategy/adhoc_store_spec.rb
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/abstract_store_spec'
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/abstract_strategy_store_spec'
 
 describe Merb::Cache::AdhocStore do
   it_should_behave_like 'all stores'

diff --git a/spec/merb-cache/stores/gzip_store_spec.rb → ...-cache/stores/strategy/gzip_store_spec.rb b/spec/merb-cache/stores/gzip_store_spec.rb → ...-cache/stores/strategy/gzip_store_spec.rb
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/strategy_store_spec'
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/abstract_strategy_store_spec'
 
 describe Merb::Cache::GzipStore do
   it_should_behave_like 'all strategy stores'

diff --git a/spec/merb-cache/stores/sha1_store_spec.rb → ...-cache/stores/strategy/sha1_store_spec.rb b/spec/merb-cache/stores/sha1_store_spec.rb → ...-cache/stores/strategy/sha1_store_spec.rb
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/strategy_store_spec'
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/abstract_strategy_store_spec'
 
 describe Merb::Cache::SHA1Store do
   it_should_behave_like 'all strategy stores'