puppet 5.0.0 → 6.0.0

data/spec/unit/file_bucket/dipper_spec.rb

@@ -73,7 +73,7 @@ describe Puppet::FileBucket::Dipper, :uses_checksums => true do
   end
 
   describe "when diffing on a local filebucket" do
-    describe "in non-windows environments", :unless => Puppet.features.microsoft_windows? do
+    describe "in non-windows environments or JRuby", :unless => Puppet::Util::Platform.windows? || RUBY_PLATFORM == 'java' do
       with_digest_algorithms do
 
         it "should fail in an informative way when one or more checksum doesn't exists" do
@@ -91,15 +91,24 @@ describe Puppet::FileBucket::Dipper, :uses_checksums => true do
         end
 
         it "should properly diff files on the filebucket" do
-          file1 = make_tmp_file("OriginalContent")
-          file2 = make_tmp_file("ModifiedContent")
+          file1 = make_tmp_file("OriginalContent\n")
+          file2 = make_tmp_file("ModifiedContent\n")
           @dipper = Puppet::FileBucket::Dipper.new(:Path => tmpdir("bucket"))
           checksum1 = @dipper.backup(file1)
           checksum2 = @dipper.backup(file2)
 
           # Diff without the context
-          diff12 = `diff -uN #{file1} #{file2} | sed '1,2d'`
-          diff21 = `diff -uN #{file2} #{file1} | sed '1,2d'`
+          # Lines we need to see match 'Content' instead of trimming diff output filter out
+          # surrounding noise...or hard code the check values
+          if Facter.value(:osfamily) == 'Solaris' &&
+            Puppet::Util::Package.versioncmp(Facter.value(:operatingsystemrelease), '11.0') >= 0
+            # Use gdiff on Solaris
+            diff12 = Puppet::Util::Execution.execute("gdiff -uN #{file1} #{file2}| grep Content")
+            diff21 = Puppet::Util::Execution.execute("gdiff -uN #{file2} #{file1}| grep Content")
+          else
+            diff12 = Puppet::Util::Execution.execute("diff -uN #{file1} #{file2}| grep Content")
+            diff21 = Puppet::Util::Execution.execute("diff -uN #{file2} #{file1}| grep Content")
+          end
 
           expect(@dipper.diff(checksum1, checksum2, nil, nil)).to include(diff12)
           expect(@dipper.diff(checksum1, nil, nil, file2)).to include(diff12)
@@ -112,7 +121,7 @@ describe Puppet::FileBucket::Dipper, :uses_checksums => true do
 
         end
       end
-      describe "in windows environment", :if => Puppet.features.microsoft_windows? do
+      describe "in windows environment", :if => Puppet::Util::Platform.windows? do
         it "should fail in an informative way when trying to diff" do
           @dipper = Puppet::FileBucket::Dipper.new(:Path => tmpdir("bucket"))
           wrong_checksum = "DEADBEEF"
@@ -136,14 +145,14 @@ describe Puppet::FileBucket::Dipper, :uses_checksums => true do
   describe "listing files in local filebucket" do
     with_digest_algorithms do
       it "should list all files present" do
+        if Puppet::Util::Platform.windows? && digest_algorithm == "sha512"
+          skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
+        end
         Puppet[:bucketdir] =  "/my/bucket"
         file_bucket = tmpdir("bucket")
 
         @dipper = Puppet::FileBucket::Dipper.new(:Path => file_bucket)
 
-        onehour=60*60
-        twohours=onehour*2
-
         #First File
         file1 = make_tmp_file(plaintext)
         real_path = Pathname.new(file1).realpath
@@ -170,7 +179,6 @@ describe Puppet::FileBucket::Dipper, :uses_checksums => true do
         checksum = digest(plaintext)
         expect(digest(plaintext)).to eq(checksum)
         expect(@dipper.backup(file3)).to eq(checksum)
-        date = Time.now
         expected_list3 = /#{checksum} \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} #{real_path}\n/
 
         result = @dipper.list(nil, nil)
@@ -181,6 +189,9 @@ describe Puppet::FileBucket::Dipper, :uses_checksums => true do
       end
 
       it "should filter with the provided dates" do
