Skip to content

Commit

Permalink
Merge branch 'master' into new-views
Browse files Browse the repository at this point in the history
  • Loading branch information
yrashk committed Apr 30, 2008
2 parents b54ffce + d8fadf2 commit db31f43
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
7 changes: 4 additions & 3 deletions spec/lib/strokedb/config_spec.rb
Expand Up @@ -134,9 +134,10 @@
it "should use specified store if told so" do
StrokeDB.send!(:remove_const,'SomeFunnyStore') if defined?(SomeFunnyStore)
StrokeDB::SomeFunnyStore = Class.new(Store)
pending("not that important now")
config = StrokeDB::Config.build :store => :some_funny, :base_path => @base_path
config.stores[:default].should be_a_kind_of(SomeFunnyStore)
pending("not that important now") do
config = StrokeDB::Config.build :store => :some_funny, :base_path => @base_path
config.stores[:default].should be_a_kind_of(SomeFunnyStore)
end
end

it "should add storages as he is told to" do
Expand Down
1 change: 0 additions & 1 deletion spec/lib/strokedb/document/associations_spec.rb
Expand Up @@ -376,4 +376,3 @@ def some_method
end

end

0 comments on commit db31f43

Please sign in to comment.