Permalink
Browse files

Set Merb#orm to Sequel once we require the plugin.

  • Loading branch information...
1 parent 8d85a9c commit c5a8731601986fbb4997850ff68fe7544385723f @pk committed Apr 7, 2010
Showing with 8 additions and 1 deletion.
  1. +3 −0 lib/merb_sequel.rb
  2. +5 −1 spec/merb_sequel_spec.rb
View
@@ -91,4 +91,7 @@ def self.run
Merb.add_generators generators / :model
Merb.add_generators generators / :resource_controller
Merb.add_generators generators / :session_migration
+
+ # Sets Sequel as ORM
+ Merb.orm = :sequel
end
@@ -2,7 +2,7 @@
describe Merb::Orms::Sequel::Connect do
it "should be loaded at plugin bootstrap" do
- defined?(Merb::Orms::Sequel::Connect).should == "constant"
+ defined?(Merb::Orms::Sequel::Connect).should == 'constant'
end
it "should be Merb::BootLoader" do
@@ -12,4 +12,8 @@
it "should provide default settings" do
Merb::Plugins.config[:merb_sequel].should include(:load_activemodel_compatibility)
end
+
+ it "should set Merb#orm to :sequel" do
+ Merb.orm.should eql :sequel
+ end
end

0 comments on commit c5a8731

Please sign in to comment.