Additional fixes for tests

Author: silug

spec/integration/directory_environments_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
+require 'puppet/application/config'
 
 describe "directory environments" do
-  let(:args) { ['--configprint', 'modulepath', '--environment', 'direnv'] }
-  let(:puppet) { Puppet::Application[:apply] }
+  let(:args) { ['print', 'modulepath', '--environment', 'direnv'] }
+  let(:puppet) { Puppet::Application[:config] }
 
   context "with a single directory environmentpath" do
     before(:each) do
@@ -12,16 +13,18 @@
     end
 
     it "config prints the environments modulepath" do
-      Puppet.settings.initialize_global_settings(args)
+      puppet.command_line.args = args
+      Puppet.initialize_settings(args)
       expect {
         puppet.run
       }.to exit_with(0)
        .and output(%r{/direnv/modules}).to_stdout
     end
 
     it "config prints the cli --modulepath despite environment" do
-      args << '--modulepath' << '/completely/different'
-      Puppet.settings.initialize_global_settings(args)
+      args.push('--modulepath', '/completely/different')
+      puppet.command_line.args = args
+      Puppet.initialize_settings(args)
       expect {
         puppet.run
       }.to exit_with(0)
@@ -38,7 +41,8 @@
       Puppet[:environmentpath] = shortened
       expect(Puppet[:environmentpath]).to match(/~/)
 
-      Puppet.settings.initialize_global_settings(args)
+      puppet.command_line.args = args
+      Puppet.initialize_settings(args)
       expect {
         puppet.run
       }.to exit_with(0)
@@ -47,7 +51,7 @@
   end
 
   context "with an environmentpath having multiple directories" do
-    let(:args) { ['--configprint', 'modulepath', '--environment', 'otherdirenv'] }
+    let(:args) { ['print', 'modulepath', '--environment', 'otherdirenv'] }
 
     before(:each) do
       envdir1 = File.join(Puppet[:confdir], 'env1')
@@ -57,7 +61,8 @@
     end
 
     it "config prints a directory environment modulepath" do
-      Puppet.settings.initialize_global_settings(args)
+      puppet.command_line.args = args
+      Puppet.initialize_settings(args)
       expect {
         puppet.run
       }.to exit_with(0)

spec/unit/application/agent_spec.rb

@@ -286,19 +286,6 @@ def run(options = {}); end
       end
     end
 
-    it "should print puppet config if asked to in Puppet config" do
-      Puppet[:configprint] = "plugindest"
-      expect(Puppet.settings).to receive(:print_configs).and_return(true)
-      expect { execute_agent }.to exit_with 0
-    end
-
-    it "should exit after printing puppet config if asked to in Puppet config" do
-      path = make_absolute('/my/path')
-      Puppet[:modulepath] = path
-      Puppet[:configprint] = "modulepath"
-      expect_any_instance_of(Puppet::Settings).to receive(:puts).with(path)
-      expect { execute_agent }.to exit_with 0
-    end
 
     it "should use :main, :puppetd, and :ssl" do
       expect(Puppet.settings).to receive(:use).with(:main, :agent, :ssl)