update spec tests

Signed-off-by: Corey Hemminger <hemminger@hotmail.com>

Author: Stromweld

lib/mixlib/install/generator/powershell/scripts/get_project_metadata.ps1.erb

@@ -51,32 +51,32 @@ function Get-ProjectMetadata {
 
   # PowerShell is only on Windows ATM
   $platform = 'windows'
-  Write-Verbose "Platform: $platform"
+  Write-Host "Platform: $platform"
 
   $platform_version = Get-PlatformVersion
-  Write-Verbose "Platform Version: $platform_version"
+  Write-Host "Platform Version: $platform_version"
 
   if ($architecture -eq 'auto') {
     $architecture = Get-PlatformArchitecture
   }
 
-  Write-Verbose "Architecture: $architecture"
-  Write-Verbose "Project: $project"
+  Write-Host "Architecture: $architecture"
+  Write-Host "Project: $project"
 
   # Use commercial API if license_id is provided, otherwise use omnitruck if no URL is provided
   if ([string]::IsNullOrEmpty($base_server_uri)) {
     if ($license_id) {
       # Check if license_id starts with 'free-' or 'trial-' for trial API
       if ($license_id -match '^(free-|trial-)') {
         $base_server_uri = 'https://chefdownload-trial.chef.io'
-        Write-Verbose "Using Trial API with license ID"
+        Write-Host "Using Trial API with license ID"
       } else {
         $base_server_uri = 'https://chefdownload-commercial.chef.io'
-        Write-Verbose "Using Commercial API with license ID"
+        Write-Host "Using Commercial API with license ID"
       }
     } else {
       $base_server_uri = 'https://omnitruck.chef.io'
-      Write-Verbose "Using Omnitruck API without license ID"
+      Write-Host "Using Omnitruck API without license ID"
     }
   }
 
@@ -111,7 +111,7 @@ function Get-ProjectMetadata {
   $metadata_base_url += [string]::join('&', $metadata_array)
   $metadata_url = new-uri $base_server_uri $metadata_base_url
 
-  Write-Verbose "Downloading $project details from $metadata_url"
+  Write-Host "Downloading $project details from $metadata_url"
   $response = (Get-WebContent $metadata_url).trim()
 
   # Commercial and trial APIs return JSON, omnitruck returns text format
@@ -136,9 +136,9 @@ function Get-ProjectMetadata {
       foreach { $hash = @{} } {$key, $value = $_ -split '\s+'; $hash.Add($key, $value)} {$hash}
   }
 
-  Write-Verbose "Project details: "
+  Write-Host "Project details: "
   foreach ($key in $package_metadata.keys) {
-    Write-Verbose "`t$key = $($package_metadata[$key])"
+    Write-Host "`t$key = $($package_metadata[$key])"
   }
   $package_metadata
 }

spec/unit/mixlib/install/generator_spec.rb

@@ -122,7 +122,7 @@
       end
 
       it "skips caching checks when using content-disposition" do
-        expect(install_script).to include('if test "x$use_content_disposition" = "xtrue"; then')
+        expect(install_script).to include('if [ "$use_content_disposition" = "true" ]; then')
         expect(install_script).to include('cached_file_available="false"')
       end
 
@@ -162,7 +162,7 @@
       end
 
       it "skips caching checks when using content-disposition" do
-        expect(install_script).to include('if test "x$use_content_disposition" = "xtrue"; then')
+        expect(install_script).to include('if [ "$use_content_disposition" = "true" ]; then')
         expect(install_script).to include('cached_file_available="false"')
       end
     end
@@ -192,7 +192,7 @@
       end
 
       it "skips caching checks when using content-disposition" do
-        expect(install_script).to include('if test "x$use_content_disposition" = "xtrue"; then')
+        expect(install_script).to include('if [ "$use_content_disposition" = "true" ]; then')
         expect(install_script).to include('cached_file_available="false"')
       end
 
@@ -270,7 +270,7 @@
       end
 
       it "includes chef-ice conditional logic" do
-        expect(install_script).to include('if test "$project" = "chef-ice"')
+        expect(install_script).to include('if [ "$project" = "chef-ice" ]; then')
       end
 
       it "includes RPM-based platform detection" do
@@ -299,7 +299,7 @@
       end
 
       it "constructs chef-ice metadata URL with m, p, pm parameters" do
-        expect(install_script).to include('metadata_url="$base_api_url/$channel/$project/metadata?v=$version&license_id=$license_id&m=$machine&p=$platform_param&pm=$package_manager"')
+        expect(install_script).to include('metadata_url="$base_api_url/$channel/$project/metadata?license_id=$license_id&v=$version&m=$machine&p=$platform_param&pm=$package_manager"')
       end
 
       it "uses commercial API endpoint" do
@@ -315,11 +315,11 @@
       end
 
       it "includes chef-ice conditional logic" do
-        expect(install_script).to include('if test "$project" = "chef-ice"')
+        expect(install_script).to include('if [ "$project" = "chef-ice" ]; then')
       end
 
       it "constructs chef-ice metadata URL with m, p, pm parameters" do
-        expect(install_script).to include('metadata_url="$base_api_url/$channel/$project/metadata?v=$version&license_id=$license_id&m=$machine&p=$platform_param&pm=$package_manager"')
+        expect(install_script).to include('metadata_url="$base_api_url/$channel/$project/metadata?license_id=$license_id&v=$version&m=$machine&p=$platform_param&pm=$package_manager"')
       end
 
       it "uses trial API endpoint" do
@@ -329,7 +329,7 @@
       it "works with trial- prefix" do
         add_options[:license_id] = "trial-abc-456"
         expect(install_script).to include("https://chefdownload-trial.chef.io")
-        expect(install_script).to include('if test "$project" = "chef-ice"')
+        expect(install_script).to include('if [ "$project" = "chef-ice" ]; then')
       end
     end
 
@@ -473,7 +473,7 @@
         it_behaves_like "the correct ps1 script"
 
         it "includes chef-ice conditional logic" do
-          expect(install_script).to include("if ($project -eq 'chef-ice' -and $license_id)")
+          expect(install_script).to include("if ($project -eq 'chef-ice')")
         end
 
         it "includes simplified parameters for chef-ice on Windows" do
@@ -482,7 +482,8 @@
         end
 
         it "constructs chef-ice metadata URL with m, p, pm parameters" do
-          expect(install_script).to include('$metadata_array = ("?v=$($version)"')
+          expect(install_script).to include('$metadata_array = (')
+          expect(install_script).to include('"?v=$($version)"')
           expect(install_script).to include('"license_id=$license_id"')
           expect(install_script).to include('"m=$architecture"')
         end
@@ -503,7 +504,7 @@
         it_behaves_like "the correct ps1 script"
 
         it "includes chef-ice conditional logic" do
-          expect(install_script).to include("if ($project -eq 'chef-ice' -and $license_id)")
+          expect(install_script).to include("if ($project -eq 'chef-ice')")
         end
 
         it "includes simplified parameters for chef-ice on Windows" do
@@ -665,7 +666,7 @@
       end
 
       it "includes checksum verification check" do
-        expect(install_script).to match(/if test "x\$sha256" = "x"; then/)
+        expect(install_script).to match(/if \[ -z "\$sha256" \]; then/)
       end
     end
   end