Merge branch 'master' of http://github.com/LukeShu/leaguer

Conflicts:
	app/controllers/sessions_controller.rb
	app/views/sessions/new.html.erb

7 files changed, 66 insertions, 30 deletions

diff --git a/test/fixtures/game_options.yml b/test/fixtures/game_options.yml
new file mode 100644
index 0000000..eb4760a
--- /dev/null
+++ b/test/fixtures/game_options.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  vartype: 1
+  name: MyString
+  default: MyText
+
+two:
+  vartype: 1
+  name: MyString
+  default: MyText
diff --git a/test/fixtures/games.yml b/test/fixtures/games.yml
index 3068527..16f792e 100644
--- a/test/fixtures/games.yml
+++ b/test/fixtures/games.yml
@@ -2,14 +2,18 @@
 
 one:
   name: MyText
-  players_per_team: 1
-  teams_per_match: 1
+  min_players_per_team: 1
+  max_players_per_team: 1
+  min_teams_per_match: 1
+  max_teams_per_match: 1
   set_rounds: 1
-  randomized_teams: 1
+  randomized_teams: false
 
 two:
   name: MyText
-  players_per_team: 1
-  teams_per_match: 1
+  min_players_per_team: 1
+  max_players_per_team: 1
+  min_teams_per_match: 1
+  max_teams_per_match: 1
   set_rounds: 1
-  randomized_teams: 1
+  randomized_teams: false
diff --git a/test/fixtures/game_attributes.yml b/test/fixtures/scores.yml
index eff7212..26065df 100644
--- a/test/fixtures/game_attributes.yml
+++ b/test/fixtures/scores.yml
@@ -1,11 +1,11 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
-  game_id: 
-  key: MyText
-  type: 1
+  user_id: 
+  match_id: 
+  value: 1
 
 two:
-  game_id: 
-  key: MyText
-  type: 1
+  user_id: 
+  match_id: 
+  value: 1
diff --git a/test/fixtures/teams.yml b/test/fixtures/teams.yml
index 937a0c0..4efc76e 100644
--- a/test/fixtures/teams.yml
+++ b/test/fixtures/teams.yml
@@ -1,11 +1,7 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
-# This model initially had no columns defined.  If you add columns to the
-# model remove the '{}' from the fixture names and add the columns immediately
-# below each fixture, per the syntax in the comments below
-#
-one: {}
-# column: value
-#
-two: {}
-#  column: value
+one:
+  match_id: 
+
+two:
+  match_id: 
diff --git a/test/fixtures/tournament_options.yml b/test/fixtures/tournament_options.yml
index 937a0c0..aa5eaef 100644
--- a/test/fixtures/tournament_options.yml
+++ b/test/fixtures/tournament_options.yml
@@ -1,11 +1,13 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
-# This model initially had no columns defined.  If you add columns to the
-# model remove the '{}' from the fixture names and add the columns immediately
-# below each fixture, per the syntax in the comments below
-#
-one: {}
-# column: value
-#
-two: {}
-#  column: value
+one:
+  tournament_id: 
+  vartype: 1
+  name: MyString
+  value: MyText
+
+two:
+  tournament_id: 
+  vartype: 1
+  name: MyString
+  value: MyText
diff --git a/test/fixtures/tournament_user_pairs.yml b/test/fixtures/tournament_user_pairs.yml
new file mode 100644
index 0000000..dbc4a88
--- /dev/null
+++ b/test/fixtures/tournament_user_pairs.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  tournament_id: 
+  user_id: 
+
+two:
+  tournament_id: 
+  user_id: 
diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml
index 4cba7ca..c58a1ed 100644
--- a/test/fixtures/tournaments.yml
+++ b/test/fixtures/tournaments.yml
@@ -2,6 +2,20 @@
 
 one:
   game_id: 
+  min_players_per_team: 1
+  max_players_per_team: 1
+  min_teams_per_match: 1
+  max_teams_per_match: 1
+  set_rounds: 1
+  randomized_teams: false
+  status: 1
 
 two:
   game_id: 
+  min_players_per_team: 1
+  max_players_per_team: 1
+  min_teams_per_match: 1
+  max_teams_per_match: 1
+  set_rounds: 1
+  randomized_teams: false
+  status: 1