merge

48 files changed, 34 insertions, 72 deletions

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 09119c8..3ccd7be 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -67,6 +67,6 @@ class GamesController < ApplicationController
 
 	# Never trust parameters from the scary internet, only allow the white list through.
 	def game_params
-		params.require(:game).permit(:parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_method)
+		params.require(:game).permit(:parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :sampling_method, :scoring_method)
 	end
 end
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 62d32b1..8752298 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -15,8 +15,7 @@ class TournamentsController < ApplicationController
 				when 0
 					render action: 'show'
 				when 1
-					#redirect_to tournament_matches_page(@tournament)
-					redirect_to "/tournaments/" + @tournament.id.to_s + "/matches"
+					redirect_to tournament_matches_path(@tournament)
 				when 2
 					redirect_to tournaments_page
 				end
@@ -51,11 +50,20 @@ class TournamentsController < ApplicationController
 				ok &= @tournament.update(tournament_setting_params)
 				ok &= @tournament.hosts.push(current_user)
 				for i in 1..(params[:num_stages].to_i) do
-					ok &= @tournament.stages.create(tournament_stage_params(i))
+					begin
+						ok &= @tournament.stages.create(tournament_stage_params(i))
+					rescue ActionController::ParameterMissing => e
+						ok = false
+						@tournament.errors.add("stages[#{i}]", "Stage #{i} not set")
+					end
 				end
 			end
-		rescue
+		rescue ActiveRecord::RecordNotUnique => e
+			ok = false
+			@tournament.errors.add(:name, "must be unique")
+		rescue => e
 			ok = false
+			@tournament.errors.add(:exception, "Unknown error: ``#{e.class.name}'' -- #{e.inspect} -- #{e.methods - Object.new.methods}")
 		end
 		respond_to do |format|
 			if ok
@@ -171,8 +179,9 @@ class TournamentsController < ApplicationController
 
 	# Never trust parameters from the scary internet, only allow the white list through.
 	def tournament_attribute_params
+		params[:num_stages] ||= 1
 		if params[:tournament]
-			p = params.require(:tournament).permit(:game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_method)
+			p = params.require(:tournament).permit(:game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :sampling_method, :scoring_method)
 			if p[:game_id]
 				game = Game.find(p[:game_id])
 				p[:min_players_per_team] ||= game.min_players_per_team
@@ -198,7 +207,7 @@ class TournamentsController < ApplicationController
 	end
 
 	def tournament_stage_params(i)
-		params.require(:tournament).require(i.to_sym).permit(:scheduling_method, :seeding_method)
+		params.require(:tournament).require(:stages).require(i.to_s).permit(:scheduling_method, :seeding_method)
 	end
 
 	def is_owner?(object)
diff --git a/app/views/games/_form.html.erb b/app/views/games/_form.html.erb
index b1db0b3..e7def85 100644
--- a/app/views/games/_form.html.erb
+++ b/app/views/games/_form.html.erb
@@ -36,14 +36,6 @@
     <%= f.number_field :max_teams_per_match %>
   </div>
   <div class="field">
-    <%= f.label :set_rounds %><br>
-    <%= f.number_field :set_rounds %>
-  </div>
-  <div class="field">
-    <%= f.label :randomized_teams %><br>
-    <%= f.check_box :randomized_teams %>
-  </div>
-  <div class="field">
     <%= f.label :sampling_method %><br>
     <%= f.text_field :sampling_method %>
   </div>
diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb
index 3045325..565320c 100644
--- a/app/views/games/index.html.erb
+++ b/app/views/games/index.html.erb
@@ -9,8 +9,6 @@
       <th>Max players per team</th>
       <th>Min teams per match</th>
       <th>Max teams per match</th>
-      <th>Set rounds</th>
-      <th>Randomized teams</th>
       <th>Sampling method</th>
       <th>Scoring method</th>
       <th></th>
@@ -28,8 +26,6 @@
         <td><%= game.max_players_per_team %></td>
         <td><%= game.min_teams_per_match %></td>
         <td><%= game.max_teams_per_match %></td>
-        <td><%= game.set_rounds %></td>
-        <td><%= game.randomized_teams %></td>
         <td><%= game.sampling_method %></td>
         <td><%= game.scoring_method %></td>
         <td><%= link_to 'Show', game %></td>
