You are a constitutional council ranking individual git commits for ownership allocation. Compare these two commits. Decide which contributed more lasting value to the project. Judge substance, not spectacle: - Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise. - Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one. - Do not favor a side merely because its patch is longer or noisier. - Weight what the change does for the project, not the contributor's name. Return ONLY a JSON object: {"winner": "A" or "B", "ratio": "N:M", "explanation": "..."} The explanation must cite concrete differences in the patches (1-3 sentences). Side A — contributor: tommy-mor Side A — commit message: [5db58b98] Improve vote pair selection for spanning trees and rank refinement. Prefer attaching unranked items to established components before comparing isolates, then zip down adjacent rank-centrality pairs once the pool is fully connected, skipping pairs that already have votes. Co-authored-by: Cursor Side A — unified diff (full patch): diff --git a/server/src/pair.rs b/server/src/pair.rs index 54b5d2417e9dba04ed8df422156e274c2b2f76b2..c14de4b0502c8b5a17cddf3746077739d56e03e0 100644 --- a/server/src/pair.rs +++ b/server/src/pair.rs @@ -3,13 +3,21 @@ //! Pair selection prefers **bridge** votes — comparisons between items in //! different connected components of the voted-pairs graph — so the pool //! merges into one ranking group before refining within it. +//! +//! Among unvoted bridges, prefer merging established voted components, then +//! attaching a never-voted child to an established component, and only then +//! comparing two never-voted children (so the voted graph grows as one tree). +//! +//! Once every pool child sits in one voted component, refinement **zips** down +//! the rank-centrality order: prefer 1 vs 2, then 2 vs 3, and so on, skipping +//! pairs that already have a vote. use rand::seq::SliceRandom; use std::collections::{HashMap, HashSet}; use crate::{ path_types::ItemId, - ranking::connected_components_from_voted_pairs, + ranking::{connected_components_from_voted_pairs, ranked_items}, reducer::{GlobalTree, GroupState}, }; @@ -28,36 +36,77 @@ fn pair_is_voted(group: &GroupState, a: &ItemId, b: &ItemId) -> bool { group.voted_pairs.contains(&(i, j)) } -/// Component id per pool item: voted-pairs graph components plus one id per -/// never-voted child. -fn component_ids(group: &GroupState, pool: &[ItemId]) -> HashMap { +/// Voted-pairs layout for pool items: component id per item plus which ids are +/// multi-node voted components (ranked groups in the UI). +struct ComponentLayout { + ids: HashMap, + established: HashSet, +} + +fn component_layout(group: &GroupState, pool: &[ItemId]) -> ComponentLayout { let n = group.idx_to_item.len(); let (comps, isolates) = connected_components_from_voted_pairs(n, group.voted_pairs.iter().copied()); - let mut out: HashMap = HashMap::new(); + let mut established = HashSet::new(); + let mut ids: HashMap = HashMap::new(); for (comp_idx, comp) in comps.iter().enumerate() { + if comp.len() >= 2 { + established.insert(comp_idx); + } for &idx in comp { if idx < n { - out.insert(group.idx_to_item[idx].clone(), comp_idx); + ids.insert(group.idx_to_item[idx].clone(), comp_idx); } } } let mut next = comps.len(); for &idx in &isolates { if idx < n { - out.insert(group.idx_to_item[idx].clone(), next); + ids.insert(group.idx_to_item[idx].clone(), next); next += 1; } } for item in pool { - out.entry(item.clone()).or_insert_with(|| { + ids.entry(item.clone()).or_insert_with(|| { let id = next; next += 1; id }); } - out + ComponentLayout { ids, established } +} + +/// Every pool child shares one multi-node voted component (spanning tree phase done). +fn pool_fully_connected(layout: &ComponentLayout, pool: &[ItemId]) -> bool { + if pool.len() < 2 { + return false; + } + let mut comp_id = None; + for item in pool { + let Some(id) = layout.ids.get(item) else { + return false; + }; + if !layout.established.contains(id) { + return false; + } + match comp_id { + None => comp_id = Some(*id), + Some(expected) if expected == *id => {} + _ => return false, + } + } + comp_id.is_some() +} + +/// Pool children that appear in `group`, sorted best rank first. +fn ranked_pool_order(group: &GroupState, pool: &[ItemId]) -> Vec { + let pool_set: HashSet<_> = pool.iter().collect(); + ranked_items(group) + .into_iter() + .map(|r| r.item) + .filter(|id| pool_set.contains(id)) + .collect() } #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] @@ -72,19 +121,108 @@ enum PairPriority { WithinVoted = 3, } -fn pair_priority( +/// Tie-break among unvoted bridge pairs. +#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] +enum BridgeSubPriority { + /// Both endpoints lie in established (multi-node) voted components. + MergeEstablished = 0, + /// One established component member and one never-voted child. + AttachIsolate = 1, + /// Two never-voted children (separate singleton components). + IsolatePair = 2, +} + +/// Tie-break among within-component pairs once the pool is one connected group. +#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] +struct WithinSubPriority { + /// 1 = adjacent ranks (i vs i+1); larger = farther apart in the order. + rank_gap: usize, + /// min rank index of the two — zip from the top (1 vs 2 before 2 vs 3). + zip_index: usize, +} + +const WITHIN_SUB_WORST: WithinSubPriority = WithinSubPriority { + rank_gap: usize::MAX, + zip_index: usize::MAX, +}; + +#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] +struct PairSortKey { + priority: PairPriority, + bridge_sub: BridgeSubPriority, + within_sub: WithinSubPriority, +} + +fn item_in_established(layout: &ComponentLayout, item: &ItemId) -> bool { + layout + .ids + .get(item) + .is_some_and(|id| layout.established.contains(id)) +} + +fn bridge_sub_priority(layout: &ComponentLayout, a: &ItemId, b: &ItemId) -> BridgeSubPriority { + let a_est = item_in_established(layout, a); + let b_est = item_in_established(layout, b); + match (a_est, b_est) { + (true, true) => BridgeSubPriority::MergeEstablished, + (true, false) | (false, true) => BridgeSubPriority::AttachIsolate, + (false, false) => BridgeSubPriority::IsolatePair, + } +} + +fn within_sub_priority( + group: &GroupState, + pool: &[ItemId], + layout: &ComponentLayout, + a: &ItemId, + b: &ItemId, +) -> WithinSubPriority { + if !pool_fully_connected(layout, pool) { + return WITHIN_SUB_WORST; + } + let order = ranked_pool_order(group, pool); + let (Some(i), Some(j)) = (order.iter().position(|x| x == a), order.iter().position(|x| x == b)) + else { + return WITHIN_SUB_WORST; + }; + WithinSubPriority { + rank_gap: i.abs_diff(j), + zip_index: i.min(j), + } +} + +fn pair_sort_key( group: &GroupState, - components: &HashMap, + pool: &[ItemId], + layout: &ComponentLayout, a: &ItemId, b: &ItemId, -) -> PairPriority { +) -> PairSortKey { let voted = pair_is_voted(group, a, b); - let bridge = components.get(a) != components.get(b); - match (bridge, voted) { + let bridge = layout.ids.get(a) != layout.ids.get(b); + let priority = match (bridge, voted) { (true, false) => PairPriority::BridgeUnvoted, (false, false) => PairPriority::WithinUnvoted, (true, true) => PairPriority::BridgeVoted, (false, true) => PairPriority::WithinVoted, + }; + let bridge_sub = if priority == PairPriority::BridgeUnvoted { + bridge_sub_priority(layout, a, b) + } else { + BridgeSubPriority::MergeEstablished + }; + let within_sub = if matches!( + priority, + PairPriority::WithinUnvoted | PairPriority::WithinVoted + ) { + within_sub_priority(group, pool, layout, a, b) + } else { + WITHIN_SUB_WORST + }; + PairSortKey { + priority, + bridge_sub, + within_sub, } } @@ -109,9 +247,12 @@ fn candidate_pairs(pool: &[ItemId], exclude: Option<(&ItemId, &ItemId)>) -> Vec< /// Pick the next pair to vote on within `pool`. /// -/// 1. Prefer unvoted **bridge** pairs (connect separate ranking components). -/// 2. Then unvoted within-component pairs (refinement). -/// 3. Then already-voted pairs (re-compare). +/// 1. Prefer unvoted **bridge** pairs (connect separate ranking components), +/// with sub-priority: merge established components, attach an isolate to +/// established, then compare two isolates. +/// 2. Then unvoted within-component pairs; when the pool is one connected group, +/// prefer adjacent ranks (1 vs 2, 2 vs 3, …) in order, skipping voted pairs. +/// 3. Then already-voted pairs (re-compare), with the same zip ordering. pub fn suggest_next_pair_in_pool( group: &GroupState, pool: &[ItemId], @@ -121,15 +262,15 @@ pub fn suggest_next_pair_in_pool( if candidates.is_empty() { return None; } - let components = component_ids(group, pool); + let layout = component_layout(group, pool); let best = candidates .iter() - .map(|(a, b)| (pair_priority(group, &components, a, b), (a, b))) - .min_by_key(|(p, _)| *p)? + .map(|(a, b)| (pair_sort_key(group, pool, &layout, a, b), (a, b))) + .min_by_key(|(k, _)| *k)? .0; let best_pairs: Vec<(ItemId, ItemId)> = candidates .into_iter() - .filter(|(a, b)| pair_priority(group, &components, a, b) == best) + .filter(|(a, b)| pair_sort_key(group, pool, &layout, a, b) == best) .collect(); best_pairs.choose(&mut rand::thread_rng()).cloned() } @@ -303,6 +444,38 @@ mod tests { assert!(from_ab && from_cd, "expected bridge pair, got {:?}", chosen); } + #[test] + fn suggest_prefers_attach_over_isolate_pair_among_many_unranked() { + let parent = ItemId::parse("reddit.com/r/rust").unwrap(); + let mut tree = seed_children( + &parent, + &[ + "reddit.com/r/rust/a", + "reddit.com/r/rust/b", + "reddit.com/r/rust/c", + "reddit.com/r/rust/d", + "reddit.com/r/rust/e", + ], + ); + let ab = + VoteData::from_recorded(1, "reddit.com/r/rust/a", "reddit.com/r/rust/b", 2, 1).unwrap(); + tree.apply_vote(&parent, ab); + let group = tree.get(&parent).unwrap().local_ranking.clone(); + let pool = children_of(&tree, &parent); + let pair = suggest_next_pair_in_pool(&group, &pool, None).unwrap(); + let chosen = pair_set(&pair); + let from_ab = + chosen.contains("reddit.com/r/rust/a") || chosen.contains("reddit.com/r/rust/b"); + let from_cde = chosen.contains("reddit.com/r/rust/c") + || chosen.contains("reddit.com/r/rust/d") + || chosen.contains("reddit.com/r/rust/e"); + assert!( + from_ab && from_cde, + "expected ranked+unranked attach, got {:?}", + chosen + ); + } + #[test] fn suggest_connects_isolate_to_existing_component() { let parent = ItemId::parse("reddit.com/r/rust").unwrap(); @@ -325,6 +498,65 @@ mod tests { assert!(chosen.contains("reddit.com/r/rust/a") || chosen.contains("reddit.com/r/rust/b")); } + #[test] + fn suggest_zips_adjacent_ranks_when_tree_complete() { + let parent = ItemId::parse("reddit.com/r/rust").unwrap(); + let mut tree = seed_children( + &parent, + &[ + "reddit.com/r/rust/a", + "reddit.com/r/rust/b", + "reddit.com/r/rust/c", + ], + ); + // Star at a connects all three; b-c is the only unvoted adjacent pair left. + for (a, b, l, r) in [ + ("reddit.com/r/rust/a", "reddit.com/r/rust/b", 3, 1), + ("reddit.com/r/rust/a", "reddit.com/r/rust/c", 2, 1), + ] { + let v = VoteData::from_recorded(1, a, b, l, r).unwrap(); + tree.apply_vote(&parent, v); + } + let group = tree.get(&parent).unwrap().local_ranking.clone(); + let pool = children_of(&tree, &parent); + let pair = suggest_next_pair_in_pool(&group, &pool, None).unwrap(); + let chosen = pair_set(&pair); + // a-b and a-c voted; b-c is the only unvoted adjacent pair in rank order. + assert!(chosen.contains("reddit.com/r/rust/b")); + assert!(chosen.contains("reddit.com/r/rust/c")); + } + + #[test] + fn suggest_zip_prefers_1v2_before_2v3_when_both_unvoted() { + let parent = ItemId::parse("reddit.com/r/rust").unwrap(); + let mut tree = seed_children( + &parent, + &[ + "reddit.com/r/rust/a", + "reddit.com/r/rust/b", + "reddit.com/r/rust/c", + "reddit.com/r/rust/d", + ], + ); + // Hub at c connects all four; leave rank-adjacent a-b and b-c unvoted. + for (a, b, l, r) in [ + ("reddit.com/r/rust/c", "reddit.com/r/rust/d", 3, 1), + ("reddit.com/r/rust/b", "reddit.com/r/rust/c", 2, 1), + ("reddit.com/r/rust/a", "reddit.com/r/rust/c", 2, 1), + ] { + let v = VoteData::from_recorded(1, a, b, l, r).unwrap(); + tree.apply_vote(&parent, v); + } + let group = tree.get(&parent).unwrap().local_ranking.clone(); + let pool = children_of(&tree, &parent); + assert!(pool_fully_connected(&component_layout(&group, &pool), &pool)); + let pair = suggest_next_pair_in_pool(&group, &pool, None).unwrap(); + let chosen = pair_set(&pair); + // Top adjacent unvoted edge should be a-b (zip index 0), not b-c (index 1). + assert!(chosen.contains("reddit.com/r/rust/a")); + assert!(chosen.contains("reddit.com/r/rust/b")); + } + #[test] fn resolve_pair_picks_from_pool() { let parent = ItemId::parse("reddit.com/r/rust").unwrap(); Side B — contributor: tommy-mor Side B — commit message: [aa0b175c] Enforce vote ratio constraints: both sides ≥ 1, max 100. Zero on either side produces no valid graph edge; ratios above 100 add no meaningful signal. Enforce in the DSL parser, browser POST handler, and reducer guard. Update browser pool test to use 99:1 instead of 100:0. Add unit and integration regression tests. Co-Authored-By: Claude Sonnet 4.6 Side B — unified diff (full patch): diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs index b79efdb4d52bd445a67f38cbfd61d3507d2b3014..bc8a0130b434cc7880a4bf16eb9237080c4aa383 100644 --- a/server/src/api/ui_html.rs +++ b/server/src/api/ui_html.rs @@ -243,11 +243,23 @@ async fn dispatch_ui_action( let pool_id = pool.as_deref().and_then(|p| { crate::path_types::ItemId::parse(p.trim()).map(|i| i.normalized_storage()) }); - let mut rl = ratio_left.trim().parse::().unwrap_or(0).max(0); - let mut rr = ratio_right.trim().parse::().unwrap_or(0).max(0); - if rl == 0 && rr == 0 { - rl = 1; - rr = 1; + let rl = ratio_left.trim().parse::().unwrap_or(0).max(0); + let rr = ratio_right.trim().parse::().unwrap_or(0).max(0); + if rl == 0 || rr == 0 { + return form_js_error( + err_tgt.as_ref(), + "invalid ratio", + "Both ratio sides must be ≥ 1.", + ) + .into_response(); + } + if rl > 100 || rr > 100 { + return form_js_error( + err_tgt.as_ref(), + "invalid ratio", + "Ratio sides must be ≤ 100.", + ) + .into_response(); } let text = format!( diff --git a/server/src/dsl.rs b/server/src/dsl.rs index faa8aac6616bc6ea2b102d08ae999c01a716ef6e..338feacc579a92bed291867cc0f2f62462737462 100644 --- a/server/src/dsl.rs +++ b/server/src/dsl.rs @@ -545,9 +545,14 @@ fn parse_block_prefixed_statement( let ((ratio_left, ratio_right), k) = parse_comparison_at(s, i) .ok_or_else(|| DslError::Parse(format!("invalid comparison near: {}", &s[i..])))?; - if ratio_left == 0 && ratio_right == 0 { + if ratio_left == 0 || ratio_right == 0 { return Err(DslError::Parse( - "vote ratio 0:0 is invalid; use 1:1 for a tie or omit the vote".to_string(), + "vote ratio sides must be ≥ 1; use 1:1 for a tie or omit the vote".to_string(), + )); + } + if ratio_left > 100 || ratio_right > 100 { + return Err(DslError::Parse( + "vote ratio sides must be ≤ 100".to_string(), )); } i = skip_ws(s, k); @@ -929,11 +934,50 @@ mod tests { let err = parse_full("{tie placeholder}\n~/a 0:0 ~/b").unwrap_err(); let DslError::Parse(msg) = err; assert!( - msg.contains("0:0"), - "expected 0:0 rejection message, got: {msg}" + msg.contains("≥ 1"), + "expected zero-side rejection message, got: {msg}" ); } + #[test] + fn parse_vote_rejects_left_zero_ratio() { + let err = parse_full("{prefer b}\n~/a 0:5 ~/b").unwrap_err(); + let DslError::Parse(msg) = err; + assert!( + msg.contains("≥ 1"), + "expected zero-side rejection message, got: {msg}" + ); + } + + #[test] + fn parse_vote_rejects_right_zero_ratio() { + let err = parse_full("{prefer a}\n~/a 5:0 ~/b").unwrap_err(); + let DslError::Parse(msg) = err; + assert!( + msg.contains("≥ 1"), + "expected zero-side rejection message, got: {msg}" + ); + } + + #[test] + fn parse_vote_rejects_over_max_ratio() { + let err = parse_full("{prefer a strongly}\n~/a 101:1 ~/b").unwrap_err(); + let DslError::Parse(msg) = err; + assert!( + msg.contains("≤ 100"), + "expected max ratio rejection message, got: {msg}" + ); + } + + #[test] + fn parse_vote_accepts_max_ratio() { + let doc = parse_full("{prefer a}\n~/a 100:1 ~/b").unwrap(); + assert!(matches!( + doc.statements.last(), + Some(Stmt::Vote { ratio_left: 100, ratio_right: 1, .. }) + )); + } + #[test] fn parse_full_interleaves_prose() { let input = "hello\n#tag\nworld"; diff --git a/server/src/reducer.rs b/server/src/reducer.rs index e949e8e092297eedd5c20c131f16ef0121f329b3..6841d35cfc9de2389f340a22b8a45acb335e36c3 100644 --- a/server/src/reducer.rs +++ b/server/src/reducer.rs @@ -119,11 +119,11 @@ impl GroupState { let (i, j) = if a_idx < b_idx { (a_idx, b_idx) } else { (b_idx, a_idx) }; self.voted_pairs.insert((i, j)); - let mut w_a = vote.ratio_left.max(0) as f64; - let mut w_b = vote.ratio_right.max(0) as f64; - if w_a == 0.0 && w_b == 0.0 { - w_a = 1.0; - w_b = 1.0; + let w_a = vote.ratio_left as f64; + let w_b = vote.ratio_right as f64; + if w_a == 0.0 || w_b == 0.0 { + // Zero on either side produces no valid edge; drop the vote. + return; } self.add_edge_weight(b_idx, a_idx, w_a); diff --git a/server/tests/basic.rs b/server/tests/basic.rs index 9d83e7a97e2c7494790db17c4b5b30c181705026..cc8c1a0d139f3722ba6ecd13dd001c65be835b67 100644 --- a/server/tests/basic.rs +++ b/server/tests/basic.rs @@ -175,14 +175,14 @@ fn reducer_clamps_score_bounds() { let mut state = ReducerState::default(); state.apply_event(ingest_event( 1, - "@00000000-0000-0000-0000-000000000000:test:local/test\n~/t/a {a}\n~/t/b {b}\n{huge}\n~/t/a 1000:1 ~/t/b\n", + "@00000000-0000-0000-0000-000000000000:test:local/test\n~/t/a {a}\n~/t/b {b}\n{huge}\n~/t/a 100:1 ~/t/b\n", )); state.apply_event(ingest_event( 2, - "@00000000-0000-0000-0000-000000000000:test:local/test\n{huge}\n~/t/a 1:1000 ~/t/b\n", + "@00000000-0000-0000-0000-000000000000:test:local/test\n{huge}\n~/t/a 1:100 ~/t/b\n", )); - assert_eq!(state.public().ranking_group.idx_to_item.len(), 2); // Should still work, scores clamped internally + assert_eq!(state.public().ranking_group.idx_to_item.len(), 2); // Should still work, scores handled internally } // ============================================================================ @@ -513,8 +513,8 @@ fn dsl_parse_rejects_zero_zero_vote_ratio() { .expect_err("0:0 vote must be rejected by the parser"); let slugsocial_server::dsl::DslError::Parse(msg) = err; assert!( - msg.contains("0:0"), - "expected message about invalid 0:0 ratio, got: {msg}" + msg.contains("≥ 1"), + "expected message about invalid zero ratio, got: {msg}" ); let mut state = ReducerState::default(); @@ -533,7 +533,7 @@ fn dsl_parse_rejects_zero_zero_vote_ratio() { #[test] fn reducer_negative_ratio_clamped_to_zero() { let _state = ReducerState::default(); - // GroupState::apply_vote clamps negatives to 0, then 0:0 -> 1:1 + // GroupState::apply_vote clamps negatives to 0; when either side is 0 the vote is dropped. let mut group = GroupState::new(); group.apply_vote(slugsocial_server::reducer::VoteData { ts: 1, @@ -546,12 +546,12 @@ fn reducer_negative_ratio_clamped_to_zero() { delegate: Some("00000000-0000-0000-0000-000000000000:test:local/test".to_string()), thread_tag: "t".to_string(), }); + // Items are registered, but the zero-clamped vote produces no edges. assert_eq!(group.idx_to_item.len(), 2); - // Both edges should exist (negatives clamped to 0, then 0:0 -> 1:1) let a_idx = group.item_to_idx[&item_id("https://slug.social/~/t/a")]; let b_idx = group.item_to_idx[&item_id("https://slug.social/~/t/b")]; - assert!(group.edges.contains_key(&(a_idx, b_idx))); - assert!(group.edges.contains_key(&(b_idx, a_idx))); + assert!(!group.edges.contains_key(&(a_idx, b_idx))); + assert!(!group.edges.contains_key(&(b_idx, a_idx))); } diff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs index 23db7b5672418d5bb0ab7529e05ef1f89e59062a..09c5481f039d59efb617a82bafcc432a186e2d30 100644 --- a/server/tests/integration_ui.rs +++ b/server/tests/integration_ui.rs @@ -256,3 +256,96 @@ async fn test_sse_public_thread_morph_includes_post_body_not_thread_not_found() ); } +fn ui_vote_compare_post_rpc( + room: &str, + thread_tag: &str, + left: &str, + right: &str, + ratio_left: &str, + ratio_right: &str, + explanation: &str, +) -> String { + serde_json::json!({ + "action": "vote_compare_post", + "room": room, + "thread_tag": thread_tag, + "left_item": left, + "right_item": right, + "ratio_left": ratio_left, + "ratio_right": ratio_right, + "explanation": explanation, + "next": "/vote", + }) + .to_string() +} + +#[tokio::test] +async fn test_vote_compare_post_rejects_zero_left_ratio() { + let (addr, _tmp, _log, _handle) = create_test_server().await; + let client = reqwest::Client::new(); + let bearer = test_bearer(); + + let rpc = ui_vote_compare_post_rpc("public", "test-vote", "~/a", "~/b", "0", "5", "prefer b"); + let resp = client + .post(format!("http://{addr}/ui")) + .header("Authorization", format!("Bearer {bearer}")) + .form(&[("__rpc__", rpc.as_str())]) + .send() + .await + .unwrap(); + + assert_eq!(resp.status(), reqwest::StatusCode::OK); + let js = resp.text().await.unwrap(); + assert!( + js.contains("invalid ratio") || js.contains("≥ 1"), + "expected zero-ratio rejection, got: {js}" + ); +} + +#[tokio::test] +async fn test_vote_compare_post_rejects_zero_right_ratio() { + let (addr, _tmp, _log, _handle) = create_test_server().await; + let client = reqwest::Client::new(); + let bearer = test_bearer(); + + let rpc = ui_vote_compare_post_rpc("public", "test-vote", "~/a", "~/b", "5", "0", "prefer a"); + let resp = client + .post(format!("http://{addr}/ui")) + .header("Authorization", format!("Bearer {bearer}")) + .form(&[("__rpc__", rpc.as_str())]) + .send() + .await + .unwrap(); + + assert_eq!(resp.status(), reqwest::StatusCode::OK); + let js = resp.text().await.unwrap(); + assert!( + js.contains("invalid ratio") || js.contains("≥ 1"), + "expected zero-ratio rejection, got: {js}" + ); +} + +#[tokio::test] +async fn test_vote_compare_post_rejects_over_max_ratio() { + let (addr, _tmp, _log, _handle) = create_test_server().await; + let client = reqwest::Client::new(); + let bearer = test_bearer(); + + let rpc = + ui_vote_compare_post_rpc("public", "test-vote", "~/a", "~/b", "101", "1", "prefer a"); + let resp = client + .post(format!("http://{addr}/ui")) + .header("Authorization", format!("Bearer {bearer}")) + .form(&[("__rpc__", rpc.as_str())]) + .send() + .await + .unwrap(); + + assert_eq!(resp.status(), reqwest::StatusCode::OK); + let js = resp.text().await.unwrap(); + assert!( + js.contains("invalid ratio") || js.contains("≤ 100"), + "expected over-max ratio rejection, got: {js}" + ); +} + diff --git a/test/browser_vote_pool.clj b/test/browser_vote_pool.clj index 23d0bd80b02bd8b1b48853454bed02793296550e..738608801027d1e662660b5d6c830b4ccd07c434 100644 --- a/test/browser_vote_pool.clj +++ b/test/browser_vote_pool.clj @@ -38,8 +38,8 @@ ;; Set the hidden ratio inputs so the alphabetically-earlier item wins. (defn- set-ratio! [pg left-text right-text] (let [[rl rr] (if (neg? (compare (leaf left-text) (leaf right-text))) - [100 0] ; left is earlier → prefer left - [0 100])] ; right is earlier → prefer right + [99 1] ; left is earlier → prefer left + [1 99])] ; right is earlier → prefer right (page/evaluate pg (str "document.getElementById('vote-ratio-left').value='" rl "'")) (page/evaluate pg (str "document.getElementById('vote-ratio-right').value='" rr "'"))))