fixup

Author: LukasAud

spec/acceptance/deferred_spec.rb

@@ -1,34 +1,33 @@
 # spec/acceptance/deferred_spec.rb
 # frozen_string_literal: true
-
 require 'spec_helper_acceptance'
 
 def read_fixture(name)
   File.read(File.join(__dir__, '..', 'fixtures', 'manifests', name))
 end
 
 describe 'deferred values with dsc_lite' do
-  let(:control_manifest) { read_fixture('01_file_deferred.pp') }
-  let(:dsc_deferred_direct) { read_fixture('02_dsc_deferred_direct.pp') }
-  let(:dsc_deferred_var) { read_fixture('03_dsc_deferred_in_variable.pp') }
+  let(:control_manifest)      { read_fixture('01_file_deferred.pp') }
+  let(:dsc_deferred_direct)   { read_fixture('02_dsc_deferred_direct.pp') }
+  let(:dsc_deferred_variable) { read_fixture('03_dsc_deferred_in_variable.pp') }
 
   it 'applies with native file + deferred (control succeeds)' do
     idempotent_apply(control_manifest)
-    on(default, 'powershell.exe -NoProfile -NonInteractive -Command "(Get-Content -Raw C:/Temp/deferred_ok.txt)"') do |r|
-      expect(r.stdout).to match(%r{hello-world})
-    end
+
+    # Litmus helper; returns a result with stdout/stderr/exit_code
+    result = run_shell(%q[powershell.exe -NoProfile -NonInteractive -Command "(Get-Content -Raw 'C:/Temp/deferred_ok.txt')"])
+    expect(result.stdout).to match(/hello-world/)
   end
 
   context 'dsc_lite with deferred' do
     it 'fails when passing Deferred directly to a DSC property' do
       result = apply_manifest(dsc_deferred_direct, expect_failures: true)
-      # broad match: we only assert that a Deferred/serialization-like error occurs
-      expect(result.stderr + result.stdout).to match(%r{Deferred|serialize|to_json|implicit conversion|TypeError|cannot}i)
+      expect(result.stderr + result.stdout).to match(/Deferred|serialize|to_json|implicit conversion|TypeError|cannot|Puppet::Pops::Types::Deferred/i)
     end
 
     it 'fails when assigning Deferred to a variable then to a DSC property' do
-      result = apply_manifest(dsc_deferred_var, expect_failures: true)
-      expect(result.stderr + result.stdout).to match(%r{Deferred|serialize|to_json|implicit conversion|TypeError|cannot}i)
+      result = apply_manifest(dsc_deferred_variable, expect_failures: true)
+      expect(result.stderr + result.stdout).to match(/Deferred|serialize|to_json|implicit conversion|TypeError|cannot|Puppet::Pops::Types::Deferred/i)
     end
   end
-end
+end

spec/fixtures/manifests/01_file_deferred.pp

@@ -1,4 +1,4 @@
-# 01_file_deferred.pp
+# spec/fixtures/manifests/01_file_deferred.pp
 file { 'C:/Temp':
   ensure => directory,
 }

spec/fixtures/manifests/02_dsc_deferred_direct.pp

@@ -1,4 +1,4 @@
-# 02_dsc_deferred_direct.pp
+# spec/fixtures/manifests/02_dsc_deferred_direct.pp
 file { 'C:/Temp':
   ensure => directory,
 }
@@ -7,10 +7,10 @@
   resource_name => 'File',
   module        => 'PSDesiredStateConfiguration',
   properties    => {
-    DestinationPath => 'C:\Temp\from_dsc.txt',
-    Type            => 'File',
-    Ensure          => 'Present',
-    Contents        => Deferred('join', [['hello','-','dsc'], '']),
+    'DestinationPath' => 'C:\Temp\from_dsc.txt',
+    'Type'            => 'File',
+    'Ensure'          => 'Present',
+    'Contents'        => Deferred('join', [['hello','-','dsc'], '']),
   },
   require => File['C:/Temp'],
 }

spec/fixtures/manifests/03_dsc_deferred_in_variable.pp

@@ -1,4 +1,4 @@
-# 03_dsc_deferred_in_variable.pp
+# spec/fixtures/manifests/03_dsc_deferred_in_variable.pp
 file { 'C:/Temp':
   ensure => directory,
 }
@@ -9,10 +9,10 @@
   resource_name => 'File',
   module        => 'PSDesiredStateConfiguration',
   properties    => {
-    DestinationPath => 'C:\Temp\from_dsc_var.txt',
-    Type            => 'File',
-    Ensure          => 'Present',
-    Contents        => $value, # still a Deferred wrapper
+    'DestinationPath' => 'C:\Temp\from_dsc_var.txt',
+    'Type'            => 'File',
+    'Ensure'          => 'Present',
+    'Contents'        => $value,  # still a Deferred wrapper
   },
   require => File['C:/Temp'],
 }