diff --git a/app/views/games/index.json.jbuilder b/app/views/games/index.json.jbuilder
index 7964f2c..0e9769b 100644
--- a/app/views/games/index.json.jbuilder
+++ b/app/views/games/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@games) do |game|
-  json.extract! game, :id, :parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_method
+  json.extract! game, :id, :parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :sampling_method, :scoring_method
   json.url game_url(game, format: :json)
 end
diff --git a/app/views/games/show.html.erb b/app/views/games/show.html.erb
index 1a18356..4c67493 100644
--- a/app/views/games/show.html.erb
+++ b/app/views/games/show.html.erb
@@ -29,16 +29,6 @@
 </p>
 
 <p>
-  <strong>Set rounds:</strong>
-  <%= @game.set_rounds %>
-</p>
-
-<p>
-  <strong>Randomized teams:</strong>
-  <%= @game.randomized_teams %>
-</p>
-
-<p>
   <strong>Sampling method:</strong>
   <%= @game.sampling_method %>
 </p>
diff --git a/app/views/games/show.json.jbuilder b/app/views/games/show.json.jbuilder
index c5fb4ed..981c31e 100644
--- a/app/views/games/show.json.jbuilder
+++ b/app/views/games/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @game, :id, :parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_method, :created_at, :updated_at
+json.extract! @game, :id, :parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :sampling_method, :scoring_method, :created_at, :updated_at
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index 33ce746..28d9c27 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -49,7 +49,7 @@
 	</fieldset>
 
 	<fieldset><legend>Settings</legend>
-	<%= fields_for "tournament[settings]", @tournament.settings do |setting_fields| %>
+	<%= f.fields_for :settings do |setting_fields| %>
 		<% (@tournament.settings.empty? ? @tournament.game.settings : @tournament.settings).each do |setting| %><p>
 			<% name = setting.name.parameterize.underscore %>
 			<%= setting_fields.label name %>
@@ -81,22 +81,20 @@
 	<% end %>
 	</fieldset>
 
-	<fieldset><legend>Stages</legend>
+	<%= f.fields_for :stages do |stages_fields| %><fieldset><legend>Stages</legend>
 		<label for="num_stages">Number of tournament stages</label>
 		<input type="number" name="num_stages" min="1" value="<%= params[:num_stages] ? params[:num_stages].to_i : 1 %>">
 		<%= submit_tag("Set Stages", :class => "btn") %>
-
 		<% for i in 1..(params[:num_stages].to_i) do %>
-			<%= fields_for "tournament[stages][#{i}]", @tournament.stages[i] do |stage_fields| %>
-			<fieldset><legend>Stage <%= i %></legend>
+			<%= stages_fields.fields_for i.to_s do |stage_fields| %><fieldset><legend>Stage <%= i %></legend>
 				<%= stage_fields.label :scheduling_method %>
 				<%= stage_fields.select(:scheduling_method, @tournament.scheduling_methods.map{|method| [method.humanize, method]}) %>
 				<%= stage_fields.label :seeding_method %>
 				<%= stage_fields.select(:seeding_method, @tournament.seeding_methods.map{|method| [method.humanize, method]}) %>
-			</fieldset>
-			<% end %>
+			</fieldset><% end %>
 		<% end %>
-	</fieldset>
+	</fieldset><% end %>
+
 	<%= f.submit %>
 
 	<%# render 'stages' %>
diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder
index bd86e04..c6b9e68 100644
--- a/app/views/tournaments/index.json.jbuilder
+++ b/app/views/tournaments/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@tournaments) do |tournament|
-  json.extract! tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_method
+  json.extract! tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :sampling_method, :scoring_method
   json.url tournament_url(tournament, format: :json)
 end
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index f79b975..53389bb 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -45,12 +45,6 @@
   <%= @tournament.max_teams_per_match %>
 </p>
 
-
-<p>
-  <strong>Randomized teams:</strong>
-  <%= @tournament.randomized_teams %>
-</p>
-
 <p>
   <strong>Sampling method:</strong>
   <!-- TODO -->
diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder
index ff82412..afc5814 100644
--- a/app/views/tournaments/show.json.jbuilder
+++ b/app/views/tournaments/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_method, :created_at, :updated_at
+json.extract! @tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :sampling_method, :scoring_method, :created_at, :updated_at
diff --git a/config/routes.rb b/config/routes.rb
index a4df5b4..4094479 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -14,7 +14,7 @@ Leaguer::Application.routes.draw do
 
 	resources :tournaments do
 		resources :matches, only: [:index, :show, :update]
