drop "choria/mcollective" for testing

voxpupuli · Sep 5, 2023 · b64de4d · b64de4d
1 parent 4f192cf
commit b64de4d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/metadata.json b/metadata.json
@@ -79,10 +79,6 @@
       "name": "puppetlabs/vcsrepo",
       "version_requirement": ">= 1.3.1 < 7.0.0"
     },
-    {
-      "name": "choria/mcollective",
-      "version_requirement": ">= 0.10.0 <1.0.0"
-    },
     {
       "name": "puppet/systemd",
       "version_requirement": ">= 3.2.0 < 7.0.0"

diff --git a/spec/acceptance/r10k_webhook_spec.rb b/spec/acceptance/r10k_webhook_spec.rb
@@ -4,14 +4,13 @@
 
 describe 'r10k::webhook tests' do
   context 'when defaults used' do
-    it 'applies' do
-      pp = <<-MANIFEST
+    it_behaves_like 'an idempotent resource' do
+      let(:manifest) do
+        <<-PUPPET
         class { 'r10k': }
         -> class { 'r10k::webhook': }
-      MANIFEST
-
-      apply_manifest(pp, catch_failures: true)
-      apply_manifest(pp, catch_changes: true)
+        PUPPET
+      end
     end
 
     describe package('webhook-go') do
@@ -31,5 +30,9 @@ class { 'r10k': }
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
+
+    describe command('systemctl cat webhook-go') do
+      it { is_expected.to contain('webhook-go') }
+    end
   end
 end
diff --git a/spec/classes/webhook_spec.rb b/spec/classes/webhook_spec.rb
@@ -21,6 +21,7 @@
           it { is_expected.to contain_service('webhook-go').with_ensure('running') }
         end
       end
+
       context 'with params' do
         let :params do
           {