(PUP-2014) Make module use current_environment

Module now uses current environment instead of configured
environment when being asked for a module and not supplying
an explicit environment name. It used to lookup to configured
environment giving invoking logic no chance to modify the
default without modifying the setting.

lib/puppet/module.rb

@@ -28,7 +28,8 @@ class InvalidFilePattern < Error; end
   # of +path+, return +nil+
   def self.find(modname, environment = nil)
     return nil unless modname
-    env = Puppet.lookup(:environments).get(environment || Puppet[:environment])
+    # Unless a specific environment is given, use the current environment
+    env = environment ? Puppet.lookup(:environments).get(environment) : Puppet.lookup(:current_environment)
     env.module(modname)
   end
 

spec/unit/face/parser_spec.rb

@@ -43,11 +43,9 @@
     it "parses supplied manifest files in the context of a directory environment" do
       manifest = file_containing('test.pp', "{ invalid =>")
 
-      env_loader = Puppet::Environments::Static.new(
-        Puppet::Node::Environment.create(:special, [])
-      )
-      Puppet.override(:environments => env_loader) do
-        Puppet[:environment] = 'special'
+      env = Puppet::Node::Environment.create(:special, [])
+      env_loader = Puppet::Environments::Static.new(env)
+      Puppet.override({:environments => env_loader, :current_environment => env}) do
         expect { parser.validate(manifest) }.to exit_with(1)
       end