update Levels::Merged to Levels::Configuration

rcarver · Dec 30, 2012 · da9e5c2 · da9e5c2
1 parent 3e4035c
commit da9e5c2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/config/configuration.rb b/lib/config/configuration.rb
@@ -8,7 +8,7 @@ def self.new(name = nil)
 
     # Internal: Create a merge from one or more configuration levels.
     def self.merge(*levels)
-      merged = Levels::Merged.new(levels)
+      merged = Levels::Configuration.new(levels)
       merged.event_handler = EventHandler.new
       merged
     end

diff --git a/lib/config/spy/configuration.rb b/lib/config/spy/configuration.rb
@@ -10,7 +10,7 @@ class Configuration
       include Config::Configuration::MethodMissing
 
       # A subclass of normal merge so that it's identifiable.
-      class SpyMerged < Levels::Merged
+      class SpyMerged < Levels::Configuration
         def initialize(spy, *levels)
           super levels + [spy]
         end

diff --git a/test/config/configuration_test.rb b/test/config/configuration_test.rb
@@ -7,7 +7,7 @@
   end
 
   specify ".merge" do
-    Config::Configuration.merge([]).must_be_instance_of Levels::Merged
+    Config::Configuration.merge([]).must_be_instance_of Levels::Configuration
   end
 
   describe "logging" do

diff --git a/test/config/project_test.rb b/test/config/project_test.rb
@@ -62,7 +62,7 @@
 
       describe "with a cluster" do
 
-        let(:assigned_configuration_class) { Levels::Merged }
+        let(:assigned_configuration_class) { Levels::Configuration }
         let(:assigned_cluster_context_class) { Config::ClusterContext }
 
         before do
@@ -92,7 +92,7 @@
 
       let(:node) { Config::Node.new("production", "webserver", "1") }
 
-      let(:assigned_configuration_class) { Levels::Merged }
+      let(:assigned_configuration_class) { Levels::Configuration }
       let(:assigned_cluster_context_class) { Config::ClusterContext }
 
       before do