Updated meta tests

justin-p · justin-p · commit 223b9744fd8c · 2020-04-22T10:44:37.000+02:00
diff --git a/plugins/plaster/template/scaffold/tests/Meta/Meta.tests.ps1 b/plugins/plaster/template/scaffold/tests/Meta/Meta.tests.ps1
@@ -11,9 +11,8 @@ if(-not $projectRoot) {
 }
 
 Describe 'Text files formatting' -Tags @('MetaTest') {
-
-    $allTextFiles = Get-TextFilesList $projectRoot
-
+    $allTextFiles = Get-TextFilesList -root $projectRoot -Extension @('.gitignore', '.gitattributes', '.ps1', '.psm1', '.psd1', '.cmd', '.mof')
+    $allTextFiles = $allTextFiles | Where-Object {$_.FullName -notlike '*\release\*'} | where-Object {$_.FullName -notlike '*\plugins\*'}  | where-Object {$_.FullName -notlike '*\build\*'}
     Context 'Files encoding' {
         It "Doesn't use Unicode encoding" {
             $unicodeFilesCount = 0
diff --git a/plugins/plaster/template/scaffold/tests/Meta/MetaFixers.psm1 b/plugins/plaster/template/scaffold/tests/Meta/MetaFixers.psm1
@@ -40,9 +40,11 @@ function Get-TextFilesList {
     [OutputType([System.IO.FileInfo])]
     param(
         [Parameter(Mandatory = $true)]
-        [string]$root
+        [string]$root,
+        [Parameter(Mandatory = $False)]
+        [Array]$Extension = @('.gitignore', '.gitattributes', '.ps1', '.psm1', '.psd1', '.json', '.xml', '.cmd', '.mof')
     )
-    Get-ChildItem -File -Recurse $root | Where-Object { @('.gitignore', '.gitattributes', '.ps1', '.psm1', '.psd1', '.json', '.xml', '.cmd', '.mof') -contains $_.Extension }
+    Get-ChildItem -File -Recurse $root | Where-Object { $Extension -contains $_.Extension }
 }
 
 function Test-FileUnicode {
diff --git a/tests/Meta/Meta.tests.ps1 b/tests/Meta/Meta.tests.ps1
@@ -11,9 +11,8 @@ if(-not $projectRoot) {
 }
 
 Describe 'Text files formatting' -Tags @('MetaTest') {
-
-    $allTextFiles = Get-TextFilesList $projectRoot
-
+    $allTextFiles = Get-TextFilesList -root $projectRoot -Extension @('.gitignore', '.gitattributes', '.ps1', '.psm1', '.psd1', '.xml', '.json', '.cmd', '.mof')
+    $allTextFiles = $allTextFiles | Where-Object {$_.FullName -notlike '*\release\*'} | where-Object {$_.FullName -notlike '*\plugins\*'}  | where-Object {$_.FullName -notlike '*\build\*'}
     Context 'Files encoding' {
         It "Doesn't use Unicode encoding" {
             $unicodeFilesCount = 0
@@ -33,7 +32,7 @@ Describe 'Text files formatting' -Tags @('MetaTest') {
             $allTextFiles | Foreach-Object {
                 $fileName = $_.FullName
                 (Get-Content $_.FullName -Raw) | Select-String "`t" | Foreach-Object {
-                    Write-Warning "There are tab in $fileName."
+                    Write-Warning "There are tabs in $fileName."
                     $totalTabsCount++
                 }
             }
diff --git a/tests/Meta/MetaFixers.psm1 b/tests/Meta/MetaFixers.psm1
@@ -40,9 +40,11 @@ function Get-TextFilesList {
     [OutputType([System.IO.FileInfo])]
     param(
         [Parameter(Mandatory = $true)]
-        [string]$root
+        [string]$root,
+        [Parameter(Mandatory = $False)]
+        [Array]$Extension = @('.gitignore', '.gitattributes', '.ps1', '.psm1', '.psd1', '.json', '.xml', '.cmd', '.mof')
     )
-    Get-ChildItem -File -Recurse $root | Where-Object { @('.gitignore', '.gitattributes', '.ps1', '.psm1', '.psd1', '.json', '.xml', '.cmd', '.mof') -contains $_.Extension }
+    Get-ChildItem -File -Recurse $root | Where-Object { $Extension -contains $_.Extension }
 }
 
 function Test-FileUnicode {

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,11 @@ function Get-TextFilesList {`
`40`	`40`	`[OutputType([System.IO.FileInfo])]`
`41`	`41`	`param(`
`42`	`42`	`[Parameter(Mandatory = $true)]`
`43`		`- [string]$root`
	`43`	`+ [string]$root,`
	`44`	`+ [Parameter(Mandatory = $False)]`
	`45`	`+ [Array]$Extension = @('.gitignore', '.gitattributes', '.ps1', '.psm1', '.psd1', '.json', '.xml', '.cmd', '.mof')`
`44`	`46`	`)`
`45`		`- Get-ChildItem -File -Recurse $root \| Where-Object { @('.gitignore', '.gitattributes', '.ps1', '.psm1', '.psd1', '.json', '.xml', '.cmd', '.mof') -contains $_.Extension }`
	`47`	`+ Get-ChildItem -File -Recurse $root \| Where-Object { $Extension -contains $_.Extension }`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`function Test-FileUnicode {`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,8 @@ if(-not $projectRoot) {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`Describe 'Text files formatting' -Tags @('MetaTest') {`
`14`		`-`
`15`		`- $allTextFiles = Get-TextFilesList $projectRoot`
`16`		`-`
	`14`	`+ $allTextFiles = Get-TextFilesList -root $projectRoot -Extension @('.gitignore', '.gitattributes', '.ps1', '.psm1', '.psd1', '.xml', '.json', '.cmd', '.mof')`
	`15`	`+ $allTextFiles = $allTextFiles \| Where-Object {$_.FullName -notlike '\release\'} \| where-Object {$_.FullName -notlike '\plugins\'} \| where-Object {$_.FullName -notlike '\build\'}`
`17`	`16`	`Context 'Files encoding' {`
`18`	`17`	`It "Doesn't use Unicode encoding" {`
`19`	`18`	`$unicodeFilesCount = 0`
`@@ -33,7 +32,7 @@ Describe 'Text files formatting' -Tags @('MetaTest') {`
`33`	`32`	`$allTextFiles \| Foreach-Object {`
`34`	`33`	`$fileName = $_.FullName`
`35`	`34`	(Get-Content $_.FullName -Raw) \| Select-String "`t" \| Foreach-Object {
`36`		`- Write-Warning "There are tab in $fileName."`
	`35`	`+ Write-Warning "There are tabs in $fileName."`
`37`	`36`	`$totalTabsCount++`
`38`	`37`	`}`
`39`	`38`	`}`