From d68e4bc54fa1a031d6296e3cccc7bde6b39ae4a2 Mon Sep 17 00:00:00 2001
From: jcwimer <jacob.wimer@gmail.com>
Date: Tue, 5 May 2015 19:10:17 +0000
Subject: [PATCH] got tests working and showed mats table if not logged in

---
 app/models/{tournamentMatchGen.rb => tournamentmatchgen.rb} | 0
 app/views/tournaments/show.html.erb                         | 3 ++-
 test/integration/poolbracket_matchups_test.rb               | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename app/models/{tournamentMatchGen.rb => tournamentmatchgen.rb} (100%)

diff --git a/app/models/tournamentMatchGen.rb b/app/models/tournamentmatchgen.rb
similarity index 100%
rename from app/models/tournamentMatchGen.rb
rename to app/models/tournamentmatchgen.rb
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index ca19718..ffeb64b 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -107,6 +107,7 @@
     <%= link_to "New #{@tournament.name} Mat" , "/mats/new?tournament=#{@tournament.id}", :class=>"btn btn-default" %>
     <br>
     <br>
+<% end %>
 <table class="table table-striped table-bordered">
   <thead>
     <tr>
@@ -128,7 +129,7 @@
     <% end %>
   </tbody>
 </table>
-<% end %>
+
 
 
 
diff --git a/test/integration/poolbracket_matchups_test.rb b/test/integration/poolbracket_matchups_test.rb
index 2694b5c..3078502 100644
--- a/test/integration/poolbracket_matchups_test.rb
+++ b/test/integration/poolbracket_matchups_test.rb
@@ -3,7 +3,6 @@ require 'test_helper'
 class PoolbracketMatchupsTest < ActionDispatch::IntegrationTest
   def setup
     @tournament = Tournament.find(1)
-    @tournament.upcomingMatches
     @genMatchups = @tournament.upcomingMatches
   end