-
<% @final_match = @matches.select{|m|m.bracket_position == "5/6"} %>
<% @winner_place = "5th" %>
<%= render 'bracket_final' %>
@@ -40,7 +39,6 @@
<% if @tournament.number_of_placers >= 8 %>
7/8 place match
-
<% @final_match = @matches.select{|m|m.bracket_position == "7/8"} %>
<% @winner_place = "7th" %>
<%= render 'bracket_final' %>
diff --git a/db/seeds.rb b/db/seeds.rb
index 58f3210..2c3d79d 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -47,6 +47,8 @@
number_of_wrestlers = 12
elsif index == 4
number_of_wrestlers = 24
+ elsif index == 5
+ number_of_wrestlers = 2
else
number_of_wrestlers = 16
end
@@ -72,9 +74,15 @@
weight_classes=Weight::HS_WEIGHT_CLASSES.split(",")
tournament.create_pre_defined_weights(weight_classes)
wrestler_name_number = 1
- tournament.weights.each do |weight|
- create_wrestlers_for_weight(weight, tournament, 16, wrestler_name_number)
- wrestler_name_number += 16
+ tournament.weights.each_with_index do |weight, index|
+ if index == 0
+ number_of_wrestlers = 12
+ else
+ number_of_wrestlers = 16
+ end
+
+ create_wrestlers_for_weight(weight, tournament, number_of_wrestlers, wrestler_name_number)
+ wrestler_name_number += number_of_wrestlers
end
# Regular Double Elimination 1-6
diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb
index a6eaf2a..89debae 100644
--- a/test/controllers/tournaments_controller_test.rb
+++ b/test/controllers/tournaments_controller_test.rb
@@ -55,6 +55,10 @@ class TournamentsControllerTest < ActionController::TestCase
assert_redirected_to '/static_pages/not_allowed'
end
+ def redirect_tournament_error
+ assert_redirected_to "/tournaments/#{@tournament.id}/error"
+ end
+
def destroy
delete :destroy, params: { id: 1 }
end
@@ -664,4 +668,83 @@ class TournamentsControllerTest < ActionController::TestCase
updated_tournament = Tournament.find(new_tournament.id)
assert_equal users(:one).id, updated_tournament.user_id, "The user_id should not change when the tournament is edited by a non-owner"
end
+
+ test "tournament generation error when a wrestler has an original seed higher than the amount of wrestlers in the weight" do
+ sign_in_owner
+ create_double_elim_tournament_single_weight(14, "Regular Double Elimination 1-8")
+ @tournament.destroy_all_matches
+ @tournament.user_id = 1
+ @tournament.save
+ wrestler = @tournament.weights.first.wrestlers.first
+ wrestler.original_seed = 15
+ wrestler.save
+ get :generate_matches, params: { id: @tournament.id }
+ redirect_tournament_error
+ end
+
+ test "tournament generation error when a double elimination tournament has too many wrestlers" do
+ sign_in_owner
+ create_double_elim_tournament_single_weight(16, "Regular Double Elimination 1-8")
+ @tournament.destroy_all_matches
+ @tournament.user_id = 1
+ @tournament.save
+ create_wrestlers_for_weight_for_double_elim(@tournament.weights.first, @tournament.schools.first, 1, 20)
+ get :generate_matches, params: { id: @tournament.id }
+ redirect_tournament_error
+ end
+
+ test "tournament generation error when a double elimination tournament has too few wrestlers" do
+ sign_in_owner
+ create_double_elim_tournament_single_weight(4, "Regular Double Elimination 1-8")
+ @tournament.destroy_all_matches
+ @tournament.user_id = 1
+ @tournament.save
+ @tournament.weights.first.wrestlers.first.destroy
+ get :generate_matches, params: { id: @tournament.id }
+ redirect_tournament_error
+ end
+
+ test "tournament generation error when a Modified 16 Man Double Elimination tournament has too many wrestlers" do
+ sign_in_owner
+ create_double_elim_tournament_single_weight(16, "Modified 16 Man Double Elimination 1-8")
+ @tournament.destroy_all_matches
+ @tournament.user_id = 1
+ @tournament.save
+ create_wrestlers_for_weight_for_double_elim(@tournament.weights.first, @tournament.schools.first, 1, 20)
+ get :generate_matches, params: { id: @tournament.id }
+ redirect_tournament_error
+ end
+
+ test "tournament generation error when a Modified 16 Man Double Elimination tournament has too few wrestlers" do
+ sign_in_owner
+ create_double_elim_tournament_single_weight(12, "Modified 16 Man Double Elimination 1-8")
+ @tournament.destroy_all_matches
+ @tournament.user_id = 1
+ @tournament.save
+ @tournament.weights.first.wrestlers.first.destroy
+ get :generate_matches, params: { id: @tournament.id }
+ redirect_tournament_error
+ end
+
+ test "tournament generation error when a pool to bracket tournament has too many wrestlers" do
+ sign_in_owner
+ create_pool_tournament_single_weight(24)
+ @tournament.destroy_all_matches
+ @tournament.user_id = 1
+ @tournament.save
+ create_wrestlers_for_weight(@tournament.weights.first, @tournament.schools.first, 1, 20)
+ get :generate_matches, params: { id: @tournament.id }
+ redirect_tournament_error
+ end
+
+ test "tournament generation error when a pool to bracket tournament has too few wrestlers" do
+ sign_in_owner
+ create_pool_tournament_single_weight(2)
+ @tournament.destroy_all_matches
+ @tournament.user_id = 1
+ @tournament.save
+ @tournament.weights.first.wrestlers.first.destroy
+ get :generate_matches, params: { id: @tournament.id }
+ redirect_tournament_error
+ end
end
diff --git a/test/controllers/weights_controller_test.rb b/test/controllers/weights_controller_test.rb
index 6c8df59..8b835f1 100644
--- a/test/controllers/weights_controller_test.rb
+++ b/test/controllers/weights_controller_test.rb
@@ -300,4 +300,109 @@ class WeightsControllerTest < ActionController::TestCase
success
end
+ test "tournament owner can update wrestler seeds" do
+ @tournament.is_public = true
+ @tournament.save
+ sign_in_owner
+
+ # Prepare updated seed data for wrestlers
+ updated_seeds = {
+ @wrestler.id.to_s => { original_seed: "5" },
+ @weight.wrestlers.second.id.to_s => { original_seed: "6" },
+ @weight.wrestlers.third.id.to_s => { original_seed: "7" }
+ }
+
+ # Submit the form with the updated seeds
+ post :show, params: { id: @weight.id, wrestler: updated_seeds }
+
+ # Check if response is successful
+ assert_redirected_to weight_path(@weight.id)
+
+ # Reload wrestlers to verify changes
+ @wrestler.reload
+ @weight.wrestlers.second.reload
+ @weight.wrestlers.third.reload
+
+ # Verify seeds are updated
+ assert_equal 5, @wrestler.original_seed
+ assert_equal 6, @weight.wrestlers.second.original_seed
+ assert_equal 7, @weight.wrestlers.third.original_seed
+ end
+
+ test "tournament delegate can update wrestler seeds" do
+ @tournament.is_public = true
+ @tournament.save
+ sign_in_tournament_delegate
+
+ # Prepare updated seed data for wrestlers
+ updated_seeds = {
+ @wrestler.id.to_s => { original_seed: "8" },
+ @weight.wrestlers.second.id.to_s => { original_seed: "9" },
+ @weight.wrestlers.third.id.to_s => { original_seed: "10" }
+ }
+
+ # Submit the form with the updated seeds
+ post :show, params: { id: @weight.id, wrestler: updated_seeds }
+
+ # Check if response is successful
+ assert_redirected_to weight_path(@weight.id)
+
+ # Reload wrestlers to verify changes
+ @wrestler.reload
+ @weight.wrestlers.second.reload
+ @weight.wrestlers.third.reload
+
+ # Verify seeds are updated
+ assert_equal 8, @wrestler.original_seed
+ assert_equal 9, @weight.wrestlers.second.original_seed
+ assert_equal 10, @weight.wrestlers.third.original_seed
+ end
+
+ test "unauthorized user cannot update wrestler seeds" do
+ @tournament.is_public = true
+ @tournament.save
+ sign_in_non_owner
+
+ # Prepare updated seed data for wrestlers
+ updated_seeds = {
+ @wrestler.id.to_s => { original_seed: "11" },
+ @weight.wrestlers.second.id.to_s => { original_seed: "12" }
+ }
+
+ # Attempt to submit the form
+ post :show, params: { id: @weight.id, wrestler: updated_seeds }
+
+ # Check if user is redirected due to lack of permissions
+ assert_redirected_to "/static_pages/not_allowed"
+
+ # Verify seeds are not updated
+ @wrestler.reload
+ @weight.wrestlers.second.reload
+ assert_not_equal 11, @wrestler.original_seed
+ assert_not_equal 12, @weight.wrestlers.second.original_seed
+ end
+
+ test "non logged in user cannot update wrestler seeds" do
+ @tournament.is_public = true
+ @tournament.save
+
+ # Prepare updated seed data for wrestlers
+ updated_seeds = {
+ @wrestler.id.to_s => { original_seed: "11" },
+ @weight.wrestlers.second.id.to_s => { original_seed: "12" }
+ }
+
+ # Attempt to submit the form
+ post :show, params: { id: @weight.id, wrestler: updated_seeds }
+
+ # Check if user is redirected due to lack of permissions
+ assert_redirected_to "/static_pages/not_allowed"
+
+ # Verify seeds are not updated
+ @wrestler.reload
+ @weight.wrestlers.second.reload
+ assert_not_equal 11, @wrestler.original_seed
+ assert_not_equal 12, @weight.wrestlers.second.original_seed
+ end
+
end
diff --git a/test/integration/pool_order_test.rb b/test/integration/pool_order_test.rb
index b87c3af..1026167 100644
--- a/test/integration/pool_order_test.rb
+++ b/test/integration/pool_order_test.rb
@@ -468,4 +468,22 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest
assert Wrestler.find(translate_name_to_id("Test2")).pool_placement_tiebreaker == "Head to Head"
assert Wrestler.find(translate_name_to_id("Test1")).pool_placement == 4
end
+
+ test "Pool order with 2 wrestlers" do
+ # Setup
+ Wrestler.find(translate_name_to_id("Test3")).destroy
+ Wrestler.find(translate_name_to_id("Test4")).destroy
+ Wrestler.find(translate_name_to_id("Test5")).destroy
+ Wrestler.find(translate_name_to_id("Test6")).destroy
+ GenerateTournamentMatches.new(Wrestler.find(translate_name_to_id("Test1")).tournament).generate
+ weight = Wrestler.find(translate_name_to_id("Test1")).weight
+
+ # Match results
+ # Test1 is the best wrestler but got injured after round 1 and forfeited out
+ end_match_custom(match_wrestler_vs("Test1","Test2"),"Tech Fall","0-16","Test2")
+
+
+ assert Wrestler.find(translate_name_to_id("Test2")).pool_placement == 1
+ assert Wrestler.find(translate_name_to_id("Test1")).pool_placement == 2
+ end
end
\ No newline at end of file