-		resources :brackets
+		resources :brackets, only: [:create, :index, :show, :edit, :update, :destroy]
 	end
 
 	resource :server, only: [:show, :edit, :update]
@@ -25,7 +25,6 @@ Leaguer::Application.routes.draw do
 
 end
 
-
 Leaguer::Application.routes.named_routes.module.module_eval do
 	def match_path(match, options={})
 		tournament_match_path(match.tournament_stage.tournament, match, options)
diff --git a/db/migrate/20140426201409_create_simple_captcha_data.rb b/db/migrate/20140427131527_create_simple_captcha_data.rb
index 4573b20..4573b20 100644
--- a/db/migrate/20140426201409_create_simple_captcha_data.rb
+++ b/db/migrate/20140427131527_create_simple_captcha_data.rb
diff --git a/db/migrate/20140427001406_create_mailboxer.mailboxer_engine.rb b/db/migrate/20140427171523_create_mailboxer.mailboxer_engine.rb
index 690cec2..690cec2 100644
--- a/db/migrate/20140427001406_create_mailboxer.mailboxer_engine.rb
+++ b/db/migrate/20140427171523_create_mailboxer.mailboxer_engine.rb
diff --git a/db/migrate/20140427001407_add_notified_object.mailboxer_engine.rb b/db/migrate/20140427171524_add_notified_object.mailboxer_engine.rb
index 7f41ac6..7f41ac6 100644
--- a/db/migrate/20140427001407_add_notified_object.mailboxer_engine.rb
+++ b/db/migrate/20140427171524_add_notified_object.mailboxer_engine.rb
diff --git a/db/migrate/20140427001408_add_notification_code.mailboxer_engine.rb b/db/migrate/20140427171525_add_notification_code.mailboxer_engine.rb
index 04c12ef..04c12ef 100644
--- a/db/migrate/20140427001408_add_notification_code.mailboxer_engine.rb
+++ b/db/migrate/20140427171525_add_notification_code.mailboxer_engine.rb
diff --git a/db/migrate/20140427001409_add_attachments.mailboxer_engine.rb b/db/migrate/20140427171526_add_attachments.mailboxer_engine.rb
index b8d6588..b8d6588 100644
--- a/db/migrate/20140427001409_add_attachments.mailboxer_engine.rb
+++ b/db/migrate/20140427171526_add_attachments.mailboxer_engine.rb
diff --git a/db/migrate/20140427001410_rename_receipts_read.mailboxer_engine.rb b/db/migrate/20140427171527_rename_receipts_read.mailboxer_engine.rb
index 9ce904f..9ce904f 100644
--- a/db/migrate/20140427001410_rename_receipts_read.mailboxer_engine.rb
+++ b/db/migrate/20140427171527_rename_receipts_read.mailboxer_engine.rb
diff --git a/db/migrate/20140427001411_add_global_notification_support.mailboxer_engine.rb b/db/migrate/20140427171528_add_global_notification_support.mailboxer_engine.rb
index 60f67ab..60f67ab 100644
--- a/db/migrate/20140427001411_add_global_notification_support.mailboxer_engine.rb
+++ b/db/migrate/20140427171528_add_global_notification_support.mailboxer_engine.rb
diff --git a/db/migrate/20140427001413_create_delayed_jobs.rb b/db/migrate/20140427171530_create_delayed_jobs.rb
index ec0dd93..ec0dd93 100644
--- a/db/migrate/20140427001413_create_delayed_jobs.rb
+++ b/db/migrate/20140427171530_create_delayed_jobs.rb
diff --git a/db/migrate/20140427001416_create_servers.rb b/db/migrate/20140427171533_create_servers.rb
index fbe1b02..fbe1b02 100644
--- a/db/migrate/20140427001416_create_servers.rb
+++ b/db/migrate/20140427171533_create_servers.rb
diff --git a/db/migrate/20140427001420_create_matches.rb b/db/migrate/20140427171537_create_matches.rb
index bac92d1..bac92d1 100644
--- a/db/migrate/20140427001420_create_matches.rb
+++ b/db/migrate/20140427171537_create_matches.rb
diff --git a/db/migrate/20140427001424_create_teams.rb b/db/migrate/20140427171541_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140427001424_create_teams.rb
+++ b/db/migrate/20140427171541_create_teams.rb
diff --git a/db/migrate/20140427001428_create_alerts.rb b/db/migrate/20140427171545_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140427001428_create_alerts.rb
+++ b/db/migrate/20140427171545_create_alerts.rb
diff --git a/db/migrate/20140427001431_create_pms.rb b/db/migrate/20140427171548_create_pms.rb
index eb9f443..eb9f443 100644
--- a/db/migrate/20140427001431_create_pms.rb
+++ b/db/migrate/20140427171548_create_pms.rb
diff --git a/db/migrate/20140427001435_create_tournaments.rb b/db/migrate/20140427171552_create_tournaments.rb
index 03b42b2..8dae8f6 100644
--- a/db/migrate/20140427001435_create_tournaments.rb
+++ b/db/migrate/20140427171552_create_tournaments.rb
@@ -8,8 +8,6 @@ class CreateTournaments < ActiveRecord::Migration
       t.integer :max_players_per_team
       t.integer :min_teams_per_match
       t.integer :max_teams_per_match
