3 files changed, 51 insertions, 28 deletions

diff --git a/tests/client_core.rs b/tests/client_core.rs
index ea99d52..e75a611 100644
--- a/tests/client_core.rs
+++ b/tests/client_core.rs
@@ -128,19 +128,19 @@ impl Harness {
 }
 
 #[test]
-fn play_shows_a_nine_line_board_and_fetches_the_balance() {
+fn play_shows_a_ten_line_board_and_fetches_the_balance() {
     let mut h = Harness::new();
     h.line("play slots 50");
 
-    assert_eq!(h.board().len(), 9);
+    assert_eq!(h.board().len(), 10);
     assert!(h.board()[1].contains("Bet: 50 PLN"));
     assert!(!h.board()[1].contains("Lines:"));
     assert!(h.board()[5].contains("Pays 3/4/5 x bet:"));
-    assert!(h.board()[5].contains("S 9/30/150"));
+    assert!(h.board()[6].contains("G 4/12/40 D 6/18/70 S 9/30/150"));
     assert!(h.sent.contains(&"INFO".to_string()));
 
     h.reply("INFO alice 1 1000");
-    assert_eq!(h.board().len(), 9);
+    assert_eq!(h.board().len(), 10);
     assert!(h.board()[1].contains("Balance: 1000 PLN"));
 }
 
@@ -151,22 +151,22 @@ fn spin_replaces_the_board_and_keeps_the_controls_line() {
     let lines_before_spin = h.screen.lines.len();
 
     h.key(Key::Char(' '));
-    assert_eq!(h.board().len(), 9);
-    assert!(h.board()[6].contains("Spinning..."));
-    assert!(h.board()[8].contains("[Q] Quit"));
+    assert_eq!(h.board().len(), 10);
+    assert!(h.board()[7].contains("Spinning..."));
+    assert!(h.board()[9].contains("[Q] Quit"));
     assert!(h.sent.iter().any(|line| line == "PLAY_START slots 50"));
     assert_eq!(h.screen.lines.len(), lines_before_spin);
 
     h.reply("GAME_RESULT session-1 100 50 1050 CCCCLLCLODGSDGS win 1 0,3,6");
-    assert_eq!(h.board().len(), 9);
+    assert_eq!(h.board().len(), 10);
     assert!(h
         .board()
         .get(2)
         .is_some_and(|line| line.contains("{ C } { C } { C } [ D ] [ D ]")));
-    assert!(h.board()[6].contains("Won 100 PLN"));
-    assert!(h.board()[7].contains("Winning lines: 1"));
+    assert!(h.board()[7].contains("Won 100 PLN"));
+    assert!(h.board()[8].contains("Winning lines: 1"));
     assert!(h.board()[1].contains("Balance: 1050 PLN"));
-    assert!(h.board()[8].contains("[Q] Quit"));
+    assert!(h.board()[9].contains("[Q] Quit"));
     assert_eq!(h.screen.lines.len(), lines_before_spin);
 }
 
@@ -180,7 +180,7 @@ fn changing_the_bet_after_a_spin_does_not_leave_stale_lines() {
 
     h.key(Key::Char('+'));
 
-    assert_eq!(h.board().len(), 9);
+    assert_eq!(h.board().len(), 10);
     assert!(h.board()[1].contains("Bet: 60 PLN"));
     assert!(h
         .board()
@@ -205,9 +205,9 @@ fn a_losing_spin_shows_no_win_and_no_winning_lines() {
 
     h.reply(&format!("GAME_RESULT session-1 0 10 990 {LOSS} none -"));
 
-    assert_eq!(h.board().len(), 9);
-    assert!(h.board()[6].contains("No win."));
-    assert_eq!(h.board()[7], "");
+    assert_eq!(h.board().len(), 10);
+    assert!(h.board()[7].contains("No win."));
+    assert_eq!(h.board()[8], "");
     assert!(!h.board()[2].contains('{'));
 }
 
@@ -219,9 +219,9 @@ fn a_mega_win_shows_all_winning_lines() {
 
     h.reply(&format!("GAME_RESULT session-1 750 10 1740 {ALL_C} mega 1,2,3,4,5 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14"));
 
-    assert_eq!(h.board().len(), 9);
-    assert!(h.board()[6].contains("MEGA WIN! 750 PLN"));
-    assert!(h.board()[7].contains("Winning lines: 1,2,3,4,5"));
+    assert_eq!(h.board().len(), 10);
+    assert!(h.board()[7].contains("MEGA WIN! 750 PLN"));
+    assert!(h.board()[8].contains("Winning lines: 1,2,3,4,5"));
     assert_eq!(h.board()[2].matches("{ C }").count(), 5);
 }
 
@@ -245,8 +245,8 @@ fn a_server_error_replaces_the_status_line() {
 
     h.reply("ERROR Insufficient balance");
 
-    assert_eq!(h.board().len(), 9);
-    assert!(h.board()[6].contains("ERROR: Insufficient balance"));
+    assert_eq!(h.board().len(), 10);
+    assert!(h.board()[7].contains("ERROR: Insufficient balance"));
     assert!(h.board()[2].contains("[ ? ]"));
     assert!(!h.board().iter().any(|line| line.contains("Spinning")));
 }
@@ -259,8 +259,8 @@ fn an_empty_reply_is_an_error_not_a_silent_spin() {
 
     h.reply("");
 
-    assert_eq!(h.board().len(), 9);
-    assert!(h.board()[6].contains("No response from server"));
+    assert_eq!(h.board().len(), 10);
+    assert!(h.board()[7].contains("No response from server"));
 }
 
 #[test]
@@ -344,7 +344,7 @@ fn play_without_a_bet_uses_the_default() {
     let mut h = Harness::new();
     h.line("play slots");
 
-    assert_eq!(h.board().len(), 9);
+    assert_eq!(h.board().len(), 10);
     assert!(h.board()[1].contains("Bet: 10 PLN"));
 }
 
diff --git a/tests/client_ui.rs b/tests/client_ui.rs
index a22fbe7..ea432e0 100644
--- a/tests/client_ui.rs
+++ b/tests/client_ui.rs
@@ -1,6 +1,7 @@
 use zagan_bet::client::ui::{
     command_names, completion_lines, display_width, first_contact_lines, format_pong,
     help_lines, host_lines, input_cursor_column, lines_to_move_up, parse_bet_arg, record_history,
+    visual_line_count,
 };
 use std::time::Duration;
 
@@ -98,6 +99,24 @@ fn redraw_moves_up_by_line_count_minus_one() {
 }
 
 #[test]
+fn visual_line_count_accounts_for_terminal_wrapping() {
+    let lines = vec![
+        "12345".to_string(),
+        "123456".to_string(),
+        String::new(),
+    ];
+
+    assert_eq!(visual_line_count(&lines, 5), 4); // 1 + 2 + 1
+    assert_eq!(visual_line_count(&lines, 6), 3); // 1 + 1 + 1
+    assert_eq!(visual_line_count(&lines, 80), 3);
+    assert_eq!(visual_line_count(&[], 80), 0);
+
+    let wide = "x".repeat(75);
+    assert_eq!(visual_line_count(&[wide.clone()], 75), 1);
+    assert_eq!(visual_line_count(&[wide], 72), 2);
+}
+
+#[test]
 fn input_cursor_is_after_the_removed_character() {
     assert_eq!(input_cursor_column(10, 8), 18);
     assert_eq!(input_cursor_column(10, 0), 10);
diff --git a/tests/slots.rs b/tests/slots.rs
index b7292b8..bdf8f10 100644
--- a/tests/slots.rs
+++ b/tests/slots.rs
@@ -1,6 +1,6 @@
 //! Regression tests for the server-side 5x3 slots game.
 
-use zagan_bet::slots::{paytable_line, PAYTABLE};
+use zagan_bet::slots::{paytable_lines, PAYTABLE};
 use zagan_bet::server::games::slots::{LineWin, SlotsGame, PAYLINES, REELS, ROWS};
 use zagan_bet::server::games::traits::{Game, GamePhase};
 
@@ -108,16 +108,20 @@ fn theoretical_rtp_is_just_under_one() {
 }
 
 #[test]
-fn the_paytable_line_lists_every_symbol_and_fits_80_columns() {
-    let line = paytable_line();
+fn the_paytable_lines_list_every_symbol_and_fit_80_columns() {
+    let lines = paytable_lines();
+    let joined = lines.join(" ");
 
+    assert_eq!(lines.len(), 2, "paytable should be split into two lines");
     for (symbol, three, four, five) in PAYTABLE {
         assert!(
-            line.contains(&format!("{symbol} {three}/{four}/{five}")),
+            joined.contains(&format!("{symbol} {three}/{four}/{five}")),
             "paytable is missing {symbol}"
         );
     }
-    assert!(line.len() <= 80, "paytable is too wide: {line:?}");
+    for line in lines {
+        assert!(line.len() <= 80, "paytable is too wide: {line:?}");
+    }
 }
 
 #[test]