+        if Puppet::Util::Platform.windows? && digest_algorithm == "sha512"
+          skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
+        end
         Puppet[:bucketdir] =  "/my/bucket"
         file_bucket = tmpdir("bucket")
 
@@ -239,7 +250,7 @@ describe Puppet::FileBucket::Dipper, :uses_checksums => true do
   end
 
   describe "when diffing on a remote filebucket" do
-    describe "in non-windows environments", :unless => Puppet.features.microsoft_windows? do
+    describe "in non-windows environments", :unless => Puppet::Util::Platform.windows? do
       with_digest_algorithms do
         it "should fail in an informative way when one or more checksum doesn't exists" do
           @dipper = Puppet::FileBucket::Dipper.new(:Server => "puppetmaster", :Port => "31337")
@@ -260,7 +271,7 @@ describe Puppet::FileBucket::Dipper, :uses_checksums => true do
       end
     end
 
-    describe "in windows environment", :if => Puppet.features.microsoft_windows? do
+    describe "in windows environment", :if => Puppet::Util::Platform.windows? do
       it "should fail in an informative way when trying to diff" do
         @dipper = Puppet::FileBucket::Dipper.new(:Server => "puppetmaster", :Port => "31337")
         wrong_checksum = "DEADBEEF"
@@ -285,6 +296,9 @@ describe Puppet::FileBucket::Dipper, :uses_checksums => true do
   describe "backing up and retrieving local files" do
     with_digest_algorithms do
       it "should backup files to a local bucket" do
+        if Puppet::Util::Platform.windows? && digest_algorithm == "sha512"
+          skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
+        end
         Puppet[:bucketdir] = "/non/existent/directory"
         file_bucket = tmpdir("bucket")
 
@@ -302,7 +316,9 @@ describe Puppet::FileBucket::Dipper, :uses_checksums => true do
 
         file = make_tmp_file(plaintext)
 
