mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-11-22 05:25:41 +00:00
Add versioned sheet-local drafts, normalized previews, custom identity validation, and explicit saves through the existing rule-document transaction. Preserve UUIDs, builtin memberships, disabled identities, and deployment recovery outcomes. Include approved Chinese and English editor copy. Verify public Workflow commands, the production Controller adapter with hostless tests, and compiled bilingual resources. Visual acceptance remains manual.
104 lines
4.9 KiB
Swift
104 lines
4.9 KiB
Swift
import XCTest
|
|
|
|
@testable import ShadowsocksX_NG2
|
|
|
|
/// Verify the editor's public commands against the production commit adapter,
|
|
/// using the existing hostless runtime and system-proxy fixtures.
|
|
extension ProxyRuntimeControllerTests {
|
|
func testEditorSaveWhileOffPersistsWithoutStartingRuntime() async throws {
|
|
let (store, _) = try makeCustomRuleStore()
|
|
let controller = makeControllerWithCustomRules(
|
|
store: store, settings: ProxySettings(listen: ActivationFixture.listen, agentEnabled: false))
|
|
let workflow = editingWorkflow(controller)
|
|
await workflow.refresh()
|
|
var draft = try XCTUnwrap(workflow.makeCustomRuleDraft())
|
|
draft.kind = .ipAddress
|
|
draft.content = "8.8.8.8"
|
|
draft.action = .direct
|
|
let result = await workflow.saveCustomRule(draft)
|
|
XCTAssertEqual(result, .committed(.saved))
|
|
XCTAssertEqual(try store.load().first?.id, draft.id)
|
|
XCTAssertEqual(controller.state, .off)
|
|
XCTAssertEqual(agent.registerCount, 0)
|
|
XCTAssertEqual(workflow.snapshot.commitFeedback?.operation, .add)
|
|
}
|
|
|
|
func testEditorChangesRuntimeACLOnceAndRetainsUUIDAcrossEdits() async throws {
|
|
let seeded = try makeSeededCatalog()
|
|
let (store, _) = try makeCustomRuleStore()
|
|
let controller = makeControllerWithCustomRules(
|
|
store: store,
|
|
settings: ProxySettings(
|
|
listen: ActivationFixture.listen, preferredMode: .rule,
|
|
ruleDefaultAction: .proxyWhenUnmatched, agentEnabled: true), proxyMode: .rule)
|
|
try await controller.activate(seeded.server)
|
|
let workflow = editingWorkflow(controller)
|
|
await workflow.refresh()
|
|
let registrations = agent.registerCount
|
|
var draft = try XCTUnwrap(workflow.makeCustomRuleDraft())
|
|
draft.content = "new-rule.example"
|
|
draft.action = .direct
|
|
let added = await workflow.saveCustomRule(draft)
|
|
XCTAssertEqual(added, .committed(.applied))
|
|
XCTAssertEqual(agent.registerCount, registrations + 1)
|
|
let runtimeStore = RuntimeFileStore(fileURL: runtime.contract)
|
|
XCTAssertTrue(try activeACLContent(runtimeStore).contains("||new-rule.example"))
|
|
var edited = try XCTUnwrap(workflow.makeCustomRuleDraft(editing: draft.id))
|
|
edited.content = "edited-rule.example"
|
|
let saved = await workflow.saveCustomRule(edited)
|
|
XCTAssertEqual(saved, .committed(.applied))
|
|
XCTAssertEqual(agent.registerCount, registrations + 2)
|
|
XCTAssertEqual(try store.load().map(\.id), [draft.id])
|
|
XCTAssertFalse(try activeACLContent(runtimeStore).contains("||new-rule.example"))
|
|
XCTAssertTrue(try activeACLContent(runtimeStore).contains("||edited-rule.example"))
|
|
XCTAssertEqual(workflow.snapshot.commitFeedback?.operation, .edit)
|
|
}
|
|
|
|
func testEditorFailedDeploymentKeepsDraftAndRestoresSavedSnapshotAndACL() async throws {
|
|
let seeded = try makeSeededCatalog()
|
|
let (store, _) = try makeCustomRuleStore()
|
|
let existing = CustomRule(action: .direct, match: .domainSuffix("kept.example"))
|
|
try store.save([existing])
|
|
let controller = makeControllerWithCustomRules(
|
|
store: store,
|
|
settings: ProxySettings(
|
|
listen: ActivationFixture.listen, preferredMode: .rule,
|
|
ruleDefaultAction: .proxyWhenUnmatched, agentEnabled: true), proxyMode: .rule)
|
|
try await controller.activate(seeded.server)
|
|
let workflow = editingWorkflow(controller)
|
|
await workflow.refresh()
|
|
let version = workflow.snapshot.version
|
|
let runtimeStore = RuntimeFileStore(fileURL: runtime.contract)
|
|
let originalRuntime = try XCTUnwrap(runtimeStore.loadDocument())
|
|
agent.onRegister = {
|
|
guard let requested = runtimeStore.loadDocument() else { return }
|
|
let content =
|
|
(try? Data(contentsOf: runtimeStore.aclFileURL))
|
|
.flatMap { String(bytes: $0, encoding: .utf8) } ?? ""
|
|
try? runtimeStore.writeRuntimeReceipt(
|
|
for: content.contains("new-rule.example") ? originalRuntime : requested, processID: 42)
|
|
}
|
|
var draft = try XCTUnwrap(workflow.makeCustomRuleDraft(editing: existing.id))
|
|
draft.content = "new-rule.example"
|
|
let result = await workflow.saveCustomRule(draft)
|
|
XCTAssertEqual(result, .committed(.rolledBack))
|
|
XCTAssertEqual(try store.load(), [existing])
|
|
XCTAssertEqual(workflow.snapshot.version, version)
|
|
XCTAssertEqual(
|
|
workflow.snapshot.rows.first { $0.customIDs.contains(existing.id) }?.identity,
|
|
existing.identity)
|
|
XCTAssertEqual(runtimeStore.loadDocument(), originalRuntime)
|
|
XCTAssertEqual(controller.state, .running)
|
|
let preview = await workflow.previewCustomRule(draft)
|
|
XCTAssertNil(preview.failure, "The user may retry the same draft after a complete rollback")
|
|
XCTAssertEqual(preview.displayContent, "new-rule.example")
|
|
}
|
|
|
|
private func editingWorkflow(_ controller: ProxyRuntimeController) -> RulesWorkflow {
|
|
RulesWorkflow(
|
|
loadDocument: { try controller.ruleDocuments.load() },
|
|
commitDocument: { await controller.commitRuleDocument($0) },
|
|
builtinSnapshots: controller.ruleSnapshots)
|
|
}
|
|
}
|