0
@@ -245,7 +245,7 @@ module Merb
0
     end
0
 
0
     # Set up default variables under Merb
0
-    attr_accessor :generator_scope, :klass_hashes
0
+    attr_accessor :generator_scope, :klass_hashes, :orm_generator_scope, :test_framework_generator_scope
0
 
0
     # Returns registered ORM generators as symbols,
0
     # for instance, :datamapper.
0
@@ -253,7 +253,7 @@ module Merb
0
     # ==== Returns
0
     # <Array(Symbol>:: registered ORM generators.
0
     def orm_generator_scope
0
-      @orm_generator_scope ||= [:merb_default]
0
+      @orm_generator_scope ||= :merb_default
0
     end
0
 
0
     # Returns registered test framework generators.
0
@@ -261,7 +261,7 @@ module Merb
0
     # ==== Returns
0
     # <Array(Symbol>:: registred test framework generators.
0
     def test_framework_generator_scope
0
-      @test_framework_generator_scope ||= [:rspec]
0
+      @test_framework_generator_scope ||= :rspec
0
     end
0
 
0
     # Returns all registered generators plus Merb generator.
0
@@ -270,7 +270,7 @@ module Merb
0
     # <Array(Symbol>::
0
     #   all registered generators, inc. needed by Merb itself.
0
     def generator_scope
0
-      [:merb] + orm_generator_scope + test_framework_generator_scope
0
+      [:merb, orm_generator_scope, test_framework_generator_scope]
0
     end
0
 
0
 

0
@@ -137,7 +137,7 @@ module Kernel
0
   #--
0
   # @private
0
   def register_orm(orm)
0
-    Merb.orm_generator_scope.replace([orm])
0
+    Merb.orm_generator_scope = orm
0
   end
0
 
0
   # Used in Merb.root/config/init.rb to tell Merb which testing framework to
0
@@ -178,7 +178,7 @@ module Kernel
0
   #--
0
   # @private
0
   def register_test_framework(test_framework)
0
-    Merb.test_framework_generator_scope.replace([test_framework])
0
+    Merb.test_framework_generator_scope = test_framework
0
   end
0
 
0
   # ==== Parameters

0
@@ -3,8 +3,8 @@ require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
0
 Merb.environment = 'test'
0
 
0
 def reset_merb_generator_scope
0
-  Merb.orm_generator_scope.replace [:merb_default]
0
-  Merb.test_framework_generator_scope.replace [:rspec]
0
+  Merb.orm_generator_scope = :merb_default
0
+  Merb.test_framework_generator_scope = :rspec
0
   Kernel.stub!(:dependency)
0
 end
0
 
0
@@ -30,7 +30,7 @@ describe "Plugins", "ORM generator scope" do
0
   end
0
 
0
   it "has merb_default stub by default" do
0
-    Merb.orm_generator_scope.should include(:merb_default)
0
+    Merb.orm_generator_scope.should == :merb_default
0
   end
0
 end
0
 
0
@@ -81,7 +81,7 @@ describe "Plugins", "test framework generator scope" do
0
   end
0
 
0
   it "has rspec by default" do
0
-    Merb.test_framework_generator_scope.should include(:rspec)
0
+    Merb.test_framework_generator_scope.should == :rspec
0
   end
0
 end
0
 
0
@@ -122,7 +122,7 @@ describe "Plugins", "register_orm" do
0
   it "registers ORM plugin at orm generator scope" do
0
     register_orm(:sequel)
0
 
0
-    Merb.orm_generator_scope.should include(:sequel)
0
+    Merb.orm_generator_scope.should == :sequel
0
   end
0
 end
0