Removed all of the @s from integration tests

2026-04-05 22:21:26 +00:00 · 2015-11-16 16:25:28 +00:00
parent 2e1f70803b
commit 6436551f34
2 changed files with 147 additions and 152 deletions
--- a/test/integration/pool_advancement_test.rb
+++ b/test/integration/pool_advancement_test.rb
@@ -8,74 +8,74 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest
  end

  def showNineManWeightThreePoolTwoMatches
-    @matches = @tournament.matches.select{|m| m.weight_id == 3 && m.bracket_position == "Pool" && m.poolNumber == 2}
-    @matches.each do |m|
+    matches = @tournament.matches.select{|m| m.weight_id == 3 && m.bracket_position == "Pool" && m.poolNumber == 2}
+    matches.each do |m|
      puts "Bout: #{m.bout_number} #{m.w1_name} vs #{m.w2_name} Pool: #{m.poolNumber}"
    end
  end

  def nineManBracketPoolOneOutrightWinner
-     @matches = @tournament.matches.select{|m| m.weight_id == 3 && m.bracket_position == "Pool"}
-     endMatch(1002,"Guy8",@matches)
-     endMatch(1003,"Guy10",@matches)
-     endMatch(2002,"Guy2",@matches)
-     endMatch(2003,"Guy8",@matches)
-     endMatch(3003,"Guy2",@matches)
-     endMatch(4002,"Guy8",@matches)
-     endMatch(4003,"Guy2",@matches)
-     endMatch(5002,"Guy2",@matches)
-     endMatch(5003,"Guy5",@matches)
-     endMatch(3002,"Guy5",@matches)
+     matches = @tournament.matches.select{|m| m.weight_id == 3 && m.bracket_position == "Pool"}
+     endMatch(1002,"Guy8",matches)
+     endMatch(1003,"Guy10",matches)
+     endMatch(2002,"Guy2",matches)
+     endMatch(2003,"Guy8",matches)
+     endMatch(3003,"Guy2",matches)
+     endMatch(4002,"Guy8",matches)
+     endMatch(4003,"Guy2",matches)
+     endMatch(5002,"Guy2",matches)
+     endMatch(5003,"Guy5",matches)
+     endMatch(3002,"Guy5",matches)
  end
  
  def nineManBracketPoolTwoGuyNineHeadToHead
-    @matches = @tournament.matches.select{|m| m.weight_id == 3 && m.bracket_position == "Pool"}
-    endMatch(1004,"Guy4",@matches)
-    endMatch(1005,"Guy3",@matches)
-    endMatch(2004,"Guy3",@matches)
-    endMatch(2005,"Guy9",@matches)
-    endMatch(3004,"Guy7",@matches)
-    endMatch(3005,"Guy9",@matches)
+    matches = @tournament.matches.select{|m| m.weight_id == 3 && m.bracket_position == "Pool"}
+    endMatch(1004,"Guy4",matches)
+    endMatch(1005,"Guy3",matches)
+    endMatch(2004,"Guy3",matches)
+    endMatch(2005,"Guy9",matches)
+    endMatch(3004,"Guy7",matches)
+    endMatch(3005,"Guy9",matches)
  end
  
  def nineManBracketPoolTwoGuyThreeHeadToHead
-    @matches = @tournament.matches.select{|m| m.weight_id == 3 && m.bracket_position == "Pool"}
-    endMatch(1004,"Guy9",@matches)
-    endMatch(1005,"Guy3",@matches)
-    endMatch(2004,"Guy4",@matches)
-    endMatch(2005,"Guy9",@matches)
-    endMatch(3004,"Guy7",@matches)
+    matches = @tournament.matches.select{|m| m.weight_id == 3 && m.bracket_position == "Pool"}
+    endMatch(1004,"Guy9",matches)
+    endMatch(1005,"Guy3",matches)
+    endMatch(2004,"Guy4",matches)
+    endMatch(2005,"Guy9",matches)
+    endMatch(3004,"Guy7",matches)
    #DEDUCTED POINTS SHOULD NOT MATTER FOR HEAD TO HEAD
-    @deduct = Teampointadjust.new
-    @deduct.wrestler_id = translateNameToId("Guy3")
-    @deduct.points = 1
-    @deduct.save
-    endMatch(3005,"Guy3",@matches)
+    deduct = Teampointadjust.new
+    deduct.wrestler_id = translateNameToId("Guy3")
+    deduct.points = 1
+    deduct.save
+    endMatch(3005,"Guy3",matches)
  end
  
  def nineManBracketPoolTwoGuyThreeDeductedPoints
