0
@@ -118,7 +118,6 @@ module Kernel
0
     raise "Don't call use_orm more than once" if registred_orm?(orm)
0
 
0
     begin
0
-      Merb.generator_scope.delete(:merb_default)
0
       register_orm(orm)
0
       orm_plugin = "merb_#{orm}"
0
       Kernel.dependency(orm_plugin)
0
@@ -141,7 +140,7 @@ module Kernel
0
   #--
0
   # @semi-public
0
   def registred_orm?(orm)
0
-    !Merb.generator_scope.include?(:merb_default) && !Merb.generator_scope.include?(orm.to_sym)
0
+    !Merb.generator_scope.include?(:merb_default)
0
   end
0
 
0
   # Registers ORM at generator scope.
0
@@ -152,6 +151,7 @@ module Kernel
0
   #--
0
   # @private
0
   def register_orm(orm)
0
+    Merb.generator_scope.delete(:merb_default)
0
     Merb.generator_scope.unshift(orm.to_sym) unless Merb.generator_scope.include?(orm.to_sym)
0
   end
0
 

0
@@ -97,26 +97,23 @@ end
0
 
0
 
0
 
0
-describe "Plugins", "registred_orm?" do
0
-  before(:each) do
0
-    Merb.generator_scope.replace [:merb_default, :merb, :rspec]
0
-    Kernel.stub!(:dependency)
0
-  end
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
+    Merb.generator_scope = [:rspec, :datamapper]
0
 
0
-  it "returns false unless ORM is registred" do
0
-    registred_orm?(:sequel).should be(false)
0
+    registred_orm?(:datamapper).should be(true)
0
   end
0
 
0
-  it "returns true once ORM is registred" do
0
-    use_orm(:sequel)
0
+  it "returns false if Merb.generator scope has defaults flag" do
0
+    Merb.generator_scope = [:merb_default, :rspec, :datamapper]
0
 
0
-    registred_orm?(:sequel).should be(false)
0
+    registred_orm?(:datamapper).should be(false)
0
   end
0
 end
0
 
0
 
0
 
0
-
0
 describe "Plugins", "register_test_framework" do
0
   before(:each) do
0
     Merb.generator_scope.replace [:merb_default, :merb, :rspec]