From 8f07bc2f82ac6ce6518d61a2098a9d8343eaa627 Mon Sep 17 00:00:00 2001
From: jcwimer <jacob.wimer@gmail.com>
Date: Tue, 12 Apr 2016 21:09:57 +0000
Subject: [PATCH] Cleaned up tests

---
 test/integration/pool_advancement_test.rb | 33 +++++++++++------------
 test/integration/single_test_test.rb      |  3 ---
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/test/integration/pool_advancement_test.rb b/test/integration/pool_advancement_test.rb
index 3b033ac..5df311a 100644
--- a/test/integration/pool_advancement_test.rb
+++ b/test/integration/pool_advancement_test.rb
@@ -4,15 +4,11 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest
 
   def setup
     tournament = Tournament.find(1)
+    
+    # WHY DOES THIS NOT WORK WITHOUT GENERATING MATCHUPS BEFORE EVERY TEST?
+    # FIXTURES FOR MATCHES ARE FILLED OUT AND WORK FOR OTHER TESTS
     tournament.generateMatchups
   end
-
-  # def showMatches
-  #   matches = Weight.where("id = ?", 4).first.matches
-  #   matches.each do |m|
-  #     puts "Bout: #{m.bout_number} #{m.w1_name} vs #{m.w2_name} #{m.bracket_position} #{m.poolNumber}"
-  #   end
-  # end
   
   def singlePoolNotFinished
     
@@ -234,8 +230,7 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest
   end
   
   def endMatch(bout,winner)
-    match = Match.where(bout_number: bout).first
-    # match = @matches.select{|m| m.bout_number == bout}.first
+     match = Match.where(bout_number: bout).first
      match.win_type = "Decision"
      match.score = 1-0
      saveMatch(match,winner)
@@ -286,7 +281,9 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest
   def saveMatch(match,winner)
     match.finished = 1
     match.winner_id = translateNameToId(winner)
-    match.save
+    
+    match.save!
+    # match.after_update_actions
   end
   
   def translateNameToId(wrestler)
@@ -541,15 +538,15 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest
   end
     
   test "Test mat assignment when adding a mat and when destroying a mat" do
-    @mat2 = Mat.new
-    @mat2.name = "2"
-    @mat2.tournament_id = 1
-    @mat2.save
-    assert_equal 4, @mat2.matches.size
+    mat2 = Mat.new
+    mat2.name = "2"
+    mat2.tournament_id = 1
+    mat2.save
+    assert_equal 4, mat2.matches.size
     elevenManBracketFinished
-    @mat2.destroy
-    @mat1 = Mat.find(1)
-    assert_equal 4, @mat1.matches.size
+    mat2.destroy
+    mat1 = Mat.find(1)
+    assert_equal 4, mat1.matches.size
   end
   
   test "Championship bracket wins are 2pts" do
diff --git a/test/integration/single_test_test.rb b/test/integration/single_test_test.rb
index 3a3159e..af56bca 100644
--- a/test/integration/single_test_test.rb
+++ b/test/integration/single_test_test.rb
@@ -4,13 +4,10 @@ class SingleTestTest < ActionDispatch::IntegrationTest
   def setup
     @tournament = Tournament.find(1)
     # @tournament.generateMatchups
-    # @matches = @tournament.matches
   end
   
   #rake test test/integration/single_test_test.rb > matches.txt
-  # Loser names need to be in quotes in yml file
   def showMatches
-    # matches = Weight.where("id = ?", 4).first.matches
     count = 1
     
     # Yml for matches