phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-06 19:40:08 +02:00
Code Releases Activity

✅ Fix broken tests

Browse Source
This commit is contained in:
Nico Verbruggen
2023-11-24 23:29:25 +01:00
parent 5bda727981
commit da41673855
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpmon/Common/PHP/PHP Version/PhpEnvironments.swift
View File

@ -37,6 +37,7 @@ class PhpEnvironments {
from: brewPhpAlias.data(using: .utf8)!
).first!
PhpEnvironments.brewPhpAlias = self.homebrewPackage.version
Log.info("[BREW] On your system, the `php` formula means version \(homebrewPackage.version).")
// Check if that version actually corresponds to an older version

6
phpmon/Common/Testables/TestableConfiguration.swift
View File

@ -63,8 +63,8 @@ public struct TestableConfiguration: Codable {
: .fake(.binary),
"/opt/homebrew/Cellar/php/\(version.long)/bin/php-config"
: .fake(.binary),
"/opt/homebrew/etc/php/\(version.short)/php-fpm.d/www.conf"
: .fake(.text),
// "/opt/homebrew/etc/php/\(version.short)/php-fpm.d/www.conf"
// : .fake(.text),
"/opt/homebrew/etc/php/\(version.short)/php-fpm.d/valet-fpm.conf"
: .fake(.text),
"/opt/homebrew/etc/php/\(version.short)/php.ini"
@ -94,7 +94,7 @@ public struct TestableConfiguration: Codable {
/opt/homebrew/etc/php/\(version.short)/conf.d/php-memory-limits.ini,
"""
} else {
self.shellOutput["sudo /opt/homebrew/bin/brew services stop php@\(version.short)"] = .instant("")
self.shellOutput["ls /opt/homebrew/opt | grep php@"] =
BatchFakeShellOutput.instant(
self.secondaryPhpVersions

2
phpmon/Domain/Integrations/Homebrew/BrewFormula.swift
View File

@ -55,7 +55,7 @@ struct BrewFormula: Equatable {
}
var unavailableAfterUpgrade: Bool {
if (installedVersion == nil || upgradeVersion == nil) {
if installedVersion == nil || upgradeVersion == nil {
return false
}

9
tests/ui/MainMenuTest.swift
View File

@ -80,16 +80,17 @@ final class MainMenuTest: UITestCase {
// Should display loader
assertExists(app.staticTexts["phpman.busy.title".localized], 1)
// After loading, should display PHP 8.2
// After loading, should display PHP 8.2 and PHP 8.3
assertExists(app.staticTexts["PHP 8.2"], 5)
assertExists(app.staticTexts["PHP 8.3"])
// Should also display pre-release version
assertExists(app.staticTexts["PHP 8.3"])
assertExists(app.staticTexts["PHP 8.4"])
assertExists(app.staticTexts["phpman.version.prerelease".localized.uppercased()])
assertExists(app.staticTexts["phpman.version.available_for_installation".localized])
// But not PHP 8.4 (yet)
assertNotExists(app.staticTexts["PHP 8.4"])
// But not PHP 8.5 (yet)
assertNotExists(app.staticTexts["PHP 8.5"])
// Also, PHP 8.2 should have an update available
assertExists(app.staticTexts["phpman.version.has_update".localized(