Mispelled include for fixing bracket partial bug

app/views/static_pages/about.html.erb

@@ -8,7 +8,8 @@
   <li>Tournament Types
     <ul>
       <li>Pool to bracket (adhears to 5 match per day rule)</li>
-      <li>Double elimination 16 man and 8 man</li>
+      <li>Regular Double Elimination 16 man and 8 man. Options for placing 1st-6th or 1st-8th.</li>
+      <li>Modified 16 Man Double Elimination 1-6. Options for placing 1st-6th or 1st-8th. Adhears to 5 match per day rule.</li>
     </ul>
   </li>
   <li>Team point calculation</li>
@@ -60,9 +61,23 @@
     <li>Eight pools of 3 (2 matches each) to a quarter final bracket - 17-24 wrestlers, place 1-8.</li>
 </ul>
 <br>
-<h3>Double Elimination Information</h3>
+<h3>Regular Double Elimination Information</h3>
 <p>Right now, double elimination brackets only support 8 and 16 man brackets (4-16 wrestlers). Cross bracketing will happen every other round. 16 man in quarter finals, 8 man in semi finals.</p>
-<h4>Double elimination scoring</h4>
+<p>Regular Double Elimination 1-6 places 1st through 6th. Regular Double Elimination 1-8 places 1st through 8th.</p>
+<h4>Regular Double Elimination scoring</h4>
+<ul>
+  <li>Championship win: 2pt</li>
+  <li>Consolation win: 1pt</li>
+  <li>Win by major: 1pt extra</li>
+  <li>Win by tech: 1.5pt extra</li>
+  <li>Win by fall, default, dq, etc: 2pt extra</li>
+  <li>BYE points: 2pts if you have a bye in the championship bracket and win the next match. 1pt if you have a bye in the consolation bracket and win the next match.</li>
+</ul>
+<br>
+<h3>Modified 16 Man Double Elimination Information</h3>
+<p>Adhears to 5 match per day rule. Allows a 16 man bracket without anyone wrestling more than 5 matches. Semi Final losers wrestle for 3rd. Anyone who loses before the Semi Finals wrestle a consolation bracket for 5th.</p>
+<p>Modified 16 Man Double Elimination 1-6 places 1st through 6th. Modified 16 Man Double Elimination 1-8 places 1st through 8th.</p>
+<h4>Modified 16 Man Double Elimination scoring (same as Regular Double Elimination)</h4>
 <ul>
   <li>Championship win: 2pt</li>
   <li>Consolation win: 1pt</li>
@@ -127,7 +142,7 @@
 <br>
 <h3>Future Plans</h3>
 <br>
-<p>Future development plans to support 32 and 64 man double elimination as well as modified (5 per day match rule) 16 and 32 man double elimination brackets are underway.</p>
+<p>Future development plans to support 32 and 64 man regulard double elimination, modified (5 per day match rule) 32 man double elimination, and true second double elimination brackets are underway.</p>
 <br>
 <h3>Contact</h3>
 <br>

app/views/tournaments/_bracket_partial.html.erb

@@ -110,7 +110,7 @@ table.smallText tr td { font-size: 10px; }
           <td valign="top" style="padding: 10px;">
             <%= render 'modified_sixteen_man_double_elimination_bracket' %>
           </td>
-          <% elsif @tournament.tournament_type == "Double Elimination 1-6" %>
+          <% elsif @tournament.tournament_type.include? "Regular Double Elimination" %>
           <td valign="top" style="padding: 10px;">
             <%= render 'double_elimination_bracket' %>
           </td>

app/views/tournaments/_form.html.erb

@@ -35,6 +35,11 @@
     <%= f.label :tournament_type %><br>
     <%= f.select :tournament_type, @tournament.tournament_types %>
   </div>
+  <br>
+  <div>
+    See About page for information on tournament types: <%= link_to "About", "/static_pages/about" %>
+    <p>For double elimination tournaments, 1-6 places 1st through 6th and 1-8 places 1st through 8th.</p>
+  </div>
 <%= f.hidden_field :user_id, :value => current_user.id %>
     <br>
     <br>

