From bd3c29bd604ea7ce55081d65cc8cf91bf8397ac6 Mon Sep 17 00:00:00 2001
From: jcwimer <jacob.wimer@gmail.com>
Date: Wed, 20 Jan 2016 16:10:41 +0000
Subject: [PATCH] Fixed tournament error bug

---
 app/models/tournament.rb                        | 7 ++++++-
 test/controllers/tournaments_controller_test.rb | 4 ----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index 3be469e..6fe5f1d 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -112,7 +112,12 @@ class Tournament < ActiveRecord::Base
   	
   	def poolToBracketWeightsWithTooManyWrestlers
   		if self.tournament_type == "Pool to bracket"
-  			weights.select{|w| w.wrestlers.size > 16}
+  			weightsWithTooManyWrestlers = weights.select{|w| w.wrestlers.size > 16}
+  			if weightsWithTooManyWrestlers.size < 1
+  				return nil
+  			else
+  				return weightsWithTooManyWrestlers
+  			end
   		else
   			nil
   		end
diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb
index 3886a04..1e0512b 100644
--- a/test/controllers/tournaments_controller_test.rb
+++ b/test/controllers/tournaments_controller_test.rb
@@ -56,21 +56,18 @@ include Devise::TestHelpers
   end
 
   test "logged in tournament owner can generate matches" do
-    wipe
     sign_in_owner
     get :generate_matches, id: 1
     success
   end
 
   test "logged in non tournament owner cannot generate matches" do
-    wipe
     sign_in_non_owner
     get :generate_matches, id: 1
     redirect
   end
   
   test "logged in school delegate cannot generate matches" do
-    wipe
     sign_in_school_delegate
     get :generate_matches, id: 1
     redirect
@@ -231,7 +228,6 @@ include Devise::TestHelpers
   end
   
   test "logged in tournament delegate can generate matches" do
-    wipe
     sign_in_delegate
     get :generate_matches, id: 1
     success