Merge remote-tracking branch 'origin/master' into leap_master

1 files changed, 0 insertions, 16 deletions

diff --git a/spec/lib/puppet_spec/settings.rb b/spec/lib/puppet_spec/settings.rb
deleted file mode 100755
index 8ddcb97..0000000
--- a/spec/lib/puppet_spec/settings.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-module PuppetSpec::Settings
-
-  # It would probably be preferable to refactor defaults.rb such that the real definitions of
-  #  these settings were available as a variable, which was then accessible for use during tests.
-  #  However, I'm not doing that yet because I don't want to introduce any additional moving parts
-  #  to this already very large changeset.
-  #  Would be nice to clean this up later.  --cprice 2012-03-20
-  TEST_APP_DEFAULT_DEFINITIONS = {
-    :name         => { :default => "test", :desc => "name" },
-    :logdir       => { :type => :directory, :default => "test", :desc => "logdir" },
-    :confdir      => { :type => :directory, :default => "test", :desc => "confdir" },
-    :vardir       => { :type => :directory, :default => "test", :desc => "vardir" },
-    :rundir       => { :type => :directory, :default => "test", :desc => "rundir" },
-  }
-end