test/integration/double_elimination_1_8_run_through_test.rb

@@ -1,266 +0,0 @@
-require 'test_helper'
-
-class DoubleEliminationEightPlacesRunThrough < ActionDispatch::IntegrationTest
-  def setup
-  end
-
-  def winner_by_name(winner_name,match)
-    wrestler = @tournament.weights.first.wrestlers.select{|w| w.name == winner_name}.first
-    match.winner_id = wrestler.id
-    match.finished = 1
-    match.win_type = "Decision"
-    match.score = "0-0"
-    match.save
-  end
-
-  test "8 man double elimination" do
-    create_double_elim_tournament_single_weight_1_6(6)
-    matches = @tournament.matches.reload
-
-    round1 = matches.select{|m| m.round == 1}
-    winner_by_name("Test4", round1.select{|m| m.bracket_position_number == 2}.first)
-    winner_by_name("Test3", round1.select{|m| m.bracket_position_number == 3}.first)
-
-    semis = matches.select{|m| m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}
-    assert semis.first.reload.wrestler1.name == "Test1"
-    assert semis.first.reload.wrestler2.name == "Test4"
-    assert semis.second.reload.wrestler1.name == "Test3"
-    assert semis.second.reload.wrestler2.name == "Test2"
-    winner_by_name("Test4",semis.first)
-    winner_by_name("Test2",semis.second)
-
-    conso_quarter = matches.select{|m| m.bracket_position == "Conso Quarter"}.sort_by{|m| m.bracket_position_number}
-    assert conso_quarter.first.reload.loser1_name == "BYE"
-    assert conso_quarter.first.reload.wrestler2.name == "Test5"
-    assert conso_quarter.second.reload.wrestler1.name == "Test6"
-    assert conso_quarter.second.reload.loser2_name == "BYE"
-
-    conso_semis = matches.select{|m| m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}
-    assert conso_semis.first.reload.wrestler1.name == "Test3"
-    assert conso_semis.first.reload.wrestler2.name == "Test5"
-    assert conso_semis.second.reload.wrestler1.name == "Test1"
-    assert conso_semis.second.reload.wrestler2.name == "Test6"
-    winner_by_name("Test5",conso_semis.first)
-    winner_by_name("Test1",conso_semis.second)
-
-    first_finals = matches.select{|m| m.bracket_position == "1/2"}.first
-    third_finals = matches.select{|m| m.bracket_position == "3/4"}.first
-    fifth_finals = matches.select{|m| m.bracket_position == "5/6"}.first
-
-    assert first_finals.reload.wrestler1.name == "Test4"
-    assert first_finals.reload.wrestler2.name == "Test2"
-
-    assert third_finals.reload.wrestler1.name == "Test5"
-    assert third_finals.reload.wrestler2.name == "Test1"
-
-    assert fifth_finals.reload.wrestler1.name == "Test3"
-    assert fifth_finals.reload.wrestler2.name == "Test6"
-
-    # DEBUG
-    # matches.sort_by{|m| m.bout_number}.each do |match|
-    #   match.reload
-    #   puts "Round #{match.round} #{match.w1_bracket_name} vs #{match.w2_bracket_name}"
-    # end
-  end
-
-  test "16 man double elimination place 1-8" do
-    create_double_elim_tournament_single_weight(14, "Regular Double Elimination 1-8")
-    matches = @tournament.matches.reload
-
-    round1 = matches.select{|m| m.round == 1}
-    winner_by_name("Test9", round1.select{|m| m.bracket_position_number == 2}.first)
-    winner_by_name("Test5", round1.select{|m| m.bracket_position_number == 3}.first)
-    winner_by_name("Test4", round1.select{|m| m.bracket_position_number == 4}.first)
-    winner_by_name("Test13", round1.select{|m| m.bracket_position_number == 5}.first)
-    winner_by_name("Test6", round1.select{|m| m.bracket_position_number == 6}.first)
-    winner_by_name("Test10", round1.select{|m| m.bracket_position_number == 7}.first)
-
-    quarter = matches.select{|m| m.bracket_position == "Quarter"}.sort_by{|m| m.bracket_position_number}
-    assert quarter.first.reload.wrestler1.name == "Test1"
-    assert quarter.first.reload.wrestler2.name == "Test9"
-    assert quarter.second.reload.wrestler1.name == "Test5"
-    assert quarter.second.reload.wrestler2.name == "Test4"
-    assert quarter.third.reload.wrestler1.name == "Test13"
-    assert quarter.third.reload.wrestler2.name == "Test6"
-    assert quarter.fourth.reload.wrestler1.name == "Test10"
-    assert quarter.fourth.reload.wrestler2.name == "Test2"
-
-    conso_round2 = matches.select{|m| m.bracket_position == "Conso" and m.round == 2}.sort_by{|m| m.bracket_position_number}
-    assert conso_round2.first.reload.wrestler2.name == "Test8"
-    assert conso_round2.second.reload.wrestler1.name == "Test12"
-    assert conso_round2.second.reload.wrestler2.name == "Test14"
-    assert conso_round2.third.reload.wrestler1.name == "Test3"
-    assert conso_round2.third.reload.wrestler2.name == "Test11"
-    assert conso_round2.fourth.reload.wrestler1.name == "Test7"
-
-    winner_by_name("Test1", quarter.first)
-    winner_by_name("Test5", quarter.second)
-    winner_by_name("Test13", quarter.third)
-    winner_by_name("Test10", quarter.fourth)
-    winner_by_name("Test12", conso_round2.second)
-    winner_by_name("Test3", conso_round2.third)
-
-    semis = matches.select{|m| m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}
-    assert semis.first.reload.wrestler1.name == "Test1"
-    assert semis.first.reload.wrestler2.name == "Test5"
-    assert semis.second.reload.wrestler1.name == "Test13"
-    assert semis.second.reload.wrestler2.name == "Test10"
-
-    conso_round3 = matches.select{|m| m.bracket_position == "Conso" and m.round == 3}.sort_by{|m| m.bracket_position_number}
-    assert conso_round3.first.reload.wrestler1.name == "Test2"
-    assert conso_round3.first.reload.wrestler2.name == "Test8"
-    assert conso_round3.second.reload.wrestler1.name == "Test6"
-    assert conso_round3.second.reload.wrestler2.name == "Test12"
-    assert conso_round3.third.reload.wrestler1.name == "Test4"
-    assert conso_round3.third.reload.wrestler2.name == "Test3"
-    assert conso_round3.fourth.reload.wrestler1.name == "Test9"
-    assert conso_round3.fourth.reload.wrestler2.name == "Test7"
-
-    winner_by_name("Test2", conso_round3.first)
-    winner_by_name("Test6", conso_round3.second)
-    winner_by_name("Test3", conso_round3.third)
-    winner_by_name("Test9", conso_round3.fourth)
-
-    conso_quarter = matches.select{|m| m.bracket_position == "Conso Quarter"}.sort_by{|m| m.bracket_position_number}
-    assert conso_quarter.first.reload.wrestler1.name == "Test2"
-    assert conso_quarter.first.reload.wrestler2.name == "Test6"
-    assert conso_quarter.second.reload.wrestler1.name == "Test3"
-    assert conso_quarter.second.reload.wrestler2.name == "Test9"
-
-    winner_by_name("Test5",semis.first)
-    winner_by_name("Test10",semis.second)
-    winner_by_name("Test2", conso_quarter.first)
-    winner_by_name("Test3", conso_quarter.second)
-
-    conso_semis = matches.select{|m| m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}
-    assert conso_semis.first.reload.wrestler1.name == "Test1"
-    assert conso_semis.first.reload.wrestler2.name == "Test2"
-    assert conso_semis.second.reload.wrestler1.name == "Test13"
-    assert conso_semis.second.reload.wrestler2.name == "Test3"
-
-    winner_by_name("Test2",conso_semis.first)
-    winner_by_name("Test3",conso_semis.second)
-
-    first_finals = matches.select{|m| m.bracket_position == "1/2"}.first
-    third_finals = matches.select{|m| m.bracket_position == "3/4"}.first
-    fifth_finals = matches.select{|m| m.bracket_position == "5/6"}.first
-    seventh_finals = matches.select{|m| m.bracket_position == "7/8"}.first
-
-
-    assert first_finals.reload.wrestler1.name == "Test5"
-    assert first_finals.reload.wrestler2.name == "Test10"
-
-    assert third_finals.reload.wrestler1.name == "Test2"
-    assert third_finals.reload.wrestler2.name == "Test3"
-
-    assert fifth_finals.reload.wrestler1.name == "Test1"
-    assert fifth_finals.reload.wrestler2.name == "Test13"
-    
-    assert seventh_finals.reload.wrestler1.name == "Test6"
-    assert seventh_finals.reload.wrestler2.name == "Test9"
-
-    # DEBUG
-    # matches.sort_by{|m| m.bout_number}.each do |match|
-    #   match.reload
-    #   puts "Round #{match.round} #{match.w1_bracket_name} vs #{match.w2_bracket_name}"
-    # end
-  end
-  
-  test "16 man double elimination place 1-6" do
-    create_double_elim_tournament_single_weight(14, "Regular Double Elimination 1-6")
-    matches = @tournament.matches.reload
-
-    round1 = matches.select{|m| m.round == 1}
-    winner_by_name("Test9", round1.select{|m| m.bracket_position_number == 2}.first)
-    winner_by_name("Test5", round1.select{|m| m.bracket_position_number == 3}.first)
-    winner_by_name("Test4", round1.select{|m| m.bracket_position_number == 4}.first)
-    winner_by_name("Test13", round1.select{|m| m.bracket_position_number == 5}.first)
-    winner_by_name("Test6", round1.select{|m| m.bracket_position_number == 6}.first)
-    winner_by_name("Test10", round1.select{|m| m.bracket_position_number == 7}.first)
-
-    quarter = matches.select{|m| m.bracket_position == "Quarter"}.sort_by{|m| m.bracket_position_number}
-    assert quarter.first.reload.wrestler1.name == "Test1"
-    assert quarter.first.reload.wrestler2.name == "Test9"
-    assert quarter.second.reload.wrestler1.name == "Test5"
-    assert quarter.second.reload.wrestler2.name == "Test4"
-    assert quarter.third.reload.wrestler1.name == "Test13"
-    assert quarter.third.reload.wrestler2.name == "Test6"
-    assert quarter.fourth.reload.wrestler1.name == "Test10"
-    assert quarter.fourth.reload.wrestler2.name == "Test2"
-
-    conso_round2 = matches.select{|m| m.bracket_position == "Conso" and m.round == 2}.sort_by{|m| m.bracket_position_number}
-    assert conso_round2.first.reload.wrestler2.name == "Test8"
-    assert conso_round2.second.reload.wrestler1.name == "Test12"
-    assert conso_round2.second.reload.wrestler2.name == "Test14"
-    assert conso_round2.third.reload.wrestler1.name == "Test3"
-    assert conso_round2.third.reload.wrestler2.name == "Test11"
-    assert conso_round2.fourth.reload.wrestler1.name == "Test7"
-
-    winner_by_name("Test1", quarter.first)
-    winner_by_name("Test5", quarter.second)
-    winner_by_name("Test13", quarter.third)
-    winner_by_name("Test10", quarter.fourth)
-    winner_by_name("Test12", conso_round2.second)
-    winner_by_name("Test3", conso_round2.third)
-
-    semis = matches.select{|m| m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}
-    assert semis.first.reload.wrestler1.name == "Test1"
-    assert semis.first.reload.wrestler2.name == "Test5"
-    assert semis.second.reload.wrestler1.name == "Test13"
-    assert semis.second.reload.wrestler2.name == "Test10"
-
-    conso_round3 = matches.select{|m| m.bracket_position == "Conso" and m.round == 3}.sort_by{|m| m.bracket_position_number}
-    assert conso_round3.first.reload.wrestler1.name == "Test2"
-    assert conso_round3.first.reload.wrestler2.name == "Test8"
-    assert conso_round3.second.reload.wrestler1.name == "Test6"
-    assert conso_round3.second.reload.wrestler2.name == "Test12"
-    assert conso_round3.third.reload.wrestler1.name == "Test4"
-    assert conso_round3.third.reload.wrestler2.name == "Test3"
-    assert conso_round3.fourth.reload.wrestler1.name == "Test9"
-    assert conso_round3.fourth.reload.wrestler2.name == "Test7"
-
-    winner_by_name("Test2", conso_round3.first)
-    winner_by_name("Test6", conso_round3.second)
-    winner_by_name("Test3", conso_round3.third)
-    winner_by_name("Test9", conso_round3.fourth)
-
-    conso_quarter = matches.select{|m| m.bracket_position == "Conso Quarter"}.sort_by{|m| m.bracket_position_number}
-    assert conso_quarter.first.reload.wrestler1.name == "Test2"
-    assert conso_quarter.first.reload.wrestler2.name == "Test6"
-    assert conso_quarter.second.reload.wrestler1.name == "Test3"
-    assert conso_quarter.second.reload.wrestler2.name == "Test9"
-
-    winner_by_name("Test5",semis.first)
-    winner_by_name("Test10",semis.second)
-    winner_by_name("Test2", conso_quarter.first)
-    winner_by_name("Test3", conso_quarter.second)
-
-    conso_semis = matches.select{|m| m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}
-    assert conso_semis.first.reload.wrestler1.name == "Test1"
-    assert conso_semis.first.reload.wrestler2.name == "Test2"
-    assert conso_semis.second.reload.wrestler1.name == "Test13"
-    assert conso_semis.second.reload.wrestler2.name == "Test3"
-
-    winner_by_name("Test2",conso_semis.first)
-    winner_by_name("Test3",conso_semis.second)
-
-    first_finals = matches.select{|m| m.bracket_position == "1/2"}.first
-    third_finals = matches.select{|m| m.bracket_position == "3/4"}.first
-    fifth_finals = matches.select{|m| m.bracket_position == "5/6"}.first
-
-    assert first_finals.reload.wrestler1.name == "Test5"
-    assert first_finals.reload.wrestler2.name == "Test10"
-
-    assert third_finals.reload.wrestler1.name == "Test2"
-    assert third_finals.reload.wrestler2.name == "Test3"
-
-    assert fifth_finals.reload.wrestler1.name == "Test1"
-    assert fifth_finals.reload.wrestler2.name == "Test13"
-
-    # DEBUG
-    # matches.sort_by{|m| m.bout_number}.each do |match|
-    #   match.reload
-    #   puts "Round #{match.round} #{match.w1_bracket_name} vs #{match.w2_bracket_name}"
-    # end
-  end
-end