-        Puppet::FileBucket::File.indirection.expects(:head).returns true
+        Puppet::FileBucket::File.indirection.expects(:head).with(
+          regexp_matches(%r{#{digest_algorithm}/#{checksum}}), :bucket_path => "/my/bucket"
+        ).returns true
         Puppet::FileBucket::File.indirection.expects(:save).never
         expect(@dipper.backup(file)).to eq(checksum)
       end

data/spec/unit/file_serving/base_spec.rb

@@ -41,11 +41,6 @@ describe Puppet::FileServing::Base do
     expect(Puppet::FileServing::Base.new(path).links).to eq(:manage)
   end
 
-  it "should allow specification of a path" do
-    Puppet::FileSystem.stubs(:exist?).returns(true)
-    expect(Puppet::FileServing::Base.new(path, :path => file).path).to eq(file)
-  end
-
   it "should allow specification of a relative path" do
     Puppet::FileSystem.stubs(:exist?).returns(true)
     expect(Puppet::FileServing::Base.new(path, :relative_path => "my/file").relative_path).to eq("my/file")
@@ -106,13 +101,15 @@ describe Puppet::FileServing::Base do
     let(:path) { '//server/share/filename' }
     let(:file) { Puppet::FileServing::Base.new(path) }
 
+    before :each do
+      Puppet::Util::Platform.stubs(:windows?).returns true
+    end
+
     it "should preserve double slashes at the beginning of the path" do
-      Puppet.features.stubs(:microsoft_windows?).returns(true)
       expect(file.full_path).to eq(path)
     end
 
     it "should strip double slashes not at the beginning of the path" do
-      Puppet.features.stubs(:microsoft_windows?).returns(true)
       file = Puppet::FileServing::Base.new('//server//share//filename')
       expect(file.full_path).to eq(path)
     end
@@ -153,14 +150,14 @@ describe Puppet::FileServing::Base do
     end
 
     it "should accept Windows paths on Windows" do
-      Puppet.features.stubs(:microsoft_windows?).returns(true)
+      Puppet::Util::Platform.stubs(:windows?).returns true
       Puppet.features.stubs(:posix?).returns(false)
 
       expect(Puppet::FileServing::Base).to be_absolute('c:/foo')
     end
 
     it "should reject Windows paths on POSIX" do
-      Puppet.features.stubs(:microsoft_windows?).returns(false)
+      Puppet::Util::Platform.stubs(:windows?).returns false
 
       expect(Puppet::FileServing::Base).not_to be_absolute('c:/foo')
     end

data/spec/unit/file_serving/configuration/parser_spec.rb

@@ -78,7 +78,7 @@ describe Puppet::FileServing::Configuration::Parser do
     it "should return comprehensible error message, if invalid line detected" do
       write_config_file "[one]\n\n\x01path /etc/puppetlabs/puppet/files\n\x01allow *\n"
 
-      expect { @parser.parse }.to raise_error(ArgumentError, /Invalid line.*in.*, line 3/)
+      expect { @parser.parse }.to raise_error(ArgumentError, /Invalid entry at \(file: .*, line: 3\): .*/)
     end
   end
 
@@ -130,7 +130,7 @@ describe Puppet::FileServing::Configuration::Parser do
     it "should return comprehensible error message, if failed on invalid attribute" do
       write_config_file "[one]\ndo something\n"
 
-      expect { @parser.parse }.to raise_error(ArgumentError, /Invalid argument 'do' in .*, line 2/)
+      expect { @parser.parse }.to raise_error(ArgumentError, /Invalid argument 'do' at \(file: .*, line: 2\)/)
     end
   end
 

data/spec/unit/file_serving/configuration_spec.rb

@@ -83,14 +83,15 @@ describe Puppet::FileServing::Configuration do
       expect(config.mounted?("one")).to be_truthy
     end
 
-    it "should add modules and plugins mounts even if the file does not exist" do
+    it "should add modules, plugins, and tasks mounts even if the file does not exist" do
       Puppet::FileSystem.expects(:exist?).returns false # the file doesn't exist
       config = Puppet::FileServing::Configuration.configuration
       expect(config.mounted?("modules")).to be_truthy
       expect(config.mounted?("plugins")).to be_truthy
+      expect(config.mounted?("tasks")).to be_truthy
     end
 
-    it "should allow all access to modules and plugins if no fileserver.conf exists" do
+    it "should allow all access to modules, plugins, and tasks if no fileserver.conf exists" do
       Puppet::FileSystem.expects(:exist?).returns false # the file doesn't exist
       modules = stub 'modules', :empty? => true
       Puppet::FileServing::Mount::Modules.stubs(:new).returns(modules)
@@ -100,10 +101,14 @@ describe Puppet::FileServing::Configuration do
       Puppet::FileServing::Mount::Plugins.stubs(:new).returns(plugins)
       plugins.expects(:allow).with('*')
 
+      tasks = stub 'tasks', :empty? => true
+      Puppet::FileServing::Mount::Tasks.stubs(:new).returns(tasks)
+      tasks.expects(:allow).with('*')
+
       Puppet::FileServing::Configuration.configuration
     end
 
-    it "should not allow access from all to modules and plugins if the fileserver.conf provided some rules" do
+    it "should not allow access from all to modules, plugins, and tasks if the fileserver.conf provided some rules" do
       Puppet::FileSystem.expects(:exist?).returns false # the file doesn't exist
 
       modules = stub 'modules', :empty? => false
@@ -114,15 +119,20 @@ describe Puppet::FileServing::Configuration do
       Puppet::FileServing::Mount::Plugins.stubs(:new).returns(plugins)
       plugins.expects(:allow).with('*').never
 
+      tasks = stub 'tasks', :empty? => false
+      Puppet::FileServing::Mount::Tasks.stubs(:new).returns(tasks)
+      tasks.expects(:allow).with('*').never
+
       Puppet::FileServing::Configuration.configuration
     end
 
-    it "should add modules and plugins mounts even if they are not returned by the parser" do
+    it "should add modules, plugins, and tasks mounts even if they are not returned by the parser" do
       @parser.expects(:parse).returns("one" => mock("mount"))
       Puppet::FileSystem.expects(:exist?).returns true # the file doesn't exist
       config = Puppet::FileServing::Configuration.configuration
       expect(config.mounted?("modules")).to be_truthy
       expect(config.mounted?("plugins")).to be_truthy
+      expect(config.mounted?("tasks")).to be_truthy
     end
   end
 

data/spec/unit/file_serving/content_spec.rb

@@ -25,7 +25,6 @@ describe Puppet::FileServing::Content do
   it "should not retrieve and store its contents when its attributes are collected" do
     content = Puppet::FileServing::Content.new(path)
 
-    result = "foo"
     File.expects(:read).with(path).never
     content.collect
 

data/spec/unit/file_serving/fileset_spec.rb

@@ -277,7 +277,6 @@ describe Puppet::FileServing::Fileset do
     it "works when paths have regexp significant characters" do
       @path = make_absolute("/my/path/rV1x2DafFr0R6tGG+1bbk++++TM")
       stat = stub('dir_stat', :directory? => true)
-      stub_file = stub(@path, :stat => stat, :lstat => stat)
       Puppet::FileSystem.expects(:lstat).with(@path).returns stub(@path, :stat => stat, :lstat => stat)
       @fileset = Puppet::FileServing::Fileset.new(@path)
       mock_dir_structure(@path)

data/spec/unit/file_serving/metadata_spec.rb

@@ -241,7 +241,7 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
     end
   end
 
-  describe "WindowsStat", :if => Puppet.features.microsoft_windows? do
+  describe "WindowsStat", :if => Puppet::Util::Platform.windows? do
     include PuppetSpec::Files
 
     it "should return default owner, group and mode when the given path has an invalid DACL (such as a non-NTFS volume)" do
@@ -388,7 +388,7 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
     end
   end
 
-  describe "on Windows systems", :if => Puppet.features.microsoft_windows? do
+  describe "on Windows systems", :if => Puppet::Util::Platform.windows? do
     let(:owner) {'S-1-1-50'}
     let(:group) {'S-1-1-51'}
 
@@ -495,12 +495,11 @@ describe Puppet::FileServing::Metadata, " when pointing to a link", :if => Puppe
         path = "/base/path/my/file"
         @file = Puppet::FileServing::Metadata.new(path, :links => :manage)
         stat = stub("stat", :uid => 1, :gid => 2, :ftype => "link", :mode => 0755)
-        stub_file = stub(:readlink => "/some/other/path", :lstat => stat)
         Puppet::FileSystem.expects(:lstat).with(path).at_least_once.returns stat
         Puppet::FileSystem.expects(:readlink).with(path).at_least_once.returns "/some/other/path"
         @file.stubs("#{digest_algorithm}_file".intern).returns(checksum) # Remove these when :managed links are no longer checksumed.
 
-        if Puppet.features.microsoft_windows?
+        if Puppet::Util::Platform.windows?
           win_stat = stub('win_stat', :owner => 'snarf', :group => 'thundercats',
             :ftype => 'link', :mode => 0755)
           Puppet::FileServing::Metadata::WindowsStat.stubs(:new).returns win_stat
@@ -531,7 +530,7 @@ describe Puppet::FileServing::Metadata, " when pointing to a link", :if => Puppe
         Puppet::FileSystem.expects(:stat).with(path).at_least_once.returns stat
         Puppet::FileSystem.expects(:readlink).never
 
-        if Puppet.features.microsoft_windows?
+        if Puppet::Util::Platform.windows?
           win_stat = stub('win_stat', :owner => 'snarf', :group => 'thundercats',
             :ftype => 'file', :mode => 0755)
           Puppet::FileServing::Metadata::WindowsStat.stubs(:new).returns win_stat

data/spec/unit/file_serving/mount/locales_spec.rb

@@ -0,0 +1,73 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/file_serving/mount/locales'
+
+describe Puppet::FileServing::Mount::Locales do
+  before do
+    @mount = Puppet::FileServing::Mount::Locales.new("locales")
+
+    @environment = stub 'environment', :module => nil
+    @options = { :recurse => true }
+    @request = stub 'request', :environment => @environment, :options => @options
+  end
+
+  describe  "when finding files" do
+    it "should use the provided environment to find the modules" do
+      @environment.expects(:modules).returns []
+
+      @mount.find("foo", @request)
+    end
+
+    it "should return nil if no module can be found with a matching locale" do
+      mod = mock 'module'
+      mod.stubs(:locale).with("foo/bar").returns nil
+
+      @environment.stubs(:modules).returns [mod]
+      expect(@mount.find("foo/bar", @request)).to be_nil
+    end
+
+    it "should return the file path from the module" do
+      mod = mock 'module'
+      mod.stubs(:locale).with("foo/bar").returns "eh"
+
+      @environment.stubs(:modules).returns [mod]
+      expect(@mount.find("foo/bar", @request)).to eq("eh")
+    end
+  end
+
+  describe "when searching for files" do
+    it "should use the node's environment to find the modules" do
+      @environment.expects(:modules).at_least_once.returns []
+      @environment.stubs(:modulepath).returns ["/tmp/modules"]
+
+      @mount.search("foo", @request)
+    end
+
+    it "should return modulepath if no modules can be found that have locales" do
+      mod = mock 'module'
+      mod.stubs(:locales?).returns false
+
+      @environment.stubs(:modules).returns []
+      @environment.stubs(:modulepath).returns ["/"]
+      @options.expects(:[]=).with(:recurse, false)
+      expect(@mount.search("foo/bar", @request)).to eq(["/"])
+    end
+
+    it "should return nil if no modules can be found that have locales and modulepath is invalid" do
+      mod = mock 'module'
+      mod.stubs(:locales?).returns false
+
+      @environment.stubs(:modules).returns []
+      @environment.stubs(:modulepath).returns []
+      expect(@mount.search("foo/bar", @request)).to be_nil
+    end
+
+    it "should return the locale paths for each module that has locales" do
+      one = stub 'module', :locales? => true, :locale_directory => "/one"
+      two = stub 'module', :locales? => true, :locale_directory => "/two"
+
+      @environment.stubs(:modules).returns [one, two]
+      expect(@mount.search("foo/bar", @request)).to eq(%w{/one /two})
+    end
+  end
+end

data/spec/unit/file_serving/mount/modules_spec.rb

@@ -41,7 +41,7 @@ describe Puppet::FileServing::Mount::Modules do
 
   describe "when searching for files" do
     it "should fail if no module is specified" do
-      expect { @mount.find("", @request) }.to raise_error(/No module specified/)
+      expect { @mount.search("", @request) }.to raise_error(/No module specified/)
     end
 
     it "should use the node's environment to search the module" do

data/spec/unit/file_serving/mount/tasks_spec.rb

@@ -0,0 +1,72 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/file_serving/mount/tasks'
+
+describe Puppet::FileServing::Mount::Tasks do
+  before do
+    @mount = Puppet::FileServing::Mount::Tasks.new("tasks")
+
+    @environment = stub 'environment', :module => nil
+    @request = stub 'request', :environment => @environment
+  end
+
+  describe "when finding task files" do
+    it "should fail if no task is specified" do
+      expect { @mount.find("", @request) }.to raise_error(/No task specified/)
+    end
+
+    it "should use the request's environment to find the module" do
+      mod_name = 'foo'
+      @environment.expects(:module).with(mod_name)
+
+      @mount.find(mod_name, @request)
+    end
+
+    it "should use the first segment of the request's path as the module name" do
+      @environment.expects(:module).with("foo")
+      @mount.find("foo/bartask", @request)
+    end
+
+    it "should return nil if the module in the path doesn't exist" do
+      @environment.expects(:module).with("foo").returns(nil)
+      expect(@mount.find("foo/bartask", @request)).to be_nil
+    end
+
+    it "should return the file path from the module" do
+      mod = mock('module')
+      mod.expects(:task_file).with("bartask").returns("mocked")
+      @environment.expects(:module).with("foo").returns(mod)
+      expect(@mount.find("foo/bartask", @request)).to eq("mocked")
+    end
+  end
+
+  describe "when searching for task files" do
+    it "should fail if no module is specified" do
+      expect { @mount.search("", @request) }.to raise_error(/No task specified/)
+    end
+
+    it "should use the request's environment to find the module" do
+      mod_name = 'foo'
+      @environment.expects(:module).with(mod_name)
+
+      @mount.search(mod_name, @request)
+    end
+
+    it "should use the first segment of the request's path as the module name" do
+      @environment.expects(:module).with("foo")
+      @mount.search("foo/bartask", @request)
+    end
+
+    it "should return nil if the module in the path doesn't exist" do
+      @environment.expects(:module).with("foo").returns(nil)
+      expect(@mount.search("foo/bartask", @request)).to be_nil
+    end
+
+    it "should return the file path from the module" do
+      mod = mock('module')
+      mod.expects(:task_file).with("bartask").returns("mocked")
+      @environment.expects(:module).with("foo").returns(mod)
+      expect(@mount.search("foo/bartask", @request)).to eq(["mocked"])
+    end
+  end
+end

data/spec/unit/file_serving/terminus_selector_spec.rb

@@ -56,8 +56,6 @@ describe Puppet::FileServing::TerminusSelector do
       end
 
       it "should choose :file_server when default_file_terminus is file_server and no server is specified on the request" do
-        modules = mock 'modules'
-
         @request.expects(:protocol).returns "puppet"
         @request.expects(:server).returns nil
         Puppet[:default_file_terminus] = 'file_server'

data/spec/unit/file_system/path_pattern_spec.rb

@@ -91,7 +91,7 @@ describe Puppet::FileSystem::PathPattern do
       expect(Puppet::FileSystem::PathPattern.absolute("c:/absolute/windows/path").to_s).to eq("c:/absolute/windows/path")
     end
 
-    it "can be created with a '..' embedded in a filename on windows", :if => Puppet.features.microsoft_windows? do
+    it "can be created with a '..' embedded in a filename on windows", :if => Puppet::Util::Platform.windows? do
       expect(Puppet::FileSystem::PathPattern.absolute(%q{c:\..my\ot..her\one..}).to_s).to eq(%q{c:\..my\ot..her\one..})
     end
 

data/spec/unit/file_system/uniquefile_spec.rb

@@ -149,7 +149,7 @@ describe Puppet::FileSystem::Uniquefile do
       expect(File.exist?(path)).to eq(false)
     end
 
-    context "on unix platforms", :unless => Puppet.features.microsoft_windows? do
+    context "on unix platforms", :unless => Puppet::Util::Platform.windows? do
       it "close doesn't unlink if already unlinked" do
         t = tempfile("foo")
         path = t.path
@@ -173,7 +173,7 @@ describe Puppet::FileSystem::Uniquefile do
       expect(File.exist?(path)).to eq(false)
     end
 
-    context "on unix platforms", :unless => Puppet.features.microsoft_windows? do
+    context "on unix platforms", :unless => Puppet::Util::Platform.windows? do
       it "close! doesn't unlink if already unlinked" do
         t = tempfile("foo")
         path = t.path

data/spec/unit/file_system_spec.rb

@@ -167,7 +167,8 @@ describe "Puppet::FileSystem" do
       end
     end
 
-    it "excludes other processes from updating at the same time", :unless => Puppet::Util::Platform.windows? do
+    it "excludes other processes from updating at the same time",
+       unless: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
       file = file_containing("file_to_update", "0")
 
       increment_counter_in_multiple_processes(file, 5, 'r+')
@@ -175,7 +176,8 @@ describe "Puppet::FileSystem" do
       expect(Puppet::FileSystem.read(file)).to eq("5")
     end
 
-    it "excludes other processes from updating at the same time even when creating the file", :unless => Puppet::Util::Platform.windows? do
+    it "excludes other processes from updating at the same time even when creating the file",
+       unless: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
       file = tmpfile("file_to_update")
 
       increment_counter_in_multiple_processes(file, 5, 'a+')
@@ -183,7 +185,8 @@ describe "Puppet::FileSystem" do
       expect(Puppet::FileSystem.read(file)).to eq("5")
     end
 
-    it "times out if the lock cannot be acquired in a specified amount of time", :unless => Puppet::Util::Platform.windows? do
+    it "times out if the lock cannot be acquired in a specified amount of time",
+       unless: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
       file = tmpfile("file_to_update")
 
       child = spawn_process_that_locks(file)
@@ -299,7 +302,7 @@ describe "Puppet::FileSystem" do
 
   describe "symlink",
     :if => ! Puppet.features.manages_symlinks? &&
-    Puppet.features.microsoft_windows? do
+    Puppet::Util::Platform.windows? do
 
     let(:file)         { tmpfile("somefile") }
     let(:missing_file) { tmpfile("missingfile") }

data/spec/unit/forge/forge_spec.rb

@@ -62,7 +62,7 @@ describe Puppet::Forge do
 
         # ignores Puppet::Forge::Repository#read_response, provides response to fetch
         performs_an_http_request(ok_response) do |http|
-          encoded_uri = "/v3/releases?module=#{module_name}&module_groups=base%20pe"
+          encoded_uri = "/v3/releases?module=#{module_name}&sort_by=version&module_groups=base%20pe"
           http.expects(:request).with(responds_with(:path, encoded_uri))
         end
 
@@ -74,7 +74,7 @@ describe Puppet::Forge do
 
         # ignores Puppet::Forge::Repository#read_response, provides response to fetch
         performs_an_http_request(ok_response) do |http|
-          encoded_uri = "/v3/releases?module=puppetlabs-#{mixed_utf8_query_param_encoded}"
+          encoded_uri = "/v3/releases?module=puppetlabs-#{mixed_utf8_query_param_encoded}&sort_by=version"
           http.expects(:request).with(responds_with(:path, encoded_uri))
         end
 

data/spec/unit/forge/module_release_spec.rb

@@ -215,4 +215,74 @@ describe Puppet::Forge::ModuleRelease do
 
     it_behaves_like 'a module release'
   end
+
+  context 'deprecated forge module' do
+    let(:release_json) do %Q{
+    {
+      "uri": "/#{api_version}/releases/#{module_full_name_versioned}",
+      "module": {
+        "uri": "/#{api_version}/modules/#{module_full_name}",
+        "name": "#{module_name}",
+        "deprecated_at": "2017-10-10 10:21:32 -0700",
+        "owner": {
+          "uri": "/#{api_version}/users/#{module_author}",
+          "username": "#{module_author}",
+          "gravatar_id": "fdd009b7c1ec96e088b389f773e87aec"
+        }
+      },
+      "version": "#{module_version}",
+      "metadata": {
+        "types": [ ],
+        "license": "Apache 2.0",
+        "checksums": { },
+        "version": "#{module_version}",
+        "description": "Standard Library for Puppet Modules",
+        "source": "git://github.com/puppetlabs/puppetlabs-stdlib.git",
+        "project_page": "https://github.com/puppetlabs/puppetlabs-stdlib",
+        "summary": "Puppet Module Standard Library",
+        "dependencies": [
+
+        ],
+        "author": "#{module_author}",
+        "name": "#{module_full_name}"
+      },
+      "tags": [
+        "puppetlabs",
+        "library",
+        "stdlib",
+        "standard",
+        "stages"
+      ],
+      "file_uri": "/#{api_version}/files/#{module_full_name_versioned}.tar.gz",
+      "file_size": 67586,
+      "file_md5": "#{module_md5}",
+      "downloads": 610751,
+      "readme": "",
+      "changelog": "",
+      "license": "",
+      "created_at": "2013-05-13 08:31:19 -0700",
+      "updated_at": "2013-05-13 08:31:19 -0700",
+      "deleted_at": null
+    }
+    }
+    end
+
+    it_behaves_like 'a module release'
+
+    describe '#prepare' do
+      before :each do
+        release.stubs(:tmpfile).returns(mock_file)
+        release.stubs(:tmpdir).returns(mock_dir)
+        release.stubs(:download)
+        release.stubs(:validate_checksum)
+        release.stubs(:unpack)
+      end
+
+      it 'should emit warning about module deprecation' do
+        Puppet.expects(:warning).with(regexp_matches(/#{Regexp.escape(module_full_name)}.*deprecated/i))
+
+        release.prepare
+      end
+    end
+  end
 end