0
@@ -115,7 +115,7 @@ module Kernel
0
   #   # This will use the DataMapper generator for your ORM
0
   #   $ ruby script/generate model MyModel
0
   def use_orm(orm)
0
-    raise "Don't call use_orm more than once" if registred_orm?(orm)
0
+    raise "Don't call use_orm more than once" unless Merb.generator_scope.include?(:merb_default)
0
 
0
     begin
0
       register_orm(orm)
0
@@ -140,7 +140,7 @@ module Kernel
0
   #--
0
   # @semi-public
0
   def registred_orm?(orm)
0
-    !Merb.generator_scope.include?(:merb_default)
0
+    Merb.generator_scope.include?(orm)
0
   end
0
 
0
   # Registers ORM at generator scope.

0
@@ -99,16 +99,16 @@ end
0
 
0
 # #326
0
 describe Kernel, "#registred_orm?" do
0
-  it "returns true if Merb.generator scope has orm alias and has not defaults flag" do
0
+  it "returns true if Merb.generator scope has orm alias" do
0
     Merb.generator_scope = [:rspec, :datamapper]
0
 
0
     registred_orm?(:datamapper).should be(true)
0
   end
0
 
0
-  it "returns false if Merb.generator scope has defaults flag" do
0
+  it "returns false if Merb.generator scope has no ORM alias" do
0
     Merb.generator_scope = [:merb_default, :rspec, :datamapper]
0
 
0
-    registred_orm?(:datamapper).should be(false)
0
+    registred_orm?(:sequel).should be(false)
0
   end
0
 end
0