test/integration/double_elimination_eight_man_1_6_run_through_test.1.rb

@@ -0,0 +1,65 @@
+require 'test_helper'
+
+class EightManDoubleEliminationSixPlacesRunThrough < ActionDispatch::IntegrationTest
+  def setup
+  end
+
+  def winner_by_name(winner_name,match)
+    wrestler = @tournament.weights.first.wrestlers.select{|w| w.name == winner_name}.first
+    match.winner_id = wrestler.id
+    match.finished = 1
+    match.win_type = "Decision"
+    match.score = "0-0"
+    match.save
+  end
+
+  test "8 man double elimination" do
+    create_double_elim_tournament_single_weight_1_6(6)
+    matches = @tournament.matches.reload
+
+    round1 = matches.select{|m| m.round == 1}
+    winner_by_name("Test4", round1.select{|m| m.bracket_position_number == 2}.first)
+    winner_by_name("Test3", round1.select{|m| m.bracket_position_number == 3}.first)
+
+    semis = matches.select{|m| m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}
+    assert semis.first.reload.wrestler1.name == "Test1"
+    assert semis.first.reload.wrestler2.name == "Test4"
+    assert semis.second.reload.wrestler1.name == "Test3"
+    assert semis.second.reload.wrestler2.name == "Test2"
+    winner_by_name("Test4",semis.first)
+    winner_by_name("Test2",semis.second)
+
+    conso_quarter = matches.select{|m| m.bracket_position == "Conso Quarter"}.sort_by{|m| m.bracket_position_number}
+    assert conso_quarter.first.reload.loser1_name == "BYE"
+    assert conso_quarter.first.reload.wrestler2.name == "Test5"
+    assert conso_quarter.second.reload.wrestler1.name == "Test6"
+    assert conso_quarter.second.reload.loser2_name == "BYE"
+
+    conso_semis = matches.select{|m| m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}
+    assert conso_semis.first.reload.wrestler1.name == "Test3"
+    assert conso_semis.first.reload.wrestler2.name == "Test5"
+    assert conso_semis.second.reload.wrestler1.name == "Test1"
+    assert conso_semis.second.reload.wrestler2.name == "Test6"
+    winner_by_name("Test5",conso_semis.first)
+    winner_by_name("Test1",conso_semis.second)
+
+    first_finals = matches.select{|m| m.bracket_position == "1/2"}.first
+    third_finals = matches.select{|m| m.bracket_position == "3/4"}.first
+    fifth_finals = matches.select{|m| m.bracket_position == "5/6"}.first
+
+    assert first_finals.reload.wrestler1.name == "Test4"
+    assert first_finals.reload.wrestler2.name == "Test2"
+
+    assert third_finals.reload.wrestler1.name == "Test5"
+    assert third_finals.reload.wrestler2.name == "Test1"
+
+    assert fifth_finals.reload.wrestler1.name == "Test3"
+    assert fifth_finals.reload.wrestler2.name == "Test6"
+
+    # DEBUG
+    # matches.sort_by{|m| m.bout_number}.each do |match|
+    #   match.reload
+    #   puts "Round #{match.round} #{match.w1_bracket_name} vs #{match.w2_bracket_name}"
+    # end
+  end
+end

