diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:41:29 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:41:29 -0500 |
commit | d72452a5965c0df32a13053ae86bcd529fc0fc9e (patch) | |
tree | fb03041e6cf5d8b56d308481492821af8e663028 /test/fixtures | |
parent | 50371ba04b52f74bfc2ceb05a429e072ad4848bb (diff) | |
parent | f5d36fc67d1994b7cc1ce02e7be2767ffcb47857 (diff) |
Merge branch 'master' of github.com:LukeShu/leaguer
Conflicts:
app/controllers/tournaments_controller.rb
app/models/tournament.rb
app/views/tournaments/_selected.html.erb
app/views/tournaments/new.html.erb
db/migrate/20140306024707_create_servers.rb
db/migrate/20140306024711_create_matches.rb
db/migrate/20140306024713_create_teams.rb
db/migrate/20140306024715_create_alerts.rb
db/migrate/20140306024718_create_pms.rb
db/migrate/20140306024722_create_users.rb
db/migrate/20140306024724_create_sessions.rb
db/migrate/20140306024729_create_server_settings.rb
db/migrate/20140306024731_create_user_team_pairs.rb
db/migrate/20140306024733_create_team_match_pairs.rb
db/migrate/20140306024735_create_tournament_options.rb
db/migrate/20140306024744_add_hidden_attrs_to_user.rb
db/migrate/20140306202154_create_servers.rb
db/migrate/20140306202156_create_tournaments.rb
db/migrate/20140306202158_create_matches.rb
db/migrate/20140306202200_create_teams.rb
db/migrate/20140306202202_create_alerts.rb
db/migrate/20140306202204_create_pms.rb
db/migrate/20140306202207_create_games.rb
db/migrate/20140306202209_create_users.rb
db/migrate/20140306202211_create_sessions.rb
db/migrate/20140306202213_create_game_attributes.rb
db/migrate/20140306202215_create_server_settings.rb
db/migrate/20140306202217_create_tournament_options.rb
db/migrate/20140306202219_create_user_team_pairs.rb
db/migrate/20140306202224_create_team_match_pairs.rb
db/migrate/20140306202232_add_hidden_attrs_to_user.rb
db/migrate/20140306222309_create_servers.rb
db/migrate/20140306222320_create_matches.rb
db/migrate/20140306222325_create_teams.rb
db/migrate/20140306222330_create_alerts.rb
db/migrate/20140306222336_create_pms.rb
db/migrate/20140306222347_create_users.rb
db/migrate/20140306222352_create_sessions.rb
db/migrate/20140306222357_create_server_settings.rb
db/migrate/20140306222402_create_tournament_options.rb
db/migrate/20140306222422_create_user_team_pairs.rb
db/migrate/20140306222427_create_team_match_pairs.rb
db/migrate/20140306222447_add_hidden_attrs_to_user.rb
db/schema.rb
generate.sh
Diffstat (limited to 'test/fixtures')
-rw-r--r-- | test/fixtures/game_options.yml | 11 | ||||
-rw-r--r-- | test/fixtures/games.yml | 16 | ||||
-rw-r--r-- | test/fixtures/scores.yml (renamed from test/fixtures/game_attributes.yml) | 12 | ||||
-rw-r--r-- | test/fixtures/teams.yml | 14 | ||||
-rw-r--r-- | test/fixtures/tournament_options.yml | 20 | ||||
-rw-r--r-- | test/fixtures/tournament_user_pairs.yml | 9 | ||||
-rw-r--r-- | test/fixtures/tournaments.yml | 14 |
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 |