diff options
author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-22 11:46:11 -0400 |
---|---|---|
committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-22 11:46:11 -0400 |
commit | db45b2441bd57a5e640b529ef6239c98a3030fe2 (patch) | |
tree | bcffce81e433821f6ddd9a6588b40ee1d5f84592 /test/fixtures | |
parent | 4aeaf0e41518695c3c6ba3b09025516f67b06a11 (diff) | |
parent | 474a048ae4a4fae86e7fde93745f0ea79c7ed717 (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'test/fixtures')
-rw-r--r-- | test/fixtures/games.yml | 6 | ||||
-rw-r--r-- | test/fixtures/matches.yml | 4 | ||||
-rw-r--r-- | test/fixtures/statistics.yml (renamed from test/fixtures/scores.yml) | 2 | ||||
-rw-r--r-- | test/fixtures/tournament_stages.yml | 11 | ||||
-rw-r--r-- | test/fixtures/tournaments.yml | 6 |
5 files changed, 23 insertions, 6 deletions
diff --git a/test/fixtures/games.yml b/test/fixtures/games.yml index 16f792e..af46a13 100644 --- a/test/fixtures/games.yml +++ b/test/fixtures/games.yml @@ -1,19 +1,21 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyText + name: MyString 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 + sampling_method: MyString two: - name: MyText + name: MyString 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 + sampling_method: MyString diff --git a/test/fixtures/matches.yml b/test/fixtures/matches.yml index f64a72e..ff81182 100644 --- a/test/fixtures/matches.yml +++ b/test/fixtures/matches.yml @@ -2,7 +2,7 @@ one: status: 1 - tournament_id: + tournament_stage_id: name: MyString winner_id: remote_id: MyString @@ -10,7 +10,7 @@ one: two: status: 1 - tournament_id: + tournament_stage_id: name: MyString winner_id: remote_id: MyString diff --git a/test/fixtures/scores.yml b/test/fixtures/statistics.yml index 26065df..0b5b113 100644 --- a/test/fixtures/scores.yml +++ b/test/fixtures/statistics.yml @@ -3,9 +3,11 @@ one: user_id: match_id: + name: MyString value: 1 two: user_id: match_id: + name: MyString value: 1 diff --git a/test/fixtures/tournament_stages.yml b/test/fixtures/tournament_stages.yml new file mode 100644 index 0000000..fdb263c --- /dev/null +++ b/test/fixtures/tournament_stages.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + tournament_id: + scheduling: MyString + structure: MyText + +two: + tournament_id: + scheduling: MyString + structure: MyText diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml index 89edc9f..714a963 100644 --- a/test/fixtures/tournaments.yml +++ b/test/fixtures/tournaments.yml @@ -1,23 +1,25 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString game_id: status: 1 + name: MyString 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 + sampling_method: MyString two: - name: MyString game_id: status: 1 + name: MyString 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 + sampling_method: MyString |