Use Pester 4.0 syntax to multiple files (#2714)

KevinMarquette · r15ch13 · commit c0dce0e8cd9d · 2018-10-29T14:59:03.000+01:00
diff --git a/test/Scoop-Alias.Tests.ps1 b/test/Scoop-Alias.Tests.ps1
@@ -13,21 +13,21 @@ describe "add_alias" -Tag 'Scoop' {
   context "alias doesn't exist" {
     it "creates a new alias" {
       $alias_file = "$shimdir\scoop-rm.ps1"
-      $alias_file | should not exist
+      $alias_file | should -not -exist
 
       add_alias "rm" '"hello, world!"'
-      Invoke-Expression $alias_file | should be "hello, world!"
+      Invoke-Expression $alias_file | should -be "hello, world!"
     }
   }
 
   context "alias exists" {
     it "does not change existing alias" {
       $alias_file = "$shimdir\scoop-rm.ps1"
       new-item $alias_file -type file
-      $alias_file | should exist
+      $alias_file | should -exist
 
       add_alias "rm" "test"
-      $alias_file | should FileContentMatch ""
+      $alias_file | should -FileContentMatch ""
     }
   }
 }
@@ -45,11 +45,11 @@ describe "rm_alias" {
       $alias_file = "$shimdir\scoop-rm.ps1"
       add_alias "rm" '"hello, world!"'
 
-      $alias_file | should exist
+      $alias_file | should -exist
       mock get_config { @(@{"rm" = "scoop-rm"}) }
 
       rm_alias "rm"
-      $alias_file | should not exist
+      $alias_file | should -not -exist
     }
   }
 }
diff --git a/test/Scoop-Config.Tests.ps1 b/test/Scoop-Config.Tests.ps1
@@ -8,13 +8,13 @@ describe "hashtable" -Tag 'Scoop' {
         $obj = convertfrom-json $json
         $ht = hashtable $obj
 
-        $ht.one | should beexactly 1
-        $ht.two[0].a | should be "a"
-        $ht.two[1] | should be "b"
-        $ht.two[2] | should beexactly 2
-        $ht.three.four | should beexactly 4
-        $ht.five | should beexactly $true
-        $ht.six | should beexactly $false
-        [System.DateTime]::Equals($ht.seven, $(New-Object System.DateTime (2018, 06, 25, 09, 03, 15, 805))) | should be $true
+        $ht.one | should -beexactly 1
+        $ht.two[0].a | should -be "a"
+        $ht.two[1] | should -be "b"
+        $ht.two[2] | should -beexactly 2
+        $ht.three.four | should -beexactly 4
+        $ht.five | should -beexactly $true
+        $ht.six | should -beexactly $false
+        [System.DateTime]::Equals($ht.seven, $(New-Object System.DateTime (2018, 06, 25, 09, 03, 15, 805))) | should -betrue
     }
 }
