Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ enum OperationsDomainConfigPolicy {
}

static func action(for raw: String?, currentlyStored: String?) -> Action {
guard let value = raw, !value.isEmpty else {
let trimmed = raw?.trimmingCharacters(in: .whitespacesAndNewlines)
guard let value = trimmed, !value.isEmpty else {
return currentlyStored == nil ? .keep : .clear
}

Expand Down
26 changes: 26 additions & 0 deletions MindboxTests/Network/OperationsURLRoutingTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,36 @@ struct OperationsURLRoutingTests {
#expect(OperationsDomainConfigPolicy.action(for: "", currentlyStored: "https://old.ru") == .clear)
}

@Test("Policy — clears on whitespace-only string when something is stored (Android parity)")
func policyClearsOnWhitespaceWhenStored() {
#expect(OperationsDomainConfigPolicy.action(for: " ", currentlyStored: "https://old.ru") == .clear)
#expect(OperationsDomainConfigPolicy.action(for: "\t\n ", currentlyStored: "https://old.ru") == .clear)
}

@Test("Policy — no-ops when nothing stored and nothing came")
func policyKeepsOnNothingToChange() {
#expect(OperationsDomainConfigPolicy.action(for: nil, currentlyStored: nil) == .keep)
#expect(OperationsDomainConfigPolicy.action(for: "", currentlyStored: nil) == .keep)
#expect(OperationsDomainConfigPolicy.action(for: " ", currentlyStored: nil) == .keep)
}

@Test("Policy — trims surrounding whitespace before evaluating value")
func policyTrimsSurroundingWhitespace() {
// Trimmed value matches stored after canonicalization → no-op.
#expect(
OperationsDomainConfigPolicy.action(for: " anonymizer.client.ru ", currentlyStored: "https://anonymizer.client.ru")
== .keep
)
// Trimmed value differs from stored → save canonical form.
#expect(
OperationsDomainConfigPolicy.action(for: " new.client.ru ", currentlyStored: "https://old.ru")
== .save("https://new.client.ru")
)
// Trimmed value with nothing stored → save canonical form.
#expect(
OperationsDomainConfigPolicy.action(for: " valid.host.ru ", currentlyStored: nil)
== .save("https://valid.host.ru")
)
}

@Test("Policy — rejects format-broken incoming value (previous kept intact)")
Expand Down