-      t.integer :set_rounds
-      t.boolean :randomized_teams
       t.string :sampling_method
       t.string :scoring_method
 
diff --git a/db/migrate/20140427001439_create_games.rb b/db/migrate/20140427171556_create_games.rb
index fe2e596..d1b9511 100644
--- a/db/migrate/20140427001439_create_games.rb
+++ b/db/migrate/20140427171556_create_games.rb
@@ -7,8 +7,6 @@ class CreateGames < ActiveRecord::Migration
       t.integer :max_players_per_team
       t.integer :min_teams_per_match
       t.integer :max_teams_per_match
-      t.integer :set_rounds
-      t.boolean :randomized_teams
       t.string :sampling_method
       t.string :scoring_method
 
diff --git a/db/migrate/20140427001443_create_users.rb b/db/migrate/20140427171600_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140427001443_create_users.rb
+++ b/db/migrate/20140427171600_create_users.rb
diff --git a/db/migrate/20140427001446_create_sessions.rb b/db/migrate/20140427171603_create_sessions.rb
index f667f1e..f667f1e 100644
--- a/db/migrate/20140427001446_create_sessions.rb
+++ b/db/migrate/20140427171603_create_sessions.rb
diff --git a/db/migrate/20140427001450_create_brackets.rb b/db/migrate/20140427171607_create_brackets.rb
index 8813bf2..8813bf2 100644
--- a/db/migrate/20140427001450_create_brackets.rb
+++ b/db/migrate/20140427171607_create_brackets.rb
diff --git a/db/migrate/20140427001454_create_game_settings.rb b/db/migrate/20140427171611_create_game_settings.rb
index 06fb72e..06fb72e 100644
--- a/db/migrate/20140427001454_create_game_settings.rb
+++ b/db/migrate/20140427171611_create_game_settings.rb
diff --git a/db/migrate/20140427001458_create_tournament_settings.rb b/db/migrate/20140427171615_create_tournament_settings.rb
index e56697f..e56697f 100644
--- a/db/migrate/20140427001458_create_tournament_settings.rb
+++ b/db/migrate/20140427171615_create_tournament_settings.rb
diff --git a/db/migrate/20140427001502_create_tournament_stages.rb b/db/migrate/20140427171618_create_tournament_stages.rb
index 6e52bf0..6e52bf0 100644
--- a/db/migrate/20140427001502_create_tournament_stages.rb
+++ b/db/migrate/20140427171618_create_tournament_stages.rb
diff --git a/db/migrate/20140427001505_create_statistics.rb b/db/migrate/20140427171622_create_statistics.rb
index cc2e97d..cc2e97d 100644
--- a/db/migrate/20140427001505_create_statistics.rb
+++ b/db/migrate/20140427171622_create_statistics.rb
diff --git a/db/migrate/20140427001509_create_remote_usernames.rb b/db/migrate/20140427171626_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140427001509_create_remote_usernames.rb
+++ b/db/migrate/20140427171626_create_remote_usernames.rb
diff --git a/db/migrate/20140427001513_create_bracket_matches.rb b/db/migrate/20140427171629_create_bracket_matches.rb
index 3323e31..3323e31 100644
--- a/db/migrate/20140427001513_create_bracket_matches.rb
+++ b/db/migrate/20140427171629_create_bracket_matches.rb
diff --git a/db/migrate/20140427001516_create_api_requests.rb b/db/migrate/20140427171633_create_api_requests.rb
index 544c330..544c330 100644
--- a/db/migrate/20140427001516_create_api_requests.rb
+++ b/db/migrate/20140427171633_create_api_requests.rb
diff --git a/db/migrate/20140427001520_create_tournament_players_join_table.rb b/db/migrate/20140427171637_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140427001520_create_tournament_players_join_table.rb
+++ b/db/migrate/20140427171637_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140427001523_create_tournament_hosts_join_table.rb b/db/migrate/20140427171640_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140427001523_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140427171640_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140427001527_create_team_user_join_table.rb b/db/migrate/20140427171644_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140427001527_create_team_user_join_table.rb
+++ b/db/migrate/20140427171644_create_team_user_join_table.rb
diff --git a/db/migrate/20140427001531_create_match_team_join_table.rb b/db/migrate/20140427171647_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140427001531_create_match_team_join_table.rb
+++ b/db/migrate/20140427171647_create_match_team_join_table.rb
diff --git a/db/migrate/20140427001542_add_hidden_attrs_to_user.rb b/db/migrate/20140427171658_add_hidden_attrs_to_user.rb
index 9b5c505..9b5c505 100644
--- a/db/migrate/20140427001542_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140427171658_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index 0616ef2..b3284b9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140427001542) do
+ActiveRecord::Schema.define(version: 20140427171658) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -94,8 +94,6 @@ ActiveRecord::Schema.define(version: 20140427001542) do
     t.integer  "max_players_per_team"
     t.integer  "min_teams_per_match"
     t.integer  "max_teams_per_match"
