puppet 3.8.7 → 4.0.0.rc1

data/spec/unit/module_tool/install_directory_spec.rb

@@ -4,9 +4,9 @@ require 'puppet/module_tool/install_directory'
 describe Puppet::ModuleTool::InstallDirectory do
   def expect_normal_results
     results = installer.run
-    results[:installed_modules].length.should eq 1
-    results[:installed_modules][0][:module].should == "pmtacceptance-stdlib"
-    results[:installed_modules][0][:version][:vstring].should == "1.0.0"
+    expect(results[:installed_modules].length).to eq 1
+    expect(results[:installed_modules][0][:module]).to eq("pmtacceptance-stdlib")
+    expect(results[:installed_modules][0][:version][:vstring]).to eq("1.0.0")
     results
   end
 

data/spec/unit/module_tool/metadata_spec.rb

@@ -25,18 +25,18 @@ describe Puppet::ModuleTool::Metadata do
       let(:data) { { 'name' => 'billgates-mymodule' } }
 
       it "extracts the author name from the name field" do
-        subject.to_hash['author'].should == 'billgates'
+        expect(subject.to_hash['author']).to eq('billgates')
       end
 
       it "extracts a module name from the name field" do
-        subject.module_name.should == 'mymodule'
+        expect(subject.module_name).to eq('mymodule')
       end
 
       context "and existing author" do
         before { metadata.update('author' => 'foo') }
 
         it "avoids overwriting the existing author" do
-          subject.to_hash['author'].should == 'foo'
+          expect(subject.to_hash['author']).to eq('foo')
         end
       end
     end
@@ -45,14 +45,14 @@ describe Puppet::ModuleTool::Metadata do
       let(:data) { { 'name' => 'billgates-mymodule', 'author' => 'foo' } }
 
       it "use the author name from the author field" do
-        subject.to_hash['author'].should == 'foo'
+        expect(subject.to_hash['author']).to eq('foo')
       end
 
       context "and preexisting author" do
         before { metadata.update('author' => 'bar') }
 
         it "avoids overwriting the existing author" do
-          subject.to_hash['author'].should == 'foo'
+          expect(subject.to_hash['author']).to eq('foo')
         end
       end
     end
@@ -122,11 +122,11 @@ describe Puppet::ModuleTool::Metadata do
           before { metadata.update('source' => 'https://github.com/billgates/amazingness') }
 
           it "predicts a default project_page" do
-            subject.to_hash['project_page'].should == 'https://github.com/billgates/amazingness'
+            expect(subject.to_hash['project_page']).to eq('https://github.com/billgates/amazingness')
           end
 
           it "predicts a default issues_url" do
-            subject.to_hash['issues_url'].should == 'https://github.com/billgates/amazingness/issues'
+            expect(subject.to_hash['issues_url']).to eq('https://github.com/billgates/amazingness/issues')
           end
         end
 
@@ -134,11 +134,11 @@ describe Puppet::ModuleTool::Metadata do
           before { metadata.update('source' => 'github.com/billgates/amazingness') }
 
           it "predicts a default project_page" do
-            subject.to_hash['project_page'].should == 'https://github.com/billgates/amazingness'
+            expect(subject.to_hash['project_page']).to eq('https://github.com/billgates/amazingness')
           end
 
           it "predicts a default issues_url" do
-            subject.to_hash['issues_url'].should == 'https://github.com/billgates/amazingness/issues'
+            expect(subject.to_hash['issues_url']).to eq('https://github.com/billgates/amazingness/issues')
           end
         end
       end
@@ -147,11 +147,11 @@ describe Puppet::ModuleTool::Metadata do
         before { metadata.update('source' => 'https://notgithub.com/billgates/amazingness') }
 
         it "does not predict a default project_page" do
-          subject.to_hash['project_page'].should be nil
+          expect(subject.to_hash['project_page']).to be nil
         end
 
         it "does not predict a default issues_url" do
-          subject.to_hash['issues_url'].should be nil
+          expect(subject.to_hash['issues_url']).to be nil
         end
       end
 
@@ -159,11 +159,11 @@ describe Puppet::ModuleTool::Metadata do
         before { metadata.update('source' => 'my brain') }
 
         it "does not predict a default project_page" do
