Fix config_context_list/hash in strict mode

Signed-off-by: Eli Young <[email protected]>

lib/mixlib/config.rb

@@ -436,7 +436,7 @@ def config_context(symbol, &block)
     # block<Block>: a block that will be run in the context of this new config
     # class.
     def config_context_list(plural_symbol, singular_symbol, &block)
-      if configurables.has_key?(symbol)
+      if configurables.has_key?(plural_symbol)
         raise ReopenedConfigurableWithConfigContextError, "Cannot redefine config value #{plural_symbol} with a config context"
       end
 
@@ -468,7 +468,7 @@ def config_context_list(plural_symbol, singular_symbol, &block)
     # block<Block>: a block that will be run in the context of this new config
     # class.
     def config_context_hash(plural_symbol, singular_symbol, &block)
-      if configurables.has_key?(symbol)
+      if configurables.has_key?(plural_symbol)
         raise ReopenedConfigurableWithConfigContextError, "Cannot redefine config value #{plural_symbol} with a config context"
       end
 

spec/mixlib/config_spec.rb

@@ -115,6 +115,26 @@ class StrictClass
     it "raises an error when you set an arbitrary config option with [:y] = 10" do
       expect(lambda { StrictClass[:y] = 10 }).to raise_error(Mixlib::Config::UnknownConfigOptionError, "Cannot set unsupported config value y.")
     end
+
+    it "does not break config_context_list" do
+      expect(lambda do
+        StrictClass.class_eval do
+          config_context_list(:lists, :list) do
+            default :y, 20
+          end
+        end
+      end).not_to raise_error
+    end
+
+    it "does not break config_context_hash" do
+      expect(lambda do
+        StrictClass.class_eval do
+          config_context_hash(:hashes, :hash) do
+            default :z, 20
+          end
+        end
+      end).not_to raise_error
+    end
   end
 
   describe "when a block has been used to set config values" do