Address deprecation message spam in test output

Take a few minutes and address the 40+ lines of deprecation warnings
from the test framework, so nobody has to get constantly spammed while
trying to do module development anymore.

Author: greatflyingsteve

spec/unit/puppet/type/firewall_spec.rb

@@ -34,7 +34,7 @@
     end
 
     it 'does not accept a name with non-ASCII chars' do
-      expect(-> { resource[:name] = '%*#^(#$' }).to raise_error(Puppet::Error)
+      expect { resource[:name] = '%*#^(#$' }.to raise_error(Puppet::Error)
     end
   end
 
@@ -52,7 +52,7 @@
     end
 
     it 'fails when value is not recognized' do
-      expect(-> { resource[:action] = 'not valid' }).to raise_error(Puppet::Error)
+      expect { resource[:action] = 'not valid' }.to raise_error(Puppet::Error)
     end
   end
 
@@ -65,7 +65,7 @@
     end
 
     it 'fails when the chain value is not recognized' do
-      expect(-> { resource[:chain] = 'not valid' }).to raise_error(Puppet::Error)
+      expect { resource[:chain] = 'not valid' }.to raise_error(Puppet::Error)
     end
   end
 
@@ -78,7 +78,7 @@
     end
 
     it 'fails when table value is not recognized' do
-      expect(-> { resource[:table] = 'not valid' }).to raise_error(Puppet::Error)
+      expect { resource[:table] = 'not valid' }.to raise_error(Puppet::Error)
     end
   end
 
@@ -91,7 +91,7 @@
     end
 
     it 'fails when proto value is not recognized' do
-      expect(-> { resource[:proto] = 'foo' }).to raise_error(Puppet::Error)
+      expect { resource[:proto] = 'foo' }.to raise_error(Puppet::Error)
     end
   end
 
@@ -110,12 +110,12 @@
 
     ['ACCEPT', 'DROP', 'REJECT'].each do |jump|
       it "nows fail when value #{jump}" do
-        expect(-> { resource[:jump] = jump }).to raise_error(Puppet::Error)
+        expect { resource[:jump] = jump }.to raise_error(Puppet::Error)
       end
     end
 
     it 'fails when jump value is not recognized' do
-      expect(-> { resource[:jump] = '%^&*' }).to raise_error(Puppet::Error)
+      expect { resource[:jump] = '%^&*' }.to raise_error(Puppet::Error)
     end
   end
 
@@ -241,7 +241,7 @@
     end
 
     it "fails when #{addrtype} value is not recognized" do
-      expect(-> { resource[addrtype] = 'foo' }).to raise_error(Puppet::Error)
+      expect { resource[addrtype] = 'foo' }.to raise_error(Puppet::Error)
     end
   end
 
@@ -295,7 +295,7 @@
         expect(resource[:log_level]).to be 3
       }
 
-      it { expect(-> { resource[:log_level] = 'foo' }).to raise_error(Puppet::Error) }
+      it { expect { resource[:log_level] = 'foo' }.to raise_error(Puppet::Error) }
     end
   end
 
@@ -310,7 +310,7 @@
 
       [-3, 999_999].each do |v|
         it {
-          expect(-> { resource[:nflog_group] = v }).to raise_error(Puppet::Error, %r{2\^16\-1})
+          expect { resource[:nflog_group] = v }.to raise_error(Puppet::Error, %r{2\^16\-1})
         }
       end
     end
@@ -325,7 +325,7 @@
       }
 
       it {
-        expect(-> { resource[:nflog_prefix] = invalid_prefix }).to raise_error(Puppet::Error, %r{64 characters})
+        expect { resource[:nflog_prefix] = invalid_prefix }.to raise_error(Puppet::Error, %r{64 characters})
       }
     end
   end
@@ -381,14 +381,14 @@
     end
 
     it 'fails if icmp type is "any"' do
-      expect(-> { resource[:icmp] = 'any' }).to raise_error(Puppet::Error)
+      expect { resource[:icmp] = 'any' }.to raise_error(Puppet::Error)
     end
     it 'fails if icmp type is an array' do
