Skip to content

Commit b790fbc

Browse files
steviecoastersteviecoaster
authored
Merge pull request chocolatey#192 from ryanrichter94/QSG-167
Fix/Update Pester Tests
2 parents 1a93d4d + 21367a4 commit b790fbc

File tree

5 files changed

+13
-98
lines changed

5 files changed

+13
-98
lines changed

‎tests/ccm.tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Describe "Chocolatey Central Management Configuration" {
2121
([System.Net.WebRequest]::Create("https://$($Fqdn):24020/ChocolateyManagementService") -as [System.net.HttpWebRequest]).GetResponse().StatusCode
2222
}
2323
catch {
24-
$_.Exception.Message -match '500'
24+
$_.Exception.Message -match '400'
2525
}
2626

2727
}

‎tests/jenkins.test.ps1

Lines changed: 7 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
Describe "Jenkins Configuration" {
22
Context "Installation Integrity" {
33
BeforeAll {
4-
$jenkins = choco list -lo -r | ConvertFrom-Csv -Delimiter '|' -Header Package,Version | Where-Object Package -eq 'jenkins'
4+
$jenkins = choco list -r | ConvertFrom-Csv -Delimiter '|' -Header Package,Version | Where-Object Package -eq 'jenkins'
55
$service = Get-Service jenkins
6-
$jenkinsVersion = '2.222.4'
76
}
87

98
It "Jenkins is installed" {
109
$jenkins | Should -Not -BeNullOrEmpty
1110
}
1211

13-
It "Jenkins is the correct version" {
14-
$jenkins.version | Should -Be $jenkinsVersion
15-
}
16-
1712
It "Service is installed" {
1813
$service | Should -Not -BeNullOrEmpty
1914
}
@@ -48,7 +43,7 @@ Describe "Jenkins Configuration" {
4843

4944
Context "Required Jobs" {
5045
BeforeAll {
51-
$jobs = (Get-ChildItem 'C:\Program Files (x86)\Jenkins\jobs\' -Directory).Name
46+
$jobs = (Get-ChildItem 'C:\ProgramData\Jenkins\.jenkins\jobs\' -Directory).Name
5247
}
5348

5449
It "'Internalize packages from the Community Repository' is present" {
@@ -72,93 +67,11 @@ Describe "Jenkins Configuration" {
7267

7368
Context "Required Plugins" {
7469
BeforeAll {
75-
$plugins = (Get-ChildItem 'C:\Program Files (x86)\Jenkins\plugins' -Directory).Name
76-
}
77-
It "<name> is installed" -Foreach @(
78-
@{Name = 'ace-editor' }
79-
@{Name = 'ant' }
80-
@{Name = 'antisamy-markup-formatter' }
81-
@{Name = 'apache-httpcomponents-client-4-api' }
82-
@{Name = 'bootstrap4-api' }
83-
@{Name = 'bouncycastle-api' }
84-
@{Name = 'branch-api' }
85-
@{Name = 'build-timeout' }
86-
@{Name = 'caffeine-api' }
87-
@{Name = 'checks-api' }
88-
@{Name = 'cloudbees-folder' }
89-
@{Name = 'command-launcher' }
90-
@{Name = 'credentials' }
91-
@{Name = 'credentials-binding' }
92-
@{Name = 'display-url-api' }
93-
@{Name = 'durable-task' }
94-
@{Name = 'echarts-api' }
95-
@{Name = 'email-ext' }
96-
@{Name = 'font-awesome-api' }
97-
@{Name = 'git' }
98-
@{Name = 'git-client' }
99-
@{Name = 'git-server' }
100-
@{Name = 'github' }
101-
@{Name = 'github-api' }
102-
@{Name = 'github-branch-source' }
103-
@{Name = 'gradle' }
104-
@{Name = 'handlebars' }
105-
@{Name = 'jackson2-api' }
106-
@{Name = 'jdk-tool' }
107-
@{Name = 'jjwt-api' }
108-
@{Name = 'jquery3-api' }
109-
@{Name = 'jsch' }
110-
@{Name = 'junit' }
111-
@{Name = 'ldap' }
112-
@{Name = 'lockable-resources' }
113-
@{Name = 'mailer' }
114-
@{Name = 'mapdb-api' }
115-
@{Name = 'matrix-auth' }
116-
@{Name = 'matrix-project' }
117-
@{Name = 'momentjs' }
118-
@{Name = 'okhttp-api' }
119-
@{Name = 'pam-auth' }
120-
@{Name = 'pipeline-build-step' }
121-
@{Name = 'pipeline-github-lib' }
122-
@{Name = 'pipeline-graph-analysis' }
123-
@{Name = 'pipeline-input-step' }
124-
@{Name = 'pipeline-milestone-step' }
125-
@{Name = 'pipeline-model-api' }
126-
@{Name = 'pipeline-model-definition' }
127-
@{Name = 'pipeline-model-extensions' }
128-
@{Name = 'pipeline-rest-api' }
129-
@{Name = 'pipeline-stage-step' }
130-
@{Name = 'pipeline-stage-tags-metadata' }
131-
@{Name = 'pipeline-stage-view' }
132-
@{Name = 'plain-credentials' }
133-
@{Name = 'plugin-util-api' }
134-
@{Name = 'popper-api' }
135-
@{Name = 'powershell' }
136-
@{Name = 'resource-disposer' }
137-
@{Name = 'scm-api' }
138-
@{Name = 'script-security' }
139-
@{Name = 'snakeyaml-api' }
140-
@{Name = 'ssh-credentials' }
141-
@{Name = 'ssh-slaves' }
142-
@{Name = 'structs' }
143-
@{Name = 'subversion' }
144-
@{Name = 'timestamper' }
145-
@{Name = 'token-macro' }
146-
@{Name = 'trilead-api' }
147-
@{Name = 'workflow-aggregator' }
148-
@{Name = 'workflow-api' }
149-
@{Name = 'workflow-basic-steps' }
150-
@{Name = 'workflow-cps' }
151-
@{Name = 'workflow-cps-global-lib' }
152-
@{Name = 'workflow-durable-task-step' }
153-
@{Name = 'workflow-job' }
154-
@{Name = 'workflow-multibranch' }
155-
@{Name = 'workflow-scm-step' }
156-
@{Name = 'workflow-step-api' }
157-
@{Name = 'workflow-support' }
158-
@{Name = 'ws-cleanup' }
159-
160-
) {
161-
$_.Name -in $plugins | Should -be $true
70+
$plugins = (Get-ChildItem 'C:\ProgramData\Jenkins\.jenkins\plugins\' -Directory).Name
71+
}
72+
It "powershell is installed" {
73+
74+
'powershell' -in $plugins | Should -be $true
16275
}
16376
}
16477
}

‎tests/nexus.tests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Param(
1010
Describe "Nexus Configuration" {
1111
Context "Installation Integrity" {
1212
BeforeAll {
13-
$nexus = choco list -lo -r | ConvertFrom-Csv -Delimiter '|' -Header Package,Version | Where-Object Package -eq nexus-repository
13+
$nexus = choco list -r | ConvertFrom-Csv -Delimiter '|' -Header Package,Version | Where-Object Package -eq nexus-repository
1414
$service = Get-Service nexus
1515
}
1616

@@ -102,7 +102,7 @@ nexus-args=${jetty.etc}/jetty.xml,${jetty.etc}/jetty-https.xml,${jetty.etc}/jett
102102

103103
Context "Package Availability" {
104104
BeforeAll {
105-
$packages = choco list -s ChocolateyInternal -r | ConvertFrom-Csv -Delimiter '|' -Header Package,Version
105+
$packages = choco search -s ChocolateyInternal -r | ConvertFrom-Csv -Delimiter '|' -Header Package,Version
106106
}
107107

108108
It "<Name> is in the repository" -ForEach @( $JointPackages + $RepositoryOnlyPackages ) {

‎tests/packages.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ $ServerOnlyPackages = @(
2222
@{Name = 'KB3063858' }
2323
@{Name = 'microsoft-edge' }
2424
@{Name = 'nexus-repository' }
25+
@{Name = 'Pester' }
2526
@{Name = 'sql-server-express' }
2627
@{Name = 'sql-server-management-studio' }
2728
@{Name = 'Temurinjre' }
29+
@{Name = 'Temurin11jre' }
2830
@{Name = 'vcredist140' }
2931
)
3032
$RepositoryOnlyPackages = @(

‎tests/server.tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Describe "Server Integrity" {
33
Context "Required Packages" {
44
BeforeAll {
5-
$packages = choco list -lo -r | ConvertFrom-Csv -Delimiter '|' -Header Package, Version
5+
$packages = choco list -r | ConvertFrom-Csv -Delimiter '|' -Header Package, Version
66
}
77

88
It "<Name> is installed" -Foreach @( $JointPackages + $ServerOnlyPackages ) {

0 commit comments

Comments
 (0)