Merge pull request #856 from pegasd/type_alias_tests_rewrite

Updated type alias tests and dropped superfluous wrapper classes

Author: pmcmaw

spec/fixtures/test/manifests/absolute_path.pp

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'test::absolute_path', type: :class do
+  describe 'Stdlib::Compat::Absolute_path' do
     describe 'valid paths handling' do
       %w[
         C:/
@@ -20,9 +20,7 @@
         /var/ネット
       ].each do |value|
         describe value.inspect do
-          let(:params) { { value: value } }
-
-          it { is_expected.to compile }
+          it { is_expected.to allow_value(value) }
         end
       end
     end
@@ -38,9 +36,7 @@
           '',
         ].each do |value|
           describe value.inspect do
-            let(:params) { { value: value } }
-
-            it { is_expected.to compile.and_raise_error(%r{parameter 'value' expects a match for Stdlib::Compat::Absolute_path}) }
+            it { is_expected.not_to allow_value(value) }
           end
         end
       end
@@ -59,9 +55,7 @@
           \var\ネット
         ].each do |value|
           describe value.inspect do
-            let(:params) { { value: value } }
-
-            it { is_expected.to compile.and_raise_error(%r{parameter 'value' expects a match for Stdlib::Compat::Absolute_path}) }
+            it { is_expected.not_to allow_value(value) }
           end
         end
       end

spec/fixtures/test/manifests/absolutepath.pp

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'test::array', type: :class do
+  describe 'Stdlib::Compat::Array' do
     describe 'accepts arrays' do
       [
         [],
@@ -11,9 +11,7 @@
         [[]],
       ].each do |value|
         describe value.inspect do
-          let(:params) { { value: value } }
-
-          it { is_expected.to compile }
+          it { is_expected.to allow_value(value) }
         end
       end
     end
@@ -26,9 +24,7 @@
         {},
       ].each do |value|
         describe value.inspect do
-          let(:params) { { value: value } }
-
-          it { is_expected.to compile.and_raise_error(%r{parameter 'value' expects a Stdlib::Compat::Array}) }
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end

spec/fixtures/test/manifests/array.pp

@@ -1,16 +1,14 @@
 require 'spec_helper'
 
 if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'test::bool', type: :class do
+  describe 'Stdlib::Compat::Bool' do
     describe 'accepts booleans' do
       [
         true,
         false,
       ].each do |value|
         describe value.inspect do
-          let(:params) { { value: value } }
-
-          it { is_expected.to compile }
+          it { is_expected.to allow_value(value) }
         end
       end
     end
@@ -24,9 +22,7 @@
         'false',
       ].each do |value|
         describe value.inspect do
-          let(:params) { { value: value } }
-
-          it { is_expected.to compile.and_raise_error(%r{parameter 'value' expects a Stdlib::Compat::Bool}) }
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end

spec/fixtures/test/manifests/bool.pp

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'test::filemode', type: :class do
+  describe 'Stdlib::Filemode' do
     describe 'valid modes' do
       %w[
         0644
@@ -12,9 +12,7 @@
         0777
       ].each do |value|
         describe value.inspect do
-          let(:params) { { value: value } }
-
-          it { is_expected.to compile }
+          it { is_expected.to allow_value(value) }
         end
       end
     end
@@ -39,9 +37,7 @@
           '0649',
         ].each do |value|
           describe value.inspect do
-            let(:params) { { value: value } }
-
-            it { is_expected.to compile.and_raise_error(%r{parameter 'value' expects a match for Stdlib::Filemode}) }
+            it { is_expected.not_to allow_value(value) }
           end
         end
       end

spec/fixtures/test/manifests/filemode.pp

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'test::float', type: :class do
+  describe 'Stdlib::Compat::Float' do
     describe 'accepts floats' do
       [
         3.7,
@@ -10,19 +10,15 @@
         '-342.2315e-12',
       ].each do |value|
         describe value.inspect do
-          let(:params) { { value: value } }
-
-          it { is_expected.to compile }
+          it { is_expected.to allow_value(value) }
         end
       end
     end
 
     describe 'rejects other values' do
       [true, 'true', false, 'false', 'iAmAString', '1test', '1 test', 'test 1', 'test 1 test', {}, { 'key' => 'value' }, { 1 => 2 }, '', :undef, 'x', 3, '3', -3, '-3'].each do |value|
         describe value.inspect do
-          let(:params) { { value: value } }
-
-          it { is_expected.to compile.and_raise_error(%r{parameter 'value' expects.*Float.*Pattern}) }
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end

spec/fixtures/test/manifests/float.pp

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'test::hash', type: :class do
+  describe 'Stdlib::Compat::Hash' do
     describe 'accepts hashes' do
       [
         {},
@@ -10,9 +10,7 @@
         { '001' => 'helly' },
       ].each do |value|
         describe value.inspect do
-          let(:params) { { value: value } }
-
-          it { is_expected.to compile }
+          it { is_expected.to allow_value(value) }
         end
       end
     end
@@ -24,9 +22,7 @@
         [],
       ].each do |value|
         describe value.inspect do
-          let(:params) { { value: value } }
-
-          it { is_expected.to compile.and_raise_error(%r{parameter 'value' expects a Stdlib::Compat::Hash}) }
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end

spec/fixtures/test/manifests/hash.pp

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'test::httpsurl', type: :class do
+  describe 'Stdlib::HTTPSUrl' do
     describe 'valid handling' do
       %w[
         https://hello.com
@@ -11,9 +11,7 @@
         https://graphemica.com/緩
       ].each do |value|
         describe value.inspect do
-          let(:params) { { value: value } }
-
-          it { is_expected.to compile }
+          it { is_expected.to allow_value(value) }
         end
       end
     end
@@ -34,9 +32,7 @@
           'http://graphemica.com/緩',
         ].each do |value|
           describe value.inspect do
-            let(:params) { { value: value } }
-
-            it { is_expected.to compile.and_raise_error(%r{parameter 'value' expects a match for Stdlib::HTTPSUrl}) }
+            it { is_expected.not_to allow_value(value) }
           end
         end
       end

spec/fixtures/test/manifests/httpsurl.pp

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'test::httpurl', type: :class do
+  describe 'Stdlib::HTTPUrl' do
     describe 'valid handling' do
       %w[
         https://hello.com
@@ -14,9 +14,7 @@
         http://graphemica.com/緩
       ].each do |value|
         describe value.inspect do
-          let(:params) { { value: value } }
-
-          it { is_expected.to compile }
+          it { is_expected.to allow_value(value) }
         end
       end
     end
@@ -37,9 +35,7 @@
           'https:graphemica.com/緩',
         ].each do |value|
           describe value.inspect do
-            let(:params) { { value: value } }
-
-            it { is_expected.to compile.and_raise_error(%r{parameter 'value' expects a match for Stdlib::HTTPUrl}) }
+            it { is_expected.not_to allow_value(value) }
           end
         end
       end