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" %>

+<% end %> @@ -128,7 +129,7 @@ <% end %>
-<% 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