Merge remote-tracking branch 'upstream/master' into stable

* upstream/master: (767 commits)
  (maint) Namespace constant declaration in specs to prevent warnings
  (maint) Expect test to fail on windows ruby 2.0 x86
  (PUP-3069) Fix path expansion for environment.conf test on Win
  (PUP-2349) Add windows specific expectation for deprecation_warning
  (PUP-2349) Add windows specific expectation for deprecation_warning
  (PUP-3069) Clear configuration_file for tests
  (PUP-3069) Test both future and current parser with default_manifest
  (PUP-3069) Update default_manifest setting descriptions
  (PUP-3069) Change restrict_environment_manifest name
  (PUP-3163) Create and manage the mode of $reportsdir
  (maint) Clear record of configured deprecated settings
  (PUP-3069) Add an integration spec for default_manifest
  (PUP-3069) Halt compile if environment has manifest conflict
  (PUP-3069) Add spec test for new default options
  (PUP-3069) Add default manifest settings
  PUP-3155 Improve spec tests around the PE puppet version
  (PUP-3153) Guard against nil when closing Uniquefiles
  (PUP-2984) Remove old installation directory when going from x64 to x86
  (PUP-1884) Migrate MSI deps into puppet repo
  (PUP-3154) Create and manage the mode of $statedir on redhat
  ...

1 files changed, 3 insertions, 0 deletions

diff --git a/spec/lib/puppet_spec/module_tool/stub_source.rb b/spec/lib/puppet_spec/module_tool/stub_source.rb
index 5cee57c10..8b5f8bbe1 100644
--- a/spec/lib/puppet_spec/module_tool/stub_source.rb
+++ b/spec/lib/puppet_spec/module_tool/stub_source.rb
@@ -100,6 +100,9 @@ module PuppetSpec
             "0.0.2" => { "pmtacceptance/stdlib" => ">= 2.2.0", "pmtacceptance/mysql" => ">= 0.0.1" },
             "0.0.1" => { "pmtacceptance/stdlib" => ">= 2.2.0" },
           },
+          'puppetlabs-oneversion' => {
+            "0.0.1" => {}
+          }
         }
 
         @available_releases.each do |name, versions|