-    @matches = @tournament.matches.select{|m| m.weight_id == 3 && m.bracket_position == "Pool"}
-    endMatch(1004,"Guy9",@matches)
-    endMatch(1005,"Guy7",@matches)
-    endMatch(2004,"Guy3",@matches)
-    endMatch(2005,"Guy9",@matches)
-    endMatch(3004,"Guy7",@matches)
-    endMatch(3005,"Guy3",@matches)
-    @deduct = Teampointadjust.new
-    @deduct.wrestler_id = translateNameToId("Guy7")
-    @deduct.points = 1
-    @deduct.save
+    matches = @tournament.matches.select{|m| m.weight_id == 3 && m.bracket_position == "Pool"}
+    endMatch(1004,"Guy9",matches)
+    endMatch(1005,"Guy7",matches)
+    endMatch(2004,"Guy3",matches)
+    endMatch(2005,"Guy9",matches)
+    endMatch(3004,"Guy7",matches)
+    endMatch(3005,"Guy3",matches)
+    deduct = Teampointadjust.new
+    deduct.wrestler_id = translateNameToId("Guy7")
+    deduct.points = 1
+    deduct.save
  end
  
  def endMatch(bout,winner,matches)
-     @match = matches.select{|m| m.bout_number == bout}.first
-     @match.finished = 1
-     @match.winner_id = translateNameToId(winner)
-     @match.win_type = "Decision"
+     match = matches.select{|m| m.bout_number == bout}.first
+     match.finished = 1
+     match.winner_id = translateNameToId(winner)
+     match.win_type = "Decision"
     #Need to manually assign mat_id because thise weight class is not currently assigned a mat
-     @mat = @tournament.mats.first
-     @match.mat_id = @mat.id
-     @match.save
+     mat = @tournament.mats.first
+     match.mat_id = mat.id
+     match.save
  end
  def translateNameToId(wrestler)
    Wrestler.where("name = ?", wrestler).first.id
@@ -83,54 +83,49 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest

  test "nine man outright finals advance" do
    nineManBracketPoolOneOutrightWinner
-    @wrestler = Wrestler.where("name = ?", "Guy2").first
-    assert_equal 6000, @wrestler.boutByRound(6)
+    wrestler = Wrestler.where("name = ?", "Guy2").first
+    assert_equal 6000, wrestler.boutByRound(6)
  end

  test "nine man outright conso finals advance" do
    nineManBracketPoolOneOutrightWinner
-    @wrestler = Wrestler.where("name = ?", "Guy8").first
-    assert_equal 6001, @wrestler.boutByRound(6)
+    wrestler = Wrestler.where("name = ?", "Guy8").first
+    assert_equal 6001, wrestler.boutByRound(6)
  end

  test "nine man pool 2 man to man tie breaker finalist guy 9" do
-    @wrestler = Wrestler.where("name = ?", "Guy9").first
+    wrestler = Wrestler.where("name = ?", "Guy9").first
    nineManBracketPoolTwoGuyNineHeadToHead
-    assert_equal 6000, @wrestler.boutByRound(6)
+    assert_equal 6000, wrestler.boutByRound(6)
  end
  
  test "nine man pool 2 man to man tie breaker finalist guy 3" do
-    @wrestler = Wrestler.where("name = ?", "Guy3").first
+    wrestler = Wrestler.where("name = ?", "Guy3").first
    nineManBracketPoolTwoGuyThreeHeadToHead
-    assert_equal 6000, @wrestler.boutByRound(6)
+    assert_equal 6000, wrestler.boutByRound(6)
  end
  
  test "nine man conso finals man to man tie breaker guy 3" do
    nineManBracketPoolTwoGuyNineHeadToHead
-    @wrestler = Wrestler.where("name = ?", "Guy3").first
-    assert_equal 6001, @wrestler.boutByRound(6)
+    wrestler = Wrestler.where("name = ?", "Guy3").first
+    assert_equal 6001, wrestler.boutByRound(6)
  end
  
  test "nine man conso finals man to man tie breaker guy 9" do
    nineManBracketPoolTwoGuyThreeHeadToHead
-    @wrestler = Wrestler.where("name = ?", "Guy9").first
-    # @match = Match.where(bout_number: 6001).first
-    # puts "#{@match.w1_name} v #{@match.w2_name}"
-    assert_equal 6001, @wrestler.boutByRound(6)
+    wrestler = Wrestler.where("name = ?", "Guy9").first
+    assert_equal 6001, wrestler.boutByRound(6)
  end
  
  test "nine man pool 2 deductedPoints tie breaker finalist guy 3" do
-    @wrestler = Wrestler.where("name = ?", "Guy3").first
+    wrestler = Wrestler.where("name = ?", "Guy3").first
    nineManBracketPoolTwoGuyThreeDeductedPoints
-    assert_equal 6000, @wrestler.boutByRound(6)
+    assert_equal 6000, wrestler.boutByRound(6)
  end
  
  test "nine man conso finals deductedPoints tie breaker guy 9" do
    nineManBracketPoolTwoGuyThreeDeductedPoints
-    @wrestler = Wrestler.where("name = ?", "Guy9").first
-    # @match = Match.where(bout_number: 6001).first
-    # puts "#{@match.w1_name} v #{@match.w2_name}"
-    assert_equal 6001, @wrestler.boutByRound(6)
+    wrestler = Wrestler.where("name = ?", "Guy9").first
+    assert_equal 6001, wrestler.boutByRound(6)
  end
-
 end