-          subject.to_hash['project_page'].should be nil
+          expect(subject.to_hash['project_page']).to be nil
         end
 
         it "does not predict a default issues_url" do
-          subject.to_hash['issues_url'].should be nil
+          expect(subject.to_hash['issues_url']).to be nil
         end
       end
 
@@ -173,7 +173,7 @@ describe Puppet::ModuleTool::Metadata do
       let(:data) { {'dependencies' => [{'name' => 'puppetlabs-goodmodule'}] }}
 
       it "adds the dependency" do
-        subject.dependencies.size.should == 1
+        expect(subject.dependencies.size).to eq(1)
       end
     end
 
@@ -189,7 +189,7 @@ describe Puppet::ModuleTool::Metadata do
       let(:data) { {'dependencies' => [{'name' => 'puppetlabs-badmodule', 'version_requirement' => '>= 2.0.0'}] }}
 
       it "adds the dependency" do
-        subject.dependencies.size.should == 1
+        expect(subject.dependencies.size).to eq(1)
       end
     end
 
@@ -221,7 +221,7 @@ describe Puppet::ModuleTool::Metadata do
 
       it "with the same version does not add another dependency" do
         metadata.add_dependency('puppetlabs-origmodule', '1.0.0')
-        subject.dependencies.size.should == 1
+        expect(subject.dependencies.size).to eq(1)
       end
     end
   end
@@ -233,17 +233,17 @@ describe Puppet::ModuleTool::Metadata do
 
     it 'returns a hyphenated string containing namespace and module name' do
       data = metadata.update('name' => 'foo-bar')
-      data.dashed_name.should == 'foo-bar'
+      expect(data.dashed_name).to eq('foo-bar')
     end
 
     it 'properly handles slash-separated names' do
       data = metadata.update('name' => 'foo/bar')
-      data.dashed_name.should == 'foo-bar'
+      expect(data.dashed_name).to eq('foo-bar')
     end
 
     it 'is unaffected by author name' do
       data = metadata.update('name' => 'foo/bar', 'author' => 'me')
-      data.dashed_name.should == 'foo-bar'
+      expect(data.dashed_name).to eq('foo-bar')
     end
   end
 
@@ -258,12 +258,12 @@ describe Puppet::ModuleTool::Metadata do
 
     it 'returns a hyphenated string containing module name and version' do
       data = metadata.update('name' => 'foo/bar', 'version' => '1.0.0')
-      data.release_name.should == 'foo-bar-1.0.0'
+      expect(data.release_name).to eq('foo-bar-1.0.0')
     end
 
     it 'is unaffected by author name' do
       data = metadata.update('name' => 'foo/bar', 'version' => '1.0.0', 'author' => 'me')
-      data.release_name.should == 'foo-bar-1.0.0'
+      expect(data.release_name).to eq('foo-bar-1.0.0')
     end
   end
 
@@ -271,18 +271,18 @@ describe Puppet::ModuleTool::Metadata do
     subject { metadata.to_hash }
 
     it "contains the default set of keys" do
-      subject.keys.sort.should == %w[ name version author summary license source issues_url project_page dependencies ].sort
+      expect(subject.keys.sort).to eq(%w[ name version author summary license source issues_url project_page dependencies ].sort)
     end
 
     describe "['license']" do
       it "defaults to Apache 2" do
-        subject['license'].should == "Apache 2.0"
+        expect(subject['license']).to eq("Apache-2.0")
       end
     end
 
     describe "['dependencies']" do
       it "defaults to an empty set" do
-        subject['dependencies'].should == Set.new
+        expect(subject['dependencies']).to eq(Set.new)
       end
     end
 
@@ -290,11 +290,11 @@ describe Puppet::ModuleTool::Metadata do
       subject { metadata.update('license' => 'MIT', 'non-standard' => 'yup').to_hash }
 
       it "overrides the defaults" do
-        subject['license'].should == 'MIT'
+        expect(subject['license']).to eq('MIT')
       end
 
       it 'contains unanticipated values' do
-        subject['non-standard'].should == 'yup'
+        expect(subject['non-standard']).to eq('yup')
       end
     end
   end

data/spec/unit/module_tool/tar/gnu_spec.rb