diff --git a/test/Scoop-GetOpts.Tests.ps1 b/test/Scoop-GetOpts.Tests.ps1
@@ -4,68 +4,68 @@
 describe "getopt" -Tag 'Scoop' {
     it 'handle short option with required argument missing' {
         $null, $null, $err = getopt '-x' 'x:' ''
-        $err | should be 'Option -x requires an argument.'
+        $err | should -be 'Option -x requires an argument.'
 
         $null, $null, $err = getopt '-xy' 'x:y' ''
-        $err | should be 'Option -x requires an argument.'
+        $err | should -be 'Option -x requires an argument.'
     }
 
     it 'handle long option with required argument missing' {
         $null, $null, $err = getopt '--arb' '' 'arb='
-        $err | should be 'Option --arb requires an argument.'
+        $err | should -be 'Option --arb requires an argument.'
     }
 
     it 'handle unrecognized short option' {
         $null, $null, $err = getopt '-az' 'a' ''
-        $err | should be 'Option -z not recognized.'
+        $err | should -be 'Option -z not recognized.'
     }
 
     it 'handle unrecognized long option' {
         $null, $null, $err = getopt '--non-exist' '' ''
-        $err | should be 'Option --non-exist not recognized.'
+        $err | should -be 'Option --non-exist not recognized.'
 
         $null, $null, $err = getopt '--global','--another' 'abc:de:' 'global','one'
-        $err | should be 'Option --another not recognized.'
+        $err | should -be 'Option --another not recognized.'
     }
 
     it 'remaining args returned' {
         $opt, $rem, $err = getopt '-g','rem' 'g' ''
-        $err | should be $null
-        $opt.g | should be $true
-        $rem | should not be $null
-        $rem.length | should be 1
-        $rem[0] | should be 'rem'
+        $err | should -benullorempty
+        $opt.g | should -betrue
+        $rem | should -not -benullorempty
+        $rem.length | should -be 1
+        $rem[0] | should -be 'rem'
     }
 
     it 'get a long flag and a short option with argument' {
         $a = "--global -a 32bit test" -split ' '
         $opt, $rem, $err = getopt $a 'ga:' 'global','arch='
 
-        $err | should be $null
-        $opt.global | should be $true
-        $opt.a | should be '32bit'
+        $err | should -benullorempty
+        $opt.global | should -betrue
+        $opt.a | should -be '32bit'
     }
 
     it 'handles regex characters' {
         $a = "-?"
-        { $opt, $rem, $err = getopt $a 'ga:' 'global' 'arch=' } | should not throw
-        { $null, $null, $null = getopt $a '?:' 'help' | should not throw }
+        { $opt, $rem, $err = getopt $a 'ga:' 'global' 'arch=' } | should -not -throw
+        { $null, $null, $null = getopt $a '?:' 'help' | should -not -throw }
     }
 
     it 'handles short option without required argument' {
         $null, $null, $err = getopt '-x' 'x' ''
-        $err | should be $null
+        $err | should -benullorempty
     }
 
     it 'handles long option without required argument' {
         $opt, $null, $err = getopt '--long-arg' '' 'long-arg'
-        $err | should be $null
-        $opt."long-arg" | should be $true
+        $err | should -benullorempty
+        $opt."long-arg" | should -betrue
     }
 
     it 'handles long option with required argument' {
         $opt, $null, $err = getopt '--long-arg', 'test' '' 'long-arg='
-        $err | should be $null
-        $opt."long-arg" | should be "test"
+        $err | should -benullorempty
+        $opt."long-arg" | should -be "test"
     }
 }