test/integration/double_elimination_sixteen_man_1_6_run_through_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class DoubleEliminationSixPlacesRunThrough < ActionDispatch::IntegrationTest
+class DoubleEliminationSixteenManSixPlacesRunThrough < ActionDispatch::IntegrationTest
   def setup
   end
 
@@ -13,57 +13,7 @@ class DoubleEliminationSixPlacesRunThrough < ActionDispatch::IntegrationTest
     match.save
   end
 
-  test "8 man double elimination" do
-    create_double_elim_tournament_single_weight_1_6(6)
-    matches = @tournament.matches.reload
-
-    round1 = matches.select{|m| m.round == 1}
-    winner_by_name("Test4", round1.select{|m| m.bracket_position_number == 2}.first)
-    winner_by_name("Test3", round1.select{|m| m.bracket_position_number == 3}.first)
-
-    semis = matches.select{|m| m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}
-    assert semis.first.reload.wrestler1.name == "Test1"
-    assert semis.first.reload.wrestler2.name == "Test4"
-    assert semis.second.reload.wrestler1.name == "Test3"
-    assert semis.second.reload.wrestler2.name == "Test2"
-    winner_by_name("Test4",semis.first)
-    winner_by_name("Test2",semis.second)
-
-    conso_quarter = matches.select{|m| m.bracket_position == "Conso Quarter"}.sort_by{|m| m.bracket_position_number}
-    assert conso_quarter.first.reload.loser1_name == "BYE"
-    assert conso_quarter.first.reload.wrestler2.name == "Test5"
-    assert conso_quarter.second.reload.wrestler1.name == "Test6"
-    assert conso_quarter.second.reload.loser2_name == "BYE"
-
-    conso_semis = matches.select{|m| m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}
-    assert conso_semis.first.reload.wrestler1.name == "Test3"
-    assert conso_semis.first.reload.wrestler2.name == "Test5"
-    assert conso_semis.second.reload.wrestler1.name == "Test1"
-    assert conso_semis.second.reload.wrestler2.name == "Test6"
-    winner_by_name("Test5",conso_semis.first)
-    winner_by_name("Test1",conso_semis.second)
-
-    first_finals = matches.select{|m| m.bracket_position == "1/2"}.first
-    third_finals = matches.select{|m| m.bracket_position == "3/4"}.first
-    fifth_finals = matches.select{|m| m.bracket_position == "5/6"}.first
-
-    assert first_finals.reload.wrestler1.name == "Test4"
-    assert first_finals.reload.wrestler2.name == "Test2"
-
-    assert third_finals.reload.wrestler1.name == "Test5"
-    assert third_finals.reload.wrestler2.name == "Test1"
-
-    assert fifth_finals.reload.wrestler1.name == "Test3"
-    assert fifth_finals.reload.wrestler2.name == "Test6"
-
-    # DEBUG
-    # matches.sort_by{|m| m.bout_number}.each do |match|
-    #   match.reload
-    #   puts "Round #{match.round} #{match.w1_bracket_name} vs #{match.w2_bracket_name}"
-    # end
-  end
-
-  test "16 man double elimination" do
+  test "16 man double elimination placing 6 run through" do
     create_double_elim_tournament_single_weight_1_6(14)
     matches = @tournament.matches.reload
 