@@ -11,7 +11,7 @@ describe Puppet::ModuleTool::Tar::Gnu do
     Dir.expects(:chdir).with(File.expand_path(destdir)).yields(mock)
     Puppet::Util::Execution.expects(:execute).with("gzip -dc #{Shellwords.shellescape(File.expand_path(sourcefile))} | tar xof -")
     Puppet::Util::Execution.expects(:execute).with("find . -type d -exec chmod 755 {} +")
-    Puppet::Util::Execution.expects(:execute).with("find . -type f -exec chmod a-wst {} +")
+    Puppet::Util::Execution.expects(:execute).with("find . -type f -exec chmod u+rw,g+r,a-st {} +")
     Puppet::Util::Execution.expects(:execute).with("chown -R <owner:group> .")
     subject.unpack(sourcefile, destdir, '<owner:group>')
   end

data/spec/unit/module_tool/tar/mini_spec.rb

@@ -42,7 +42,7 @@ describe Puppet::ModuleTool::Tar::Mini, :if => (Puppet.features.minitar? and Pup
   end
 
   it "packs a tar file" do
-    writer = mock('GzipWriter')
+    writer = stub('GzipWriter')
 
     Zlib::GzipWriter.expects(:open).with(destfile).yields(writer)
     Archive::Tar::Minitar.expects(:pack).with(sourcedir, writer)
@@ -51,7 +51,7 @@ describe Puppet::ModuleTool::Tar::Mini, :if => (Puppet.features.minitar? and Pup
   end
 
   def unpacks_the_entry(type, name)
-    reader = mock('GzipReader')
+    reader = stub('GzipReader')
 
     Zlib::GzipReader.expects(:open).with(sourcefile).yields(reader)
     minitar.expects(:find_valid_files).with(reader).returns([name])

data/spec/unit/module_tool/tar_spec.rb

@@ -8,7 +8,7 @@ describe Puppet::ModuleTool::Tar do
     Puppet::Util.stubs(:which).with('tar').returns '/usr/bin/tar'
     Puppet::Util::Platform.stubs(:windows?).returns false
 
-    described_class.instance.should be_a_kind_of Puppet::ModuleTool::Tar::Gnu
+    expect(described_class.instance).to be_a_kind_of Puppet::ModuleTool::Tar::Gnu
   end
 
   it "falls back to minitar when it and zlib are present" do
@@ -17,7 +17,7 @@ describe Puppet::ModuleTool::Tar do
     Puppet::Util::Platform.stubs(:windows?).returns true
     Puppet.stubs(:features).returns(stub(:minitar? => true, :zlib? => true))
 
-    described_class.instance.should be_a_kind_of Puppet::ModuleTool::Tar::Mini
+    expect(described_class.instance).to be_a_kind_of Puppet::ModuleTool::Tar::Mini
   end
 
   it "fails when there is no possible implementation" do

data/spec/unit/module_tool_spec.rb

@@ -6,29 +6,18 @@ require 'puppet/module_tool'
 
 describe Puppet::ModuleTool do
   describe '.is_module_root?' do
-    it 'should return true if directory has a Modulefile file' do
-      FileTest.expects(:file?).with(responds_with(:to_s, '/a/b/c/metadata.json')).
-        returns(false)
-      FileTest.expects(:file?).with(responds_with(:to_s, '/a/b/c/Modulefile')).
-        returns(true)
-
-      subject.is_module_root?(Pathname.new('/a/b/c')).should be_true
-    end
-
     it 'should return true if directory has a metadata.json file' do
       FileTest.expects(:file?).with(responds_with(:to_s, '/a/b/c/metadata.json')).
         returns(true)
 
-      subject.is_module_root?(Pathname.new('/a/b/c')).should be_true
+      expect(subject.is_module_root?(Pathname.new('/a/b/c'))).to be_truthy
     end
 
-    it 'should return false if directory does not have a metadata.json or a Modulefile file' do
+    it 'should return false if directory does not have a metadata.json file' do
       FileTest.expects(:file?).with(responds_with(:to_s, '/a/b/c/metadata.json')).
         returns(false)
-      FileTest.expects(:file?).with(responds_with(:to_s, '/a/b/c/Modulefile')).
-        returns(false)
 
-      subject.is_module_root?(Pathname.new('/a/b/c')).should be_false
+      expect(subject.is_module_root?(Pathname.new('/a/b/c'))).to be_falsey
     end
   end
 
@@ -39,7 +28,7 @@ describe Puppet::ModuleTool do
       Puppet::ModuleTool.expects(:is_module_root?).with(sample_path).
         returns(true)
 
-      subject.find_module_root(sample_path).should == sample_path
+      expect(subject.find_module_root(sample_path)).to eq(sample_path)
     end
 
     it 'should return a parent path as a pathname when it contains a module file' do
@@ -48,23 +37,23 @@ describe Puppet::ModuleTool do
       Puppet::ModuleTool.expects(:is_module_root?).
         with(responds_with(:to_s, File.expand_path('/a/b'))).returns(true)
 
-      subject.find_module_root(sample_path).should == Pathname.new('/a/b').expand_path
+      expect(subject.find_module_root(sample_path)).to eq(Pathname.new('/a/b').expand_path)
     end
 
     it 'should return nil when no module root can be found' do
       Puppet::ModuleTool.expects(:is_module_root?).at_least_once.returns(false)
-      subject.find_module_root(sample_path).should be_nil
+      expect(subject.find_module_root(sample_path)).to be_nil
     end
   end
 
   describe '.format_tree' do
     it 'should return an empty tree when given an empty list' do
-      subject.format_tree([]).should == ''
+      expect(subject.format_tree([])).to eq('')
     end
 
     it 'should return a shallow when given a list without dependencies' do
       list = [ { :text => 'first' }, { :text => 'second' }, { :text => 'third' } ]
-      subject.format_tree(list).should == <<-TREE
+      expect(subject.format_tree(list)).to eq <<-TREE
 ├── first
 ├── second
 └── third
@@ -85,7 +74,7 @@ TREE
           ]
         },
       ]
