Merge branch '2.7.x'

* 2.7.x: (23 commits)
  Clean up indentation, whitespace, and commented out code
  Remove order dependency from functions integration spec
  (#7956) Porting cron tests
  (#7956) Port resource acceptance tests
  (#8048) Gem install puppet no longer fails if rdoc enabled.
  Updating for 2.7.1 release.
  (#8048) Gem install puppet no longer fails if rdoc enabled.
  Readying for release of 2.6.9
  Updating CHANGELOG for 2.7.0
  (#6854) Update Red Hat spec file
  Bumping release in lib/puppet.rb and updating CHANGELOG.
  Bumping RPM spec file to 2.6.9rc1.
  (#7224) Reword 'hostname was not match' error message
  (#7224) Add a helper to Puppet::SSL::Certificate to retrieve alternate names
  (#7506) Organize READMEs; specify supported Ruby versions in README.md
  (#7506) Specify supported Ruby versions in README.md
  (#5641) Help text: document that puppet doc takes modulepath, manifestdir, and environment options
  (#6418) Make test 64118 more portable
  (#7127) Stop puppet if a prerun command fails
  Do not needlessly create multiple reports when creating a transaction
  ...

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/integration/type_spec.rb b/spec/integration/type_spec.rb
index 4be01d558..9fd10485f 100755
--- a/spec/integration/type_spec.rb
+++ b/spec/integration/type_spec.rb
@@ -18,4 +18,15 @@ describe Puppet::Type do
 
     type.provider(:myprovider).should equal(provider)
   end
+
+  it "should not lose its provider parameter when it is reloaded" do
+    type = Puppet::Type.newtype(:reload_test_type)
+
+    provider = type.provide(:test_provider)
+
+    # reload it
+    type = Puppet::Type.newtype(:reload_test_type)
+
+    type.parameters.should include(:provider)
+  end
 end