Try to fix tests

Author: OmeletWithoutEgg

test/helpers/contests_helper_test.rb

@@ -16,17 +16,18 @@ class ContestsHelperTest < ActionView::TestCase
     submissions.each_with_index {|x, i| x.created_at = start_time + i + 1}
     expected_result = {
       result: {
-        "1_1" => [
+        "user_1_1" => [
           {timestamp: 1000000, state: [50, true, 0]},
           {timestamp: 2000000, state: [70, true, 0]},
           {timestamp: 3000000, state: [70, true, 1]},
           {timestamp: 5000000, state: [70, true, 2]},
         ],
       },
       participants: [1],
-      first_ac: {1 => 1},
+      teams: [],
+      first_ac: {1 => "user_1"},
     }
-    assert_equal expected_result, ranklist_data(submissions, start_time, freeze_start, 'ioi')
+    assert_equal expected_result, ranklist_data(submissions, start_time, freeze_start, 'ioi', {})
   end
 
   test "ranklist_data ioi-style negative score is correct" do
@@ -43,14 +44,15 @@ class ContestsHelperTest < ActionView::TestCase
     submissions.each_with_index {|x, i| x.created_at = start_time + i + 1}
     expected_result = {
       result: {
-        "1_1" => [{timestamp: 2000000, state: [-10, true, 0]}],
-        "1_2" => [{timestamp: 4000000, state: [0, true, 0]}],
-        "1_3" => [{timestamp: 6000000, state: [-10, true, 0]}],
+        "user_1_1" => [{timestamp: 2000000, state: [-10, true, 0]}],
+        "user_1_2" => [{timestamp: 4000000, state: [0, true, 0]}],
+        "user_1_3" => [{timestamp: 6000000, state: [-10, true, 0]}],
       },
       participants: [1],
+      teams: [],
       first_ac: {},
     }
-    assert_equal expected_result, ranklist_data(submissions, start_time, freeze_start, 'ioi')
+    assert_equal expected_result, ranklist_data(submissions, start_time, freeze_start, 'ioi', {})
   end
 
   test "ranklist_data ioi-style should not display Validating score" do
@@ -63,15 +65,16 @@ class ContestsHelperTest < ActionView::TestCase
     submissions.each_with_index {|x, i| x.created_at = start_time + i + 1}
     expected_result = {
       result: {
-        "1_1" => [
+        "user_1_1" => [
           {timestamp: 1000000, state: [10, true, 0]},
           {timestamp: 2000000, state: [10, true, 1]},
         ],
       },
       participants: [1],
+      teams: [],
       first_ac: {},
     }
-    assert_equal expected_result, ranklist_data(submissions, start_time, freeze_start, 'ioi')
+    assert_equal expected_result, ranklist_data(submissions, start_time, freeze_start, 'ioi', {})
   end
 
   test "ranklist_data acm-style score & first_ac is correct" do
@@ -91,19 +94,20 @@ class ContestsHelperTest < ActionView::TestCase
     submissions.each_with_index {|x, i| x.created_at = start_time + i + 1}
     expected_result = {
       result: {
-        "1_1" => [
+        "user_1_1" => [
           {timestamp: 1000000, state: [1, nil, 0]},
           {timestamp: 3000000, state: [1, nil, 1]},
           {timestamp: 4000000, state: [2, 4000000, 0]},
         ],
-        "2_1" => [{timestamp: 7000000, state: [1, 7000000, 0]}],
-        "1_2" => [{timestamp: 9000000, state: [1, 9000000, 0]}],
-        "2_2" => [{timestamp: 8000000, state: [1, 8000000, 0]}],
+        "user_2_1" => [{timestamp: 7000000, state: [1, 7000000, 0]}],
+        "user_1_2" => [{timestamp: 9000000, state: [1, 9000000, 0]}],
+        "user_2_2" => [{timestamp: 8000000, state: [1, 8000000, 0]}],
       },
       participants: [1, 2],
-      first_ac: {1 => 1, 2 => 2},
+      teams: [],
+      first_ac: {1 => "user_1", 2 => "user_2"},
     }
-    assert_equal expected_result, ranklist_data(submissions, start_time, freeze_start, 'acm')
+    assert_equal expected_result, ranklist_data(submissions, start_time, freeze_start, 'acm', {})
   end
 
   test "ranklist_data acm-style freeze is correct" do
@@ -119,20 +123,21 @@ class ContestsHelperTest < ActionView::TestCase
     submissions.each_with_index {|x, i| x.created_at = start_time + i + 1}
     expected_result = {
       result: {
-        "1_1" => [
+        "user_1_1" => [
           {timestamp: 1000000, state: [1, nil, 0]},
           {timestamp: 2000000, state: [1, nil, 1]},
         ],
-        "2_1" => [
+        "user_2_1" => [
           {timestamp: 3000000, state: [0, nil, 1]},
           {timestamp: 4000000, state: [0, nil, 2]},
           {timestamp: 5000000, state: [0, nil, 3]},
         ],
       },
       participants: [1, 2],
+      teams: [],
       first_ac: {},
     }
-    assert_equal expected_result, ranklist_data(submissions, start_time, freeze_start, 'acm')
+    assert_equal expected_result, ranklist_data(submissions, start_time, freeze_start, 'acm', {})
   end
 
   test "ranklist_data new-ioi-style score is correct" do
@@ -160,15 +165,16 @@ class ContestsHelperTest < ActionView::TestCase
     submissions.each {|x| x.generate_subtask_result(true)}
     expected_result = {
       result: {
-        "1_1" => [
+        "user_1_1" => [
           {timestamp: 1000000, state: [50, true, 0]},
           {timestamp: 2000000, state: [80, true, 0]},
         ],
       },
       participants: [1],
+      teams: [],
       first_ac: {},
     }
-    assert_equal expected_result, ranklist_data(submissions, start_time, freeze_start, 'ioi_new')
+    assert_equal expected_result, ranklist_data(submissions, start_time, freeze_start, 'ioi_new', {})
   end
 
   test "ranklist_data should count ignored participant" do
@@ -179,7 +185,7 @@ class ContestsHelperTest < ActionView::TestCase
     start_time = Time.new(2022, 1, 1, 0, 0, 0)
     freeze_start = Time.new(2022, 1, 1, 1, 0, 0)
     submissions.each_with_index {|x, i| x.created_at = start_time + i + 1}
-    assert_equal [1, 2], ranklist_data(submissions, start_time, freeze_start, 'acm')[:participants]
-    assert_equal [1, 2], ranklist_data(submissions, start_time, freeze_start, 'ioi')[:participants]
+    assert_equal [1, 2], ranklist_data(submissions, start_time, freeze_start, 'acm', {})[:participants]
+    assert_equal [1, 2], ranklist_data(submissions, start_time, freeze_start, 'ioi', {})[:participants]
   end
 end