-      subject.format_tree(list).should == <<-TREE
+      expect(subject.format_tree(list)).to eq <<-TREE
 └─┬ first
   └─┬ second
     └── third
@@ -107,7 +96,7 @@ TREE
         },
         { :text => 'fourth' }
       ]
-      subject.format_tree(list).should == <<-TREE
+      expect(subject.format_tree(list)).to eq <<-TREE
 ├─┬ first
 │ └─┬ second
 │   └── third
@@ -130,7 +119,7 @@ TREE
           ]
         }
       ]
-      subject.format_tree(list).should == <<-TREE
+      expect(subject.format_tree(list)).to eq <<-TREE
 └─┬ first
   ├─┬ second
   │ └── third
@@ -154,7 +143,7 @@ TREE
         },
         { :text => 'fifth' }
       ]
-      subject.format_tree(list).should == <<-TREE
+      expect(subject.format_tree(list)).to eq <<-TREE
 ├─┬ first
 │ ├─┬ second
 │ │ └── third
@@ -176,10 +165,7 @@ TREE
     end
 
     around do |example|
-      envs = Puppet::Environments::Combined.new(
-        Puppet::Environments::Static.new(environment),
-        Puppet::Environments::Legacy.new
-      )
+      envs = Puppet::Environments::Static.new(environment)
 
       Puppet.override(:environments => envs) do
         example.run
@@ -313,13 +299,6 @@ TREE
       expect(expr).to eql('1.2.x')
     end
 
-    it 'parses a dependency with a version range expression in the (deprecated) versionRange key' do
-      name, range, expr = subject.parse_module_dependency('source', 'name' => 'foo-bar', 'versionRequirement' => '1.2.x')
-      expect(name).to eql('foo-bar')
-      expect(range).to eql(Semantic::VersionRange.parse('1.2.x'))
-      expect(expr).to eql('1.2.x')
-    end
-
     it 'does not raise an error on invalid version range expressions' do
       name, range, expr = subject.parse_module_dependency('source', 'name' => 'foo-bar', 'version_requirement' => 'nope')
       expect(name).to eql('foo-bar')

data/spec/unit/network/auth_config_parser_spec.rb

@@ -11,25 +11,25 @@ describe Puppet::Network::AuthConfigParser do
 
   describe "Basic Parser" do
     it "should accept a string by default" do
