Merge pull request #46 from vexx32/dev

Fix tests & speed isssues

Author: vexx32

Build/Psake.ps1

@@ -54,14 +54,14 @@ STATUS: Testing with PowerShell $PSVersion
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
     # Import the module
-    Import-Module "$ProjectRoot\PSKoans\PSKoans.psd1"
+    Import-Module "$ProjectRoot/PSKoans/PSKoans.psd1"
 
     # Gather test results. Store them in a variable and file
     $PesterParams = @{
-        Path         = "$ProjectRoot\Tests"
+        Path         = "$ProjectRoot/Tests"
         PassThru     = $true
         OutputFormat = 'NUnitXml'
-        OutputFile   = "$ProjectRoot\$TestFile"
+        OutputFile   = "$ProjectRoot/$TestFile"
     }
     $TestResults = Invoke-Pester @PesterParams
 
@@ -75,7 +75,7 @@ STATUS: Testing with PowerShell $PSVersion
         )
     }
 
-    Remove-Item -Path "$ProjectRoot\$TestFile" -Force -ErrorAction SilentlyContinue
+    Remove-Item -Path "$ProjectRoot/$TestFile" -Force -ErrorAction SilentlyContinue
 
     # Failed tests?
     # Need to tell psake or it will proceed to the deployment. Danger!

PSKoans/Koans/Cmdlets 1/AboutDiscovery.Koans.ps1

@@ -166,20 +166,18 @@ Describe 'Get-Command' {
         When looking for related commands, use of the -Verb and -Noun search options
         is often easier than figuring out how many wildcards you need in a -Name search.
     #>
-    BeforeAll {
-        # Try calling Get-Command in a PowerShell console to see the typical output!
-        $Commands = Get-Command
-    }
 
     It 'lists available commands' {
-        $Commands.Count | Should -Be __
-        $Commands[7].Name | Should -Be '__'
+        # Try calling Get-Command in a PowerShell console to see the typical output!
+        $CommandCount = Get-Command | Measure-Object | Select-Object -ExpandProperty Count
+        $CommandCount | Should -Be __
+        Get-Command | Select-Object -First 1 -ExpandProperty Name | Should -Be '__'
     }
 
     It 'indicates the type of command' {
-        $CommandTypes = $Commands | Select-Object -ExpandProperty CommandType | Sort-Object -Unique
+        $CommandType = Get-Command | Select-Object -Skip 3 -First 1 -ExpandProperty CommandType
 
-        @('__', '__', 'Cmdlet') | Should -Be $CommandTypes
+        '__' | Should -Be $CommandType
     }
 
     It 'can filter the output by keywords' {

PSKoans/PSKoans.psd1

@@ -1,4 +1,4 @@
-#
+#
 # Module manifest for module 'PSKoans'
 #
 # Generated by: Joel Sallow
@@ -12,7 +12,7 @@
     RootModule            = 'PSKoans.psm1'
 
     # Version number of this module.
-    ModuleVersion         = '0.39.0'
+    ModuleVersion         = '0.39.5'
 
     # Supported PSEditions
     CompatiblePSEditions = @('Desktop', 'Core')

PSKoans/PSKoans.psm1

@@ -1,6 +1,7 @@
-Get-ChildItem "$PSScriptRoot\Public", "$PSScriptRoot\Private" | ForEach-Object {
+Get-ChildItem "$PSScriptRoot/Public", "$PSScriptRoot/Private" | ForEach-Object {
     . $_.FullName
 }
+. "$PSScriptRoot/ExportedTypes.ps1"
 
 $env:PSKoans_Folder = $Home | Join-Path -ChildPath 'PSKoans'
 $script:ModuleFolder = $PSScriptRoot

PSKoans/Public/Get-Enlightenment.ps1

@@ -61,26 +61,28 @@ function Get-Enlightenment {
 
             Write-MeditationPrompt -Greeting
 
+            $KoanScripts = $null
+
             $SortedKoanList = Get-ChildItem "$env:PSKoans_Folder" -Recurse -Filter '*.Koans.ps1' |
                 Get-Command {$_.FullName} |
                 Where-Object {$_.ScriptBlock.Attributes.TypeID -match 'KoanAttribute'} |
                 Sort-Object {
-                $_.ScriptBlock.Attributes.Where( {
-                        $_.TypeID -match 'KoanAttribute'
-                    }).Position
-            } | Select-Object -ExpandProperty Path
+                    $_.ScriptBlock.Attributes.Where( {
+                            $_.TypeID -match 'KoanAttribute'
+                        }).Position
+                }
 
-            $PesterParams = @{
-                Script   = $SortedKoanList
-                PassThru = $true
-                Show     = 'None'
-            }
-            $PesterTestCount = Invoke-Pester @PesterParams |
-                Select-Object -ExpandProperty TotalCount
+            $TotalKoans = $SortedKoanList.ScriptBlock.Ast.FindAll(
+                {
+                    param($Item)
+                    $Item -is [System.Management.Automation.Language.CommandAst] -and
+                    $Item.GetCommandName() -eq 'It'
+                }, $true
+            ).Count
 
             $KoansPassed = 0
 
-            foreach ($KoanFile in $SortedKoanList) {
+            foreach ($KoanFile in $SortedKoanList.Path) {
                 $PesterParams = @{
                     Script   = $KoanFile
                     PassThru = $true
@@ -105,7 +107,7 @@ function Get-Enlightenment {
                     ItName       = $NextKoanFailed.Name
                     Meditation   = $NextKoanFailed.StackTrace
                     KoansPassed  = $KoansPassed
-                    TotalKoans   = $PesterTestCount
+                    TotalKoans   = $TotalKoans
                 }
                 Write-MeditationPrompt @Meditation
             }

Tests/Get-Enlightenment.Tests.ps1

@@ -11,7 +11,7 @@ InModuleScope 'PSKoans' {
             }
 
             It 'should not produce output' {
-                Get-Enlightenment | Should -BeNullOrEmpty
+                Get-Enlightenment | Should -Be $null
             }
 
             It 'should clear the screen' {
@@ -22,12 +22,12 @@ InModuleScope 'PSKoans' {
                 Assert-MockCalled Write-MeditationPrompt -Times 2
             }
 
-            It 'should Invoke-Pester globally, and on each of the koans' {
+            It 'should Invoke-Pester on each of the koans' {
                 $ValidKoans = Get-ChildItem "$env:PSKoans_Folder" -Recurse -Filter '*.Koans.ps1' |
                     Get-Command {$_.FullName} |
                     Where-Object {$_.ScriptBlock.Attributes.TypeID -match 'KoanAttribute'}
 
-                Assert-MockCalled Invoke-Pester -Times ($ValidKoans.Count + 1)
+                Assert-MockCalled Invoke-Pester -Times ($ValidKoans.Count)
             }
         }
 

appveyor.yml

@@ -9,7 +9,7 @@ environment:
     secure: G4KH7AVKvqA+2gNNtmnF1YxP9r2MWe55HbTy9no7fmACcNj6tXy0l4VKMOR8s0lx
 
 install:
-  - pwsh: >-
+  - ps: >-
       Install-Module -Name Psake, PSDeploy, BuildHelpers -Force -Scope CurrentUser
 
       Install-Module -Name Pester -Force -SkipPublisherCheck -Scope CurrentUser
@@ -23,4 +23,4 @@ build: false
 
 #Kick off the CI/CD pipeline
 test_script:
-- pwsh: . .\build\build.ps1
+- ps: . .\build\build.ps1