From e996a46d445b866606043b05461384e73f0d6ed1 Mon Sep 17 00:00:00 2001 From: gowridurgad <159780674+gowridurgad@users.noreply.github.com> Date: Fri, 28 Jun 2024 16:28:06 +0530 Subject: [PATCH 1/3] Update Node.Tests.ps1 --- tests/Node.Tests.ps1 | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/tests/Node.Tests.ps1 b/tests/Node.Tests.ps1 index 97d671a..b1be5b8 100644 --- a/tests/Node.Tests.ps1 +++ b/tests/Node.Tests.ps1 @@ -35,14 +35,23 @@ Describe "Node.js" { } It "cached version is used without downloading" { - # Analyze output of previous steps to check if Node.js was consumed from cache or downloaded - $useNodeLogFile = Get-UseNodeLogs - $useNodeLogFile | Should -Exist - $useNodeLogContent = Get-Content $useNodeLogFile -Raw - $useNodeLogContent | Should -Match "Found in cache" + if ($env:RUNNER_TYPE -eq "GitHub") { + # Analyze output of previous steps to check if Node.js was consumed from cache or downloaded + $useNodeLogFile = Get-UseNodeLogs + $useNodeLogFile | Should -Exist + $useNodeLogContent = Get-Content $useNodeLogFile -Raw + $useNodeLogContent | Should -Match "Found in cache" + } else { + # Get the installed version of Node.js + $nodeVersion = Invoke-Expression "node --version" + # Check if Node.js is installed + $nodeVersion | Should -Not -BeNullOrEmpty + # Check if the installed version of Node.js is the expected version + $nodeVersion | Should -Match $env:VERSION + } } - + It "Run simple code" { "node ./simple-test.js" | Should -ReturnZeroExitCode } -} \ No newline at end of file +} -- 2.49.1 From f6400f0d5f7f47e46213fa831c2268e4203d42c4 Mon Sep 17 00:00:00 2001 From: aparnajyothi-y <147696841+aparnajyothi-y@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:00:33 +0530 Subject: [PATCH 2/3] Update Node.Tests.ps1 --- tests/Node.Tests.ps1 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/Node.Tests.ps1 b/tests/Node.Tests.ps1 index b1be5b8..66c128e 100644 --- a/tests/Node.Tests.ps1 +++ b/tests/Node.Tests.ps1 @@ -34,21 +34,22 @@ Describe "Node.js" { $nodePath.startsWith($expectedPath) | Should -BeTrue -Because "'$nodePath' is not started with '$expectedPath'" } - It "cached version is used without downloading" { - if ($env:RUNNER_TYPE -eq "GitHub") { - # Analyze output of previous steps to check if Node.js was consumed from cache or downloaded - $useNodeLogFile = Get-UseNodeLogs - $useNodeLogFile | Should -Exist - $useNodeLogContent = Get-Content $useNodeLogFile -Raw - $useNodeLogContent | Should -Match "Found in cache" - } else { + It "cached version is used without downloading" { + + if ($env:RUNNER_TYPE -eq "self-hosted") { # Get the installed version of Node.js $nodeVersion = Invoke-Expression "node --version" # Check if Node.js is installed $nodeVersion | Should -Not -BeNullOrEmpty # Check if the installed version of Node.js is the expected version $nodeVersion | Should -Match $env:VERSION - } + }else { + # Analyze output of previous steps to check if Node.js was consumed from cache or downloaded + $useNodeLogFile = Get-UseNodeLogs + $useNodeLogFile | Should -Exist + $useNodeLogContent = Get-Content $useNodeLogFile -Raw + $useNodeLogContent | Should -Match "Found in cache" + } } It "Run simple code" { -- 2.49.1 From 04cc07025b7932f8eabd3628b362ad819b18cc31 Mon Sep 17 00:00:00 2001 From: aparnajyothi-y <147696841+aparnajyothi-y@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:01:08 +0530 Subject: [PATCH 3/3] Update Node.Tests.ps1 --- tests/Node.Tests.ps1 | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/Node.Tests.ps1 b/tests/Node.Tests.ps1 index 66c128e..dbc2bea 100644 --- a/tests/Node.Tests.ps1 +++ b/tests/Node.Tests.ps1 @@ -1,20 +1,23 @@ Import-Module (Join-Path $PSScriptRoot "../helpers/pester-extensions.psm1") -BeforeAll { - function Get-UseNodeLogs { - # GitHub Windows images don't have `HOME` variable - $homeDir = $env:HOME ?? $env:HOMEDRIVE - $logsFolderPath = Join-Path -Path $homeDir -ChildPath "runners/*/_diag/pages" -Resolve - $useNodeLogFile = Get-ChildItem -Path $logsFolderPath | Where-Object { - $logContent = Get-Content $_.Fullname -Raw - return $logContent -match "setup-node@v" - } | Select-Object -First 1 - return $useNodeLogFile.Fullname - } -} Describe "Node.js" { + + BeforeAll { + function Get-UseNodeLogs { + # GitHub Windows images don't have `HOME` variable + $homeDir = $env:HOME ?? $env:HOMEDRIVE + $logsFolderPath = Join-Path -Path $homeDir -ChildPath "runners/*/_diag/pages" -Resolve + + $useNodeLogFile = Get-ChildItem -Path $logsFolderPath | Where-Object { + $logContent = Get-Content $_.Fullname -Raw + return $logContent -match "setup-node@v" + } | Select-Object -First 1 + return $useNodeLogFile.Fullname + } + } + It "is available" { "node --version" | Should -ReturnZeroExitCode } -- 2.49.1