-      described_class.new(fake_authconfig).parse.should be_a_kind_of Puppet::Network::AuthConfig
+      expect(described_class.new(fake_authconfig).parse).to be_a_kind_of Puppet::Network::AuthConfig
     end
   end
 
   describe "when parsing rights" do
     it "skips comments" do
-      described_class.new('  # comment\n').parse_rights.should be_empty
+      expect(described_class.new('  # comment\n').parse_rights).to be_empty
     end
 
     it "increments line number even on commented lines" do
-      described_class.new("  # comment\npath /").parse_rights['/'].line.should == 2
+      expect(described_class.new("  # comment\npath /").parse_rights['/'].line).to eq(2)
     end
 
     it "skips blank lines" do
-      described_class.new('  ').parse_rights.should be_empty
+      expect(described_class.new('  ').parse_rights).to be_empty
     end
 
     it "increments line number even on blank lines" do
-      described_class.new("  \npath /").parse_rights['/'].line.should == 2
+      expect(described_class.new("  \npath /").parse_rights['/'].line).to eq(2)
     end
 
     it "does not throw an error if the same path appears twice" do
@@ -39,11 +39,11 @@ describe Puppet::Network::AuthConfigParser do
     end
 
     it "should create a new right for each found path line" do
-      described_class.new('path /certificates').parse_rights['/certificates'].should be
+      expect(described_class.new('path /certificates').parse_rights['/certificates']).to be
     end
 
     it "should create a new right for each found regex line" do
-      described_class.new('path ~ .rb$').parse_rights['.rb$'].should be
+      expect(described_class.new('path ~ .rb$').parse_rights['.rb$']).to be
     end
 
     it "should strip whitespace around ACE" do

data/spec/unit/network/authconfig_spec.rb

@@ -27,27 +27,27 @@ describe Puppet::Network::AuthConfig do
 
     it "should create a new right for each default acl" do
       @authconfig.mk_acl(:acl => '/')
-      @authconfig.rights['/'].should be
+      expect(@authconfig.rights['/']).to be
     end
 
     it "allows everyone for each default right" do
       @authconfig.mk_acl(:acl => '/')
-      @authconfig.rights['/'].should be_globalallow
+      expect(@authconfig.rights['/']).to be_globalallow
     end
 
     it "accepts an argument to restrict the method" do
       @authconfig.mk_acl(:acl => '/', :method => :find)
-      @authconfig.rights['/'].methods.should == [:find]
+      expect(@authconfig.rights['/'].methods).to eq([:find])
     end
 
     it "creates rights with authentication set to true by default" do
       @authconfig.mk_acl(:acl => '/')
-      @authconfig.rights['/'].authentication.should be_true
+      expect(@authconfig.rights['/'].authentication).to be_truthy
     end
 
     it "accepts an argument to set the authentication requirement" do
       @authconfig.mk_acl(:acl => '/', :authenticated => :any)
-      @authconfig.rights['/'].authentication.should be_false
+      expect(@authconfig.rights['/'].authentication).to be_falsey
     end
   end
 
@@ -58,7 +58,7 @@ describe Puppet::Network::AuthConfig do
       Puppet::Network::AuthConfig.any_instance.unstub(:insert_default_acl)
     end
 
-    Puppet::Network::AuthConfig::DEFAULT_ACL.each do |acl|
+    Puppet::Network::AuthConfig::default_acl.each do |acl|
       it "should create a default right for #{acl[:acl]}" do
         @authconfig.stubs(:mk_acl)
         @authconfig.expects(:mk_acl).with(acl)
@@ -75,13 +75,13 @@ describe Puppet::Network::AuthConfig do
       @authconfig.stubs(:mk_acl)
 
       @authconfig.insert_default_acl
-      @authconfig.rights['/'].should be_empty
-      @authconfig.rights['/'].authentication.should be_false
+      expect(@authconfig.rights['/']).to be_empty
+      expect(@authconfig.rights['/'].authentication).to be_falsey
     end
 
     it '(CVE-2013-2275) allows report submission only for the node matching the certname by default' do
       acl = {
-        :acl => "~ ^\/report\/([^\/]+)$",
+        :acl => "~ ^#{Puppet::Network::HTTP::MASTER_URL_PREFIX}\/v3\/report\/([^\/]+)$",
         :method => :save,
         :allow => '$1',
         :authenticated => true