From c6ccbd97180caf88ecabe36230476acdf39027d5 Mon Sep 17 00:00:00 2001
From: Daniel Parks <dp+git@oxidized.org>
Date: Thu, 15 Feb 2024 09:14:14 -0800
Subject: [PATCH] rm_user, expect_no_user

---
 spec/acceptance/user_spec.rb         | 26 ++++----------------------
 spec/spec_helper_acceptance_local.rb | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/spec/acceptance/user_spec.rb b/spec/acceptance/user_spec.rb
index a9c1532..be00aef 100644
--- a/spec/acceptance/user_spec.rb
+++ b/spec/acceptance/user_spec.rb
@@ -368,8 +368,7 @@
 
   context "remove" do
     it 'can remove itself after the user was deleted' do
-      expect(user('rustup_test')).not_to exist
-      expect(file('/home/rustup_test')).not_to exist
+      expect_no_user('rustup_test')
 
       apply_manifest(<<~'END', catch_failures: true)
         user { 'rustup_test':
@@ -423,19 +422,11 @@
       expect(file('/home/rustup_test/.bashrc').content).to eq %(# .bashrc\n)
 
       # Clean up
-      apply_manifest(<<~'END', catch_failures: true)
-        user { 'rustup_test':
-          ensure => absent,
-        }
-
-        file { '/home/rustup_test':
-          ensure => absent,
-          force  => true,
-        }
-      END
+      rm_user('rustup_test')
     end
 
     it 'can remove itself after the user was deleted (with custom cargo_home)' do
+      rm_user('rustup_test')
       expect(user('rustup_test')).not_to exist
       expect(file('/home/rustup_test')).not_to exist
 
@@ -502,16 +493,7 @@
       expect(file('/home/rustup_test/.bashrc').content).to eq %(# .bashrc\n)
 
       # Clean up
-      apply_manifest(<<~'END', catch_failures: true)
-        user { 'rustup_test':
-          ensure => absent,
-        }
-
-        file { '/home/rustup_test':
-          ensure => absent,
-          force  => true,
-        }
-      END
+      rm_user('rustup_test')
     end
   end
 end
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 20ab297..743a311 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -9,3 +9,23 @@ def command_global_rustup(params)
 def command_as_user(cmd)
   command("sudo -iu user #{cmd}")
 end
+
+def expect_no_user(name)
+  it "user #{name}" do
+    expect(user(name)).not_to exist
+    expect(file("/home/#{name}")).not_to exist
+  end
+end
+
+def rm_user(name)
+  apply_manifest(<<~'END', catch_failures: true)
+    user { 'rustup_test':
+      ensure => absent,
+    }
+
+    file { '/home/rustup_test':
+      ensure => absent,
+      force  => true,
+    }
+  END
+end