From 45766af6dfd0bd20be942f6892c79ea877c5afbb Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sun, 9 Jun 2024 15:19:50 +0200
Subject: [PATCH 1/2] Consistently use the be_a Hash assertion

This is a more native way of asserting it's a certain class.
---
 spec/rspec_puppet_facts_spec.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/spec/rspec_puppet_facts_spec.rb b/spec/rspec_puppet_facts_spec.rb
index c40a3498..64621f1b 100644
--- a/spec/rspec_puppet_facts_spec.rb
+++ b/spec/rspec_puppet_facts_spec.rb
@@ -357,7 +357,7 @@
       end
 
       it 'returns a hash' do
-        expect(subject.class).to eq Hash
+        expect(subject).to be_a Hash
       end
 
       it 'has 3 elements' do
@@ -387,7 +387,7 @@
       }
 
       it 'returns a hash' do
-        expect(subject.class).to eq Hash
+        expect(subject).to be_a Hash
       end
 
       it 'has 1 elements' do
@@ -419,7 +419,7 @@
       }
 
       it 'returns a hash' do
-        expect(subject.class).to eq Hash
+        expect(subject).to be_a Hash
       end
 
       it 'has 1 elements' do
@@ -451,7 +451,7 @@
       }
 
       it 'returns a hash' do
-        expect(subject.class).to eq Hash
+        expect(subject).to be_a Hash
       end
 
       it 'has 1 elements' do
@@ -483,7 +483,7 @@
       }
 
       it 'returns a hash' do
-        expect(subject.class).to eq Hash
+        expect(subject).to be_a Hash
       end
 
       it 'has 1 elements' do
@@ -566,7 +566,7 @@
       }
 
       it 'returns a hash' do
-        expect(subject.class).to eq Hash
+        expect(subject).to be_a Hash
       end
 
       it 'has 1 elements' do
@@ -625,7 +625,7 @@
       }
 
       it 'returns a hash' do
-        expect(subject.class).to eq Hash
+        expect(subject).to be_a Hash
       end
 
       it 'has 2 elements' do

From 907fdf9a42e23451dc4840faed26db4adedcd7b9 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sun, 9 Jun 2024 15:32:47 +0200
Subject: [PATCH 2/2] Use contain_exactly to assert results

This is a more native way to assert results, meaning asserting the size
is redundant.
---
 spec/rspec_puppet_facts_spec.rb | 125 ++++++++++----------------------
 1 file changed, 40 insertions(+), 85 deletions(-)

diff --git a/spec/rspec_puppet_facts_spec.rb b/spec/rspec_puppet_facts_spec.rb
index 64621f1b..bf10188d 100644
--- a/spec/rspec_puppet_facts_spec.rb
+++ b/spec/rspec_puppet_facts_spec.rb
@@ -209,26 +209,22 @@
             is_expected.to be_a Hash
           end
 
-          it 'has 5 elements' do
-            expect(subject.size).to eq 5
-          end
-
           it 'returns supported OS' do