-    t.integer  "set_rounds"
-    t.boolean  "randomized_teams"
     t.string   "sampling_method"
     t.string   "scoring_method"
     t.datetime "created_at"
@@ -272,8 +270,6 @@ ActiveRecord::Schema.define(version: 20140427001542) do
     t.integer  "max_players_per_team"
     t.integer  "min_teams_per_match"
     t.integer  "max_teams_per_match"
-    t.integer  "set_rounds"
-    t.boolean  "randomized_teams"
     t.string   "sampling_method"
     t.string   "scoring_method"
     t.datetime "created_at"
diff --git a/generate.sh b/generate.sh
index f01e482..3837ddb 100755
--- a/generate.sh
+++ b/generate.sh
@@ -44,8 +44,8 @@ bundle exec rails generate scaffold match status:integer tournament_stage:refere
 bundle exec rails generate scaffold team
 bundle exec rails generate scaffold alert author:references message:text
 bundle exec rails generate scaffold pm author:references recipient:references message:text subject:text conversation:references
-bundle exec rails generate scaffold tournament game:references status:integer name:string:uniq min_players_per_team:integer max_players_per_team:integer min_teams_per_match:integer max_teams_per_match:integer set_rounds:integer randomized_teams:boolean sampling_method:string scoring_method:string
-bundle exec rails generate scaffold game       parent:references              name:string:uniq min_players_per_team:integer max_players_per_team:integer min_teams_per_match:integer max_teams_per_match:integer set_rounds:integer randomized_teams:boolean sampling_method:string scoring_method:string
+bundle exec rails generate scaffold tournament game:references status:integer name:string:uniq min_players_per_team:integer max_players_per_team:integer min_teams_per_match:integer max_teams_per_match:integer sampling_method:string scoring_method:string
+bundle exec rails generate scaffold game       parent:references              name:string:uniq min_players_per_team:integer max_players_per_team:integer min_teams_per_match:integer max_teams_per_match:integer sampling_method:string scoring_method:string
 bundle exec rails generate scaffold user name:string email:string:uniq user_name:string:uniq
 bundle exec rails generate scaffold session user:references token:string:uniq
 bundle exec rails generate scaffold bracket user:references tournament:references name:string
diff --git a/test/controllers/games_controller_test.rb b/test/controllers/games_controller_test.rb
index 567ecb9..b86fe7a 100644
--- a/test/controllers/games_controller_test.rb
+++ b/test/controllers/games_controller_test.rb
@@ -18,7 +18,7 @@ class GamesControllerTest < ActionController::TestCase
 
   test "should create game" do
     assert_difference('Game.count') do