diff --git a/test/Scoop-Linting.Tests.ps1 b/test/Scoop-Linting.Tests.ps1
@@ -7,13 +7,13 @@ Describe -Tag 'Linter' "PSScriptAnalyzer" {
 
     Context "Checking ScriptAnalyzer" {
         It "Invoke-ScriptAnalyzer Cmdlet should exist" {
-            { Get-Command Invoke-ScriptAnalyzer -ErrorAction Stop } | Should Not Throw
+            { Get-Command Invoke-ScriptAnalyzer -ErrorAction Stop } | should -not -throw
         }
         It "PSScriptAnalyzerSettings.ps1 should exist" {
-            Test-Path "$repo_dir\PSScriptAnalyzerSettings.psd1" | Should Be $true
+            Test-Path "$repo_dir\PSScriptAnalyzerSettings.psd1" | should -betrue
         }
         It "There should be files to test" {
-            $scoop_modules.Count | Should Not Be 0
+            $scoop_modules.Count | should -not -be 0
         }
     }
 
@@ -23,7 +23,7 @@ Describe -Tag 'Linter' "PSScriptAnalyzer" {
         foreach($directory in $scoop_modules) {
             $analysis = Invoke-ScriptAnalyzer -Path $directory.FullName -Settings $linting_settings.FullName
             It "Should pass: $directory" {
-                $analysis.Count | Should Be 0
+                $analysis.Count | should -be 0
             }
             if($analysis) {
                 foreach($result in $analysis) {
diff --git a/test/Scoop-Manifest.Tests.ps1 b/test/Scoop-Manifest.Tests.ps1
@@ -12,34 +12,34 @@ describe -Tag 'Manifests' "manifest-validation" {
     }
 
     it "Scoop.Validator is available" {
-        ([System.Management.Automation.PSTypeName]'Scoop.Validator').Type | should be 'Scoop.Validator'
+        ([System.Management.Automation.PSTypeName]'Scoop.Validator').Type | should -be 'Scoop.Validator'
     }
 
     context "parse_json function" {
         it "fails with invalid json" {
-            { parse_json "$working_dir\broken_wget.json" } | should throw
+            { parse_json "$working_dir\broken_wget.json" } | should -throw
         }
     }
 
     context "schema validation" {
         it "fails with broken schema" {
             $validator = new-object Scoop.Validator("$working_dir/broken_schema.json", $true)
-            $validator.Validate("$working_dir/wget.json") | should be $false
-            $validator.Errors.Count | should be 1
-            $validator.Errors | select-object -First 1 | should match "broken_schema.*(line 6).*(position 4)"
+            $validator.Validate("$working_dir/wget.json") | should -BeFalse
+            $validator.Errors.Count | should -be 1
+            $validator.Errors | select-object -First 1 | should -match "broken_schema.*(line 6).*(position 4)"
         }
         it "fails with broken manifest" {
             $validator = new-object Scoop.Validator($schema, $true)
-            $validator.Validate("$working_dir/broken_wget.json") | should be $false
-            $validator.Errors.Count | should be 1
-            $validator.Errors | select-object -First 1 | should match "broken_wget.*(line 5).*(position 4)"
+            $validator.Validate("$working_dir/broken_wget.json") | should -BeFalse
+            $validator.Errors.Count | should -be 1
+            $validator.Errors | select-object -First 1 | should -match "broken_wget.*(line 5).*(position 4)"
         }
         it "fails with invalid manifest" {
             $validator = new-object Scoop.Validator($schema, $true)
-            $validator.Validate("$working_dir/invalid_wget.json") | should be $false
-            $validator.Errors.Count | should be 16
-            $validator.Errors | select-object -First 1 | should match "invalid_wget.*randomproperty.*properties\.$"
-            $validator.Errors | select-object -Last 1 | should match "invalid_wget.*version\.$"
+            $validator.Validate("$working_dir/invalid_wget.json") | should -BeFalse
+            $validator.Errors.Count | should -be 16
+            $validator.Errors | select-object -First 1 | should -match "invalid_wget.*randomproperty.*properties\.$"
+            $validator.Errors | select-object -Last 1 | should -match "invalid_wget.*version\.$"
         }
     }
 
@@ -74,7 +74,7 @@ describe -Tag 'Manifests' "manifest-validation" {
                         if ($validator.Errors.Count -gt 0) {
                             write-host -f yellow $validator.ErrorsAsString
                         }
-                        $validator.Errors.Count | should be 0
+                        $validator.Errors.Count | should -be 0
                     } catch {
                         if($_.exception.message -like '*The free-quota limit of 1000 schema validations per hour has been reached.*') {
                             $quota_exceeded = $true
@@ -91,7 +91,7 @@ describe -Tag 'Manifests' "manifest-validation" {
                 if(!$url) {
                     $url = $url64
                 }
-                $url | should not benullorempty
+                $url | should -not -benullorempty
             }
         }
     }
diff --git a/test/Scoop-Versions.Tests.ps1 b/test/Scoop-Versions.Tests.ps1
@@ -7,15 +7,15 @@ describe "versions" -Tag 'Scoop' {
         $b = '1.8.5-1'
         $res = compare_versions $a $b
 
-        $res | should be 1
+        $res | should -be 1
     }
 
     it 'handles plain string version comparison to int version' {
         $a = 'latest'
         $b = '20150405'
         $res = compare_versions $a $b
 
-        $res | should be 1
+        $res | should -be 1
     }
 
     it 'handles dashed version components' {
@@ -24,14 +24,14 @@ describe "versions" -Tag 'Scoop' {
 
         $res = compare_versions $a $b
 
-        $res | should be -1
+        $res | should -be -1
     }
 
     it 'handles comparsion against en empty string' {
-        compare_versions '7.0.4-9' '' | should be 1
+        compare_versions '7.0.4-9' '' | should -be 1
     }
 
     it 'handles equal versions' {
-        compare_versions '12.0' '12.0' | should be 0
+        compare_versions '12.0' '12.0' | should -be 0
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,21 +13,21 @@ describe "add_alias" -Tag 'Scoop' {`
`13`	`13`	`context "alias doesn't exist" {`
`14`	`14`	`it "creates a new alias" {`
`15`	`15`	`$alias_file = "$shimdir\scoop-rm.ps1"`
`16`		`- $alias_file \| should not exist`
	`16`	`+ $alias_file \| should -not -exist`
`17`	`17`
`18`	`18`	`add_alias "rm" '"hello, world!"'`
`19`		`- Invoke-Expression $alias_file \| should be "hello, world!"`
	`19`	`+ Invoke-Expression $alias_file \| should -be "hello, world!"`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`context "alias exists" {`
`24`	`24`	`it "does not change existing alias" {`
`25`	`25`	`$alias_file = "$shimdir\scoop-rm.ps1"`
`26`	`26`	`new-item $alias_file -type file`
`27`		`- $alias_file \| should exist`
	`27`	`+ $alias_file \| should -exist`
`28`	`28`
`29`	`29`	`add_alias "rm" "test"`
`30`		`- $alias_file \| should FileContentMatch ""`
	`30`	`+ $alias_file \| should -FileContentMatch ""`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`}`
`@@ -45,11 +45,11 @@ describe "rm_alias" {`
`45`	`45`	`$alias_file = "$shimdir\scoop-rm.ps1"`
`46`	`46`	`add_alias "rm" '"hello, world!"'`
`47`	`47`
`48`		`- $alias_file \| should exist`
	`48`	`+ $alias_file \| should -exist`
`49`	`49`	`mock get_config { @(@{"rm" = "scoop-rm"}) }`
`50`	`50`
`51`	`51`	`rm_alias "rm"`
`52`		`- $alias_file \| should not exist`
	`52`	`+ $alias_file \| should -not -exist`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@ Describe -Tag 'Linter' "PSScriptAnalyzer" {`
`7`	`7`
`8`	`8`	`Context "Checking ScriptAnalyzer" {`
`9`	`9`	`It "Invoke-ScriptAnalyzer Cmdlet should exist" {`
`10`		`- { Get-Command Invoke-ScriptAnalyzer -ErrorAction Stop } \| Should Not Throw`
	`10`	`+ { Get-Command Invoke-ScriptAnalyzer -ErrorAction Stop } \| should -not -throw`
`11`	`11`	`}`
`12`	`12`	`It "PSScriptAnalyzerSettings.ps1 should exist" {`
`13`		`- Test-Path "$repo_dir\PSScriptAnalyzerSettings.psd1" \| Should Be $true`
	`13`	`+ Test-Path "$repo_dir\PSScriptAnalyzerSettings.psd1" \| should -betrue`
`14`	`14`	`}`
`15`	`15`	`It "There should be files to test" {`
`16`		`- $scoop_modules.Count \| Should Not Be 0`
	`16`	`+ $scoop_modules.Count \| should -not -be 0`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
`@@ -23,7 +23,7 @@ Describe -Tag 'Linter' "PSScriptAnalyzer" {`
`23`	`23`	`foreach($directory in $scoop_modules) {`
`24`	`24`	`$analysis = Invoke-ScriptAnalyzer -Path $directory.FullName -Settings $linting_settings.FullName`
`25`	`25`	`It "Should pass: $directory" {`
`26`		`- $analysis.Count \| Should Be 0`
	`26`	`+ $analysis.Count \| should -be 0`
`27`	`27`	`}`
`28`	`28`	`if($analysis) {`
`29`	`29`	`foreach($result in $analysis) {`
Original file line number	Diff line number	Diff line change
`@@ -12,34 +12,34 @@ describe -Tag 'Manifests' "manifest-validation" {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`it "Scoop.Validator is available" {`
`15`		`- ([System.Management.Automation.PSTypeName]'Scoop.Validator').Type \| should be 'Scoop.Validator'`
	`15`	`+ ([System.Management.Automation.PSTypeName]'Scoop.Validator').Type \| should -be 'Scoop.Validator'`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`context "parse_json function" {`
`19`	`19`	`it "fails with invalid json" {`
`20`		`- { parse_json "$working_dir\broken_wget.json" } \| should throw`
	`20`	`+ { parse_json "$working_dir\broken_wget.json" } \| should -throw`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`context "schema validation" {`
`25`	`25`	`it "fails with broken schema" {`
`26`	`26`	`$validator = new-object Scoop.Validator("$working_dir/broken_schema.json", $true)`
`27`		`- $validator.Validate("$working_dir/wget.json") \| should be $false`
`28`		`- $validator.Errors.Count \| should be 1`
`29`		`- $validator.Errors \| select-object -First 1 \| should match "broken_schema.(line 6).(position 4)"`
	`27`	`+ $validator.Validate("$working_dir/wget.json") \| should -BeFalse`
	`28`	`+ $validator.Errors.Count \| should -be 1`
	`29`	`+ $validator.Errors \| select-object -First 1 \| should -match "broken_schema.(line 6).(position 4)"`
`30`	`30`	`}`
`31`	`31`	`it "fails with broken manifest" {`
`32`	`32`	`$validator = new-object Scoop.Validator($schema, $true)`
`33`		`- $validator.Validate("$working_dir/broken_wget.json") \| should be $false`
`34`		`- $validator.Errors.Count \| should be 1`
`35`		`- $validator.Errors \| select-object -First 1 \| should match "broken_wget.(line 5).(position 4)"`
	`33`	`+ $validator.Validate("$working_dir/broken_wget.json") \| should -BeFalse`
	`34`	`+ $validator.Errors.Count \| should -be 1`
	`35`	`+ $validator.Errors \| select-object -First 1 \| should -match "broken_wget.(line 5).(position 4)"`
`36`	`36`	`}`
`37`	`37`	`it "fails with invalid manifest" {`
`38`	`38`	`$validator = new-object Scoop.Validator($schema, $true)`
`39`		`- $validator.Validate("$working_dir/invalid_wget.json") \| should be $false`
`40`		`- $validator.Errors.Count \| should be 16`
`41`		`- $validator.Errors \| select-object -First 1 \| should match "invalid_wget.randomproperty.properties\.$"`
`42`		`- $validator.Errors \| select-object -Last 1 \| should match "invalid_wget.*version\.$"`
	`39`	`+ $validator.Validate("$working_dir/invalid_wget.json") \| should -BeFalse`
	`40`	`+ $validator.Errors.Count \| should -be 16`
	`41`	`+ $validator.Errors \| select-object -First 1 \| should -match "invalid_wget.randomproperty.properties\.$"`
	`42`	`+ $validator.Errors \| select-object -Last 1 \| should -match "invalid_wget.*version\.$"`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`@@ -74,7 +74,7 @@ describe -Tag 'Manifests' "manifest-validation" {`
`74`	`74`	`if ($validator.Errors.Count -gt 0) {`
`75`	`75`	`write-host -f yellow $validator.ErrorsAsString`
`76`	`76`	`}`
`77`		`- $validator.Errors.Count \| should be 0`
	`77`	`+ $validator.Errors.Count \| should -be 0`
`78`	`78`	`} catch {`
`79`	`79`	`if($_.exception.message -like 'The free-quota limit of 1000 schema validations per hour has been reached.') {`
`80`	`80`	`$quota_exceeded = $true`
`@@ -91,7 +91,7 @@ describe -Tag 'Manifests' "manifest-validation" {`
`91`	`91`	`if(!$url) {`
`92`	`92`	`$url = $url64`
`93`	`93`	`}`
`94`		`- $url \| should not benullorempty`
	`94`	`+ $url \| should -not -benullorempty`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,15 @@ describe "versions" -Tag 'Scoop' {`
`7`	`7`	`$b = '1.8.5-1'`
`8`	`8`	`$res = compare_versions $a $b`
`9`	`9`
`10`		`- $res \| should be 1`
	`10`	`+ $res \| should -be 1`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`it 'handles plain string version comparison to int version' {`
`14`	`14`	`$a = 'latest'`
`15`	`15`	`$b = '20150405'`
`16`	`16`	`$res = compare_versions $a $b`
`17`	`17`
`18`		`- $res \| should be 1`
	`18`	`+ $res \| should -be 1`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`it 'handles dashed version components' {`
`@@ -24,14 +24,14 @@ describe "versions" -Tag 'Scoop' {`
`24`	`24`
`25`	`25`	`$res = compare_versions $a $b`
`26`	`26`
`27`		`- $res \| should be -1`
	`27`	`+ $res \| should -be -1`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`it 'handles comparsion against en empty string' {`
`31`		`- compare_versions '7.0.4-9' '' \| should be 1`
	`31`	`+ compare_versions '7.0.4-9' '' \| should -be 1`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`it 'handles equal versions' {`
`35`		`- compare_versions '12.0' '12.0' \| should be 0`
	`35`	`+ compare_versions '12.0' '12.0' \| should -be 0`
`36`	`36`	`}`
`37`	`37`	`}`