-            expect(subject.keys.sort).to eq %w(
-              debian-11-x86_64
-              debian-12-x86_64
-              redhat-7-x86_64
-              redhat-8-x86_64
-              redhat-9-x86_64
+            expect(subject.keys).to contain_exactly(
+              'debian-11-x86_64',
+              'debian-12-x86_64',
+              'redhat-7-x86_64',
+              'redhat-8-x86_64',
+              'redhat-9-x86_64',
             )
           end
 
           it 'is able to filter the received OS facts' do
             allow(described_class).to receive(:spec_facts_os_filter).and_return('redhat')
-            expect(subject.keys.sort).to eq %w(
-              redhat-7-x86_64
-              redhat-8-x86_64
-              redhat-9-x86_64
+            expect(subject.keys).to contain_exactly(
+              'redhat-7-x86_64',
+              'redhat-8-x86_64',
+              'redhat-9-x86_64',
             )
           end
         end
@@ -288,24 +284,20 @@
         is_expected.to be_a Hash
       end
 
-      it 'has 4 elements' do
-        expect(subject.size).to eq 4
-      end
-
       it 'returns supported OS' do
-        expect(subject.keys.sort).to eq %w(
-          debian-11-x86_64
-          debian-12-x86_64
-          redhat-8-x86_64
-          redhat-9-x86_64
+        expect(subject.keys).to contain_exactly(
+          'debian-11-x86_64',
+          'debian-12-x86_64',
+          'redhat-8-x86_64',
+          'redhat-9-x86_64',
         )
       end
 
       it 'is able to filter the received OS facts' do
         allow(described_class).to receive(:spec_facts_os_filter).and_return('redhat')
-        expect(subject.keys.sort).to eq %w(
-          redhat-8-x86_64
-          redhat-9-x86_64
+        expect(subject.keys).to contain_exactly(
+          'redhat-8-x86_64',
+          'redhat-9-x86_64',
         )
       end
     end
@@ -325,12 +317,8 @@
         expect(factsets).to be_a(Hash)
       end
 
-      it 'returns a single fact set' do
-        expect(factsets.size).to eq(1)
-      end
-
       it 'returns a fact set for the specified release' do
-        expect(factsets).to include('redhat-9-x86_64' => include(:operatingsystemmajrelease => '9'))
+        expect(factsets).to match('redhat-9-x86_64' => include(:operatingsystemmajrelease => '9'))
       end
     end
 
@@ -352,20 +340,16 @@
         )
       }
 
-      let(:expected_fact_sets) do
-        ['ubuntu-18.04-x86_64', 'ubuntu-20.04-x86_64', 'ubuntu-22.04-x86_64']
-      end
-
       it 'returns a hash' do
         expect(subject).to be_a Hash
       end
 
-      it 'has 3 elements' do
-        expect(subject.size).to eq(expected_fact_sets.size)
-      end
-
       it 'returns supported OS' do
-        expect(subject.keys.sort).to eq(expected_fact_sets)
+        expect(subject.keys).to contain_exactly(
+          'ubuntu-18.04-x86_64',
+          'ubuntu-20.04-x86_64',
+          'ubuntu-22.04-x86_64',
+        )
       end
     end
 
@@ -390,14 +374,10 @@
         expect(subject).to be_a Hash
       end
 
-      it 'has 1 elements' do
-        expect(subject.size).to eq 1
-      end
-
       it 'returns supported OS' do
-        expect(subject.keys.sort).to eq [
+        expect(subject.keys).to contain_exactly(
           'freebsd-13-amd64',
-        ]
+        )
       end
     end
 
@@ -422,14 +402,10 @@
         expect(subject).to be_a Hash
       end
 
-      it 'has 1 elements' do
-        expect(subject.size).to eq 1
-      end
-
       it 'returns supported OS' do
-        expect(subject.keys.sort).to eq [
+        expect(subject.keys).to contain_exactly(
           'openbsd-7-amd64',
-        ]
+        )
       end
     end
 
@@ -454,14 +430,11 @@
         expect(subject).to be_a Hash
       end
 
-      it 'has 1 elements' do
-        pending('2024-06-07: we dont have a suitable solaris 11 factset in facterdb')
-        expect(subject.size).to eq 1
-      end
-
       it 'returns supported OS' do
         pending('2024-06-07: we dont have a suitable solaris 11 factset in facterdb')
-        expect(subject.keys.sort).to eq %w(solaris-11-sun4v)
+        expect(subject.keys).to contain_exactly(
+          'solaris-11-i86pc',
+        )
       end
     end
 
@@ -486,16 +459,13 @@
         expect(subject).to be_a Hash
       end
 
-      it 'has 1 elements' do
-        pending('2024-06-07: we dont have a suitable AIX factset in facterdb')
-        expect(subject.size).to eq 1
-      end
-
       it 'returns supported OS' do
         # NOTE: See FACT-1827 for details on the IBM,8284-22A part
         # That has to match whatever hardware generated the facts file.
         pending('2024-06-07: we dont have a suitable solaris 11 factset in facterdb')
-        expect(subject.keys.sort).to eq %w(aix-7100-IBM,8284-22A)
+        expect(subject.keys).to contain_exactly(
+          'aix-7100-IBM,8284-22A',
+        )
       end
     end
 
@@ -520,32 +490,28 @@
         let(:release) { ['10'] }
 
         it { is_expected.to be_a(Hash) }
-        it { is_expected.to have_attributes(:size => 1) }
-        it { is_expected.to include('windows-10-x86_64' => an_instance_of(Hash)) }
+        it { is_expected.to match('windows-10-x86_64' => an_instance_of(Hash)) }
       end
 
       context 'with a revision release' do
         let(:release) { ['2012 R2'] }
 
         it { is_expected.to be_a(Hash) }
-        it { is_expected.to have_attributes(:size => 1) }
-        it { is_expected.to include('windows-2012 R2-x86_64' => an_instance_of(Hash)) }
+        it { is_expected.to match('windows-2012 R2-x86_64' => an_instance_of(Hash)) }
       end
 
       context 'with a Server prefixed release' do
         let(:release) { ['Server 2012'] }
 
         it { is_expected.to be_a(Hash) }
-        it { is_expected.to have_attributes(:size => 1) }
-        it { is_expected.to include('windows-2012-x86_64' => an_instance_of(Hash)) }
+        it { is_expected.to match('windows-2012-x86_64' => an_instance_of(Hash)) }
       end
 
       context 'with a 2016 release' do
         let(:release) { ['2016'] }
 
         it { is_expected.to be_a(Hash) }
-        it { is_expected.to have_attributes(:size => 1) }
-        it { is_expected.to include('windows-2016-x86_64' => an_instance_of(Hash)) }
+        it { is_expected.to match('windows-2016-x86_64' => an_instance_of(Hash)) }
       end
     end
 
@@ -569,16 +535,9 @@
         expect(subject).to be_a Hash
       end
 
-      it 'has 1 elements' do
-        pending('2024-06-7: facterdb has no factset with space in the system release')
-        expect(subject.size).to eq 1
-      end
-
       it 'returns supported OS' do
         pending('2024-06-7: facterdb has no factset with space in the system release')
-        expect(subject.keys.sort).to eq [
-          'sles-11-x86_64',
-        ]
+        expect(subject.keys).to contain_exactly('sles-11-x86_64')
       end
     end
 
@@ -628,12 +587,8 @@
         expect(subject).to be_a Hash
       end
 
-      it 'has 2 elements' do
-        expect(subject.size).to eq 2
-      end
-
       it 'returns supported OS' do
-        expect(subject.keys.sort).to include(a_string_matching(/\Agentoo-\d+-x86_64/), 'debian-12-x86_64')
+        expect(subject.keys).to contain_exactly(a_string_matching(/\gentoo-\d+-x86_64/), 'debian-12-x86_64')
       end
     end