diff --git a/server/src/html/garden.rs b/server/src/html/garden.rs index 86b4c184724910bb464682b9025d19ce6cd2050d..82c1b4b4f36ea13a906035a1789ba893222b3695 100644 --- a/server/src/html/garden.rs +++ b/server/src/html/garden.rs @@ -1397,10 +1397,14 @@ async fn vote_compare_inner( } }; + let url_key = canonical_view_url(&uri); + let view_count = state.views.get_views(&url_key); + let page = layout_full_bleed_chromeless( &title, "view-ontology view-ontology-light view-vote-compare view-vote-compare-fullscreen", body, + Some(view_count), theme_from_jar(&jar), &theme_next_from_uri(&uri), ); diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index f1b0f31b0c516c2e71ca7938d1ec2764e3b077eb..fbc3fc4ed7c53cc68125fb50f5c4db9122f9a261 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -310,6 +310,7 @@ pub(super) fn layout_full_bleed_chromeless( title: &str, view: &str, body: Markup, + views: Option, theme: &str, theme_next: &str, ) -> Markup { @@ -317,7 +318,7 @@ pub(super) fn layout_full_bleed_chromeless( title, view, body, - None, + views, theme, theme_next, None, diff --git a/server/tests/integration.rs b/server/tests/integration.rs index e96d11c820c3bbaa8bb55ad11636397ef225e55a..62c84862d5c2cba212f9ceabd6273203a43e804c 100644 --- a/server/tests/integration.rs +++ b/server/tests/integration.rs @@ -1421,12 +1421,24 @@ async fn test_view_counts_increment_and_display() { .await .unwrap(); assert!(v1.status().is_success(), "vote compare GET 1: {}", v1.status()); + let v1_body = v1.text().await.unwrap(); + assert!( + v1_body.contains("1 views"), + "vote compare page should show view count, snippet: {}", + v1_body.chars().take(600).collect::() + ); let v2 = client .get(format!("http://{addr}{vote_q_left_first}")) .send() .await .unwrap(); assert!(v2.status().is_success(), "vote compare GET 2: {}", v2.status()); + let v2_body = v2.text().await.unwrap(); + assert!( + v2_body.contains("2 views"), + "vote compare page should reflect incremented count, snippet: {}", + v2_body.chars().take(600).collect::() + ); assert_eq!( state.views.get_views(&vote_key),