test/integration/double_elimination_sixteen_man_1_8_run_through_test.rb

@@ -0,0 +1,118 @@
+require 'test_helper'
+
+class DoubleEliminationSixteenManEightPlacesRunThrough < ActionDispatch::IntegrationTest
+  def setup
+  end
+
+  def winner_by_name(winner_name,match)
+    wrestler = @tournament.weights.first.wrestlers.select{|w| w.name == winner_name}.first
+    match.winner_id = wrestler.id
+    match.finished = 1
+    match.win_type = "Decision"
+    match.score = "0-0"
+    match.save
+  end
+
+  test "16 man double elimination place 1-8" do
+    create_double_elim_tournament_single_weight(14, "Regular Double Elimination 1-8")
+    matches = @tournament.matches.reload
+
+    round1 = matches.select{|m| m.round == 1}
+    winner_by_name("Test9", round1.select{|m| m.bracket_position_number == 2}.first)
+    winner_by_name("Test5", round1.select{|m| m.bracket_position_number == 3}.first)
+    winner_by_name("Test4", round1.select{|m| m.bracket_position_number == 4}.first)
+    winner_by_name("Test13", round1.select{|m| m.bracket_position_number == 5}.first)
+    winner_by_name("Test6", round1.select{|m| m.bracket_position_number == 6}.first)
+    winner_by_name("Test10", round1.select{|m| m.bracket_position_number == 7}.first)
+
+    quarter = matches.select{|m| m.bracket_position == "Quarter"}.sort_by{|m| m.bracket_position_number}
+    assert quarter.first.reload.wrestler1.name == "Test1"
+    assert quarter.first.reload.wrestler2.name == "Test9"
+    assert quarter.second.reload.wrestler1.name == "Test5"
+    assert quarter.second.reload.wrestler2.name == "Test4"
+    assert quarter.third.reload.wrestler1.name == "Test13"
+    assert quarter.third.reload.wrestler2.name == "Test6"
+    assert quarter.fourth.reload.wrestler1.name == "Test10"
+    assert quarter.fourth.reload.wrestler2.name == "Test2"
+
+    conso_round2 = matches.select{|m| m.bracket_position == "Conso" and m.round == 2}.sort_by{|m| m.bracket_position_number}
+    assert conso_round2.first.reload.wrestler2.name == "Test8"
+    assert conso_round2.second.reload.wrestler1.name == "Test12"
+    assert conso_round2.second.reload.wrestler2.name == "Test14"
+    assert conso_round2.third.reload.wrestler1.name == "Test3"
+    assert conso_round2.third.reload.wrestler2.name == "Test11"
+    assert conso_round2.fourth.reload.wrestler1.name == "Test7"
+
+    winner_by_name("Test1", quarter.first)
+    winner_by_name("Test5", quarter.second)
+    winner_by_name("Test13", quarter.third)
+    winner_by_name("Test10", quarter.fourth)
+    winner_by_name("Test12", conso_round2.second)
+    winner_by_name("Test3", conso_round2.third)
+
+    semis = matches.select{|m| m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}
+    assert semis.first.reload.wrestler1.name == "Test1"
+    assert semis.first.reload.wrestler2.name == "Test5"
+    assert semis.second.reload.wrestler1.name == "Test13"
+    assert semis.second.reload.wrestler2.name == "Test10"
+
+    conso_round3 = matches.select{|m| m.bracket_position == "Conso" and m.round == 3}.sort_by{|m| m.bracket_position_number}
+    assert conso_round3.first.reload.wrestler1.name == "Test2"
+    assert conso_round3.first.reload.wrestler2.name == "Test8"
+    assert conso_round3.second.reload.wrestler1.name == "Test6"
+    assert conso_round3.second.reload.wrestler2.name == "Test12"
+    assert conso_round3.third.reload.wrestler1.name == "Test4"
+    assert conso_round3.third.reload.wrestler2.name == "Test3"
+    assert conso_round3.fourth.reload.wrestler1.name == "Test9"
+    assert conso_round3.fourth.reload.wrestler2.name == "Test7"
+
+    winner_by_name("Test2", conso_round3.first)
+    winner_by_name("Test6", conso_round3.second)
+    winner_by_name("Test3", conso_round3.third)
+    winner_by_name("Test9", conso_round3.fourth)
+
+    conso_quarter = matches.select{|m| m.bracket_position == "Conso Quarter"}.sort_by{|m| m.bracket_position_number}
+    assert conso_quarter.first.reload.wrestler1.name == "Test2"
+    assert conso_quarter.first.reload.wrestler2.name == "Test6"
+    assert conso_quarter.second.reload.wrestler1.name == "Test3"
+    assert conso_quarter.second.reload.wrestler2.name == "Test9"
+
+    winner_by_name("Test5",semis.first)
+    winner_by_name("Test10",semis.second)
+    winner_by_name("Test2", conso_quarter.first)
+    winner_by_name("Test3", conso_quarter.second)
+
+    conso_semis = matches.select{|m| m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}
+    assert conso_semis.first.reload.wrestler1.name == "Test1"
+    assert conso_semis.first.reload.wrestler2.name == "Test2"
+    assert conso_semis.second.reload.wrestler1.name == "Test13"
+    assert conso_semis.second.reload.wrestler2.name == "Test3"
+
+    winner_by_name("Test2",conso_semis.first)
+    winner_by_name("Test3",conso_semis.second)
+
+    first_finals = matches.select{|m| m.bracket_position == "1/2"}.first
+    third_finals = matches.select{|m| m.bracket_position == "3/4"}.first
+    fifth_finals = matches.select{|m| m.bracket_position == "5/6"}.first
+    seventh_finals = matches.select{|m| m.bracket_position == "7/8"}.first
+
+
+    assert first_finals.reload.wrestler1.name == "Test5"
+    assert first_finals.reload.wrestler2.name == "Test10"
+
+    assert third_finals.reload.wrestler1.name == "Test2"
+    assert third_finals.reload.wrestler2.name == "Test3"
+
+    assert fifth_finals.reload.wrestler1.name == "Test1"
+    assert fifth_finals.reload.wrestler2.name == "Test13"
+    
+    assert seventh_finals.reload.wrestler1.name == "Test6"
+    assert seventh_finals.reload.wrestler2.name == "Test9"
+
+    # DEBUG
+    # matches.sort_by{|m| m.bout_number}.each do |match|
+    #   match.reload
+    #   puts "Round #{match.round} #{match.w1_bracket_name} vs #{match.w2_bracket_name}"
+    # end
+  end
+end