-      post :create, game: { max_players_per_team: @game.max_players_per_team, max_teams_per_match: @game.max_teams_per_match, min_players_per_team: @game.min_players_per_team, min_teams_per_match: @game.min_teams_per_match, name: @game.name, parent_id: @game.parent_id, randomized_teams: @game.randomized_teams, sampling_method: @game.sampling_method, scoring_method: @game.scoring_method, set_rounds: @game.set_rounds }
+      post :create, game: { max_players_per_team: @game.max_players_per_team, max_teams_per_match: @game.max_teams_per_match, min_players_per_team: @game.min_players_per_team, min_teams_per_match: @game.min_teams_per_match, name: @game.name, parent_id: @game.parent_id, sampling_method: @game.sampling_method, scoring_method: @game.scoring_method }
     end
 
     assert_redirected_to game_path(assigns(:game))
@@ -35,7 +35,7 @@ class GamesControllerTest < ActionController::TestCase
   end
 
   test "should update game" do
-    patch :update, id: @game, game: { max_players_per_team: @game.max_players_per_team, max_teams_per_match: @game.max_teams_per_match, min_players_per_team: @game.min_players_per_team, min_teams_per_match: @game.min_teams_per_match, name: @game.name, parent_id: @game.parent_id, randomized_teams: @game.randomized_teams, sampling_method: @game.sampling_method, scoring_method: @game.scoring_method, set_rounds: @game.set_rounds }
+    patch :update, id: @game, game: { max_players_per_team: @game.max_players_per_team, max_teams_per_match: @game.max_teams_per_match, min_players_per_team: @game.min_players_per_team, min_teams_per_match: @game.min_teams_per_match, name: @game.name, parent_id: @game.parent_id, sampling_method: @game.sampling_method, scoring_method: @game.scoring_method }
     assert_redirected_to game_path(assigns(:game))
   end
 
diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb
index 0ee875a..5639150 100644
--- a/test/controllers/tournaments_controller_test.rb
+++ b/test/controllers/tournaments_controller_test.rb
@@ -18,7 +18,7 @@ class TournamentsControllerTest < ActionController::TestCase
 
   test "should create tournament" do
     assert_difference('Tournament.count') do
-      post :create, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, randomized_teams: @tournament.randomized_teams, sampling_method: @tournament.sampling_method, scoring_method: @tournament.scoring_method, set_rounds: @tournament.set_rounds, status: @tournament.status }
+      post :create, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, sampling_method: @tournament.sampling_method, scoring_method: @tournament.scoring_method, status: @tournament.status }
     end
 
     assert_redirected_to tournament_path(assigns(:tournament))
@@ -35,7 +35,7 @@ class TournamentsControllerTest < ActionController::TestCase
   end
 
   test "should update tournament" do
-    patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, randomized_teams: @tournament.randomized_teams, sampling_method: @tournament.sampling_method, scoring_method: @tournament.scoring_method, set_rounds: @tournament.set_rounds, status: @tournament.status }
+    patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, sampling_method: @tournament.sampling_method, scoring_method: @tournament.scoring_method, status: @tournament.status }
     assert_redirected_to tournament_path(assigns(:tournament))
   end
 
diff --git a/test/fixtures/games.yml b/test/fixtures/games.yml
index ac5bad8..f6d8a2e 100644
--- a/test/fixtures/games.yml
+++ b/test/fixtures/games.yml
@@ -7,8 +7,6 @@ one:
   max_players_per_team: 1
   min_teams_per_match: 1
   max_teams_per_match: 1
-  set_rounds: 1
-  randomized_teams: false
   sampling_method: MyString
   scoring_method: MyString
 
@@ -19,7 +17,5 @@ two:
   max_players_per_team: 1
   min_teams_per_match: 1
   max_teams_per_match: 1
-  set_rounds: 1
-  randomized_teams: false
   sampling_method: MyString
   scoring_method: MyString
diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml
index dd9b56d..d975b1d 100644
--- a/test/fixtures/tournaments.yml
+++ b/test/fixtures/tournaments.yml
@@ -8,8 +8,6 @@ one:
   max_players_per_team: 1
   min_teams_per_match: 1
   max_teams_per_match: 1
-  set_rounds: 1
-  randomized_teams: false
   sampling_method: MyString
   scoring_method: MyString
 
@@ -21,7 +19,5 @@ two:
   max_players_per_team: 1
   min_teams_per_match: 1
   max_teams_per_match: 1
-  set_rounds: 1
-  randomized_teams: false
   sampling_method: MyString
   scoring_method: MyString