tests/routes/crates/list: Ensure unique ordering of seek-based pagination is correct

Author: eth3lbert

src/tests/routes/crates/list.rs

@@ -261,6 +261,8 @@ fn index_sorting() {
     let (app, anon, user) = TestApp::init().with_user();
     let user = user.as_model();
 
+    // To test that the unique ordering of seed-based pagination is correct, we need to
+    // set some columns to the same value.
     app.db(|conn| {
         let krate1 = CrateBuilder::new("foo_sort", user.id)
             .description("bar_sort baz_sort const")
@@ -277,12 +279,12 @@ fn index_sorting() {
         let krate3 = CrateBuilder::new("baz_sort", user.id)
             .description("foo_sort bar_sort foo_sort bar_sort foo_sort bar_sort const")
             .downloads(100_000)
-            .recent_downloads(10)
+            .recent_downloads(50)
             .expect_build(conn);
 
         let krate4 = CrateBuilder::new("other_sort", user.id)
             .description("other_sort const")
-            .downloads(999_999)
+            .downloads(100_000)
             .expect_build(conn);
 
         // Set the created at column for each crate
@@ -294,11 +296,7 @@ fn index_sorting() {
             .set(crates::created_at.eq(now - 1.weeks()))
             .execute(conn)
             .unwrap();
-        update(&krate3)
-            .set(crates::created_at.eq(now - 2.weeks()))
-            .execute(conn)
-            .unwrap();
-        update(&krate4)
+        update(crates::table.filter(crates::id.eq_any(vec![krate3.id, krate4.id])))
             .set(crates::created_at.eq(now - 3.weeks()))
             .execute(conn)
             .unwrap();
@@ -308,14 +306,10 @@ fn index_sorting() {
             .set(crates::updated_at.eq(now - 3.weeks()))
             .execute(conn)
             .unwrap();
-        update(&krate2)
+        update(crates::table.filter(crates::id.eq_any(vec![krate2.id, krate3.id])))
             .set(crates::updated_at.eq(now - 5.days()))
             .execute(conn)
             .unwrap();
-        update(&krate3)
-            .set(crates::updated_at.eq(now - 10.seconds()))
-            .execute(conn)
-            .unwrap();
         update(&krate4)
             .set(crates::updated_at.eq(now))
             .execute(conn)
@@ -325,14 +319,14 @@ fn index_sorting() {
     // Sort by downloads
     for json in search_both(&anon, "sort=downloads") {
         assert_eq!(json.meta.total, 4);
-        assert_eq!(json.crates[0].name, "other_sort");
-        assert_eq!(json.crates[1].name, "baz_sort");
+        assert_eq!(json.crates[0].name, "baz_sort");
+        assert_eq!(json.crates[1].name, "other_sort");
         assert_eq!(json.crates[2].name, "bar_sort");
         assert_eq!(json.crates[3].name, "foo_sort");
     }
     let (resp, calls) = page_with_seek(&anon, "sort=downloads");
-    assert_eq!(resp[0].crates[0].name, "other_sort");
-    assert_eq!(resp[1].crates[0].name, "baz_sort");
+    assert_eq!(resp[0].crates[0].name, "baz_sort");
+    assert_eq!(resp[1].crates[0].name, "other_sort");
     assert_eq!(resp[2].crates[0].name, "bar_sort");
     assert_eq!(resp[3].crates[0].name, "foo_sort");
     assert_eq!(resp[3].meta.total, 4);
@@ -358,14 +352,14 @@ fn index_sorting() {
     for json in search_both(&anon, "sort=recent-updates") {
         assert_eq!(json.meta.total, 4);
         assert_eq!(json.crates[0].name, "other_sort");
-        assert_eq!(json.crates[1].name, "baz_sort");
-        assert_eq!(json.crates[2].name, "bar_sort");
+        assert_eq!(json.crates[1].name, "bar_sort");
+        assert_eq!(json.crates[2].name, "baz_sort");
         assert_eq!(json.crates[3].name, "foo_sort");
     }
     let (resp, calls) = page_with_seek(&anon, "sort=recent-updates");
     assert_eq!(resp[0].crates[0].name, "other_sort");
-    assert_eq!(resp[1].crates[0].name, "baz_sort");
-    assert_eq!(resp[2].crates[0].name, "bar_sort");
+    assert_eq!(resp[1].crates[0].name, "bar_sort");
+    assert_eq!(resp[2].crates[0].name, "baz_sort");
     assert_eq!(resp[3].crates[0].name, "foo_sort");
     assert_eq!(resp[3].meta.total, 4);
     assert_eq!(calls, 5);