-      expect(-> { resource[:icmp] = "['0', '8']" }).to raise_error(Puppet::Error)
+      expect { resource[:icmp] = "['0', '8']" }.to raise_error(Puppet::Error)
     end
 
     it 'fails if icmp type cannot be mapped to a numeric' do
-      expect(-> { resource[:icmp] = 'foo' }).to raise_error(Puppet::Error)
+      expect { resource[:icmp] = 'foo' }.to raise_error(Puppet::Error)
     end
   end
 
@@ -603,10 +603,10 @@
     end
 
     it 'fails if value is not numeric' do
-      expect(-> { resource[:burst] = 'foo' }).to raise_error(Puppet::Error)
+      expect { resource[:burst] = 'foo' }.to raise_error(Puppet::Error)
     end
     it 'fails if value contains /sec' do
-      expect(-> { resource[:burst] = '1500/sec' }).to raise_error(Puppet::Error)
+      expect { resource[:burst] = '1500/sec' }.to raise_error(Puppet::Error)
     end
   end
 
@@ -665,7 +665,7 @@
             expect(resource[:set_mark]).to eql '0x3e8'
           end
           it 'fails if mask is present' do
-            expect(-> { resource[:set_mark] = '0x3e8/0xffffffff' }).to raise_error(
+            expect { resource[:set_mark] = '0x3e8/0xffffffff' }.to raise_error(
               Puppet::Error, %r{iptables version #{iptables_version} does not support masks on MARK rules$}
             )
           end
@@ -693,24 +693,24 @@
             expect(resource[:set_mark]).to eql '0x3e8/0x4'
           end
           it 'fails if mask value is more than 32 bits' do
-            expect(-> { resource[:set_mark] = '1/4294967296' }).to raise_error(
+            expect { resource[:set_mark] = '1/4294967296' }.to raise_error(
               Puppet::Error, %r{MARK mask must be integer or hex between 0 and 0xffffffff$}
             )
           end
           it 'fails if mask is malformed' do
-            expect(-> { resource[:set_mark] = '1000/0xq4' }).to raise_error(
+            expect { resource[:set_mark] = '1000/0xq4' }.to raise_error(
               Puppet::Error, %r{MARK mask must be integer or hex between 0 and 0xffffffff$}
             )
           end
         end
 
         ['/', '1000/', 'pwnie'].each do |bad_mark|
           it "fails with malformed mark '#{bad_mark}'" do
-            expect(-> { resource[:set_mark] = bad_mark }).to raise_error(Puppet::Error)
+            expect { resource[:set_mark] = bad_mark }.to raise_error(Puppet::Error)
           end
         end
         it 'fails if mark value is more than 32 bits' do
-          expect(-> { resource[:set_mark] = '4294967296' }).to raise_error(
+          expect { resource[:set_mark] = '4294967296' }.to raise_error(
             Puppet::Error, %r{MARK value must be integer or hex between 0 and 0xffffffff$}
           )
         end
@@ -877,7 +877,7 @@
     end
 
     it 'fails when the pkttype value is not recognized' do
-      expect(-> { resource[:pkttype] = 'not valid' }).to raise_error(Puppet::Error)
+      expect { resource[:pkttype] = 'not valid' }.to raise_error(Puppet::Error)
     end
   end
 

spec/unit/puppet/util/ipcidr_spec.rb

@@ -40,10 +40,10 @@
 
     let(:ipcidr) { Puppet::Util::IPCidr.new('96.126.112.20/24') }
 
-    specify { host.cidr.should == '96.126.112.0/24' } # .20 is expected to
+    it { expect(host.cidr).to eql '96.126.112.0/24' } # .20 is expected to
     # be silently dropped.
-    specify { host.prefixlen.should == 24 }
-    specify { host.netmask.should == '255.255.255.0' }
+    it { expect(host.prefixlen).to be 24 }
+    it { expect(host.netmask).to eql '255.255.255.0' }
   end
 
   describe 'ipv4 open range with cidr' do