diff options
author | nfoy <nfoy@purdue.edu> | 2014-04-03 16:15:46 -0400 |
---|---|---|
committer | nfoy <nfoy@purdue.edu> | 2014-04-03 16:15:46 -0400 |
commit | 5169363d6698fb87372efcb7ace552b89953584e (patch) | |
tree | ff42d819be510dfe929b4cd9dbc1cd25f51c9785 /test/fixtures | |
parent | 2b79a033262dfe610eb22b7f6b3614db9cb134b1 (diff) | |
parent | 9f19d0e16d7920e07255c0fbe596c518d1aa415f (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'test/fixtures')
-rw-r--r-- | test/fixtures/remote_usernames.yml | 4 | ||||
-rw-r--r-- | test/fixtures/sessions.yml | 2 | ||||
-rw-r--r-- | test/fixtures/tournaments.yml | 10 |
3 files changed, 14 insertions, 2 deletions
diff --git a/test/fixtures/remote_usernames.yml b/test/fixtures/remote_usernames.yml index baa1714..0b3055a 100644 --- a/test/fixtures/remote_usernames.yml +++ b/test/fixtures/remote_usernames.yml @@ -3,9 +3,9 @@ one: game_id: user_id: - json_value: MyText + user_name: MyString two: game_id: user_id: - json_value: MyText + user_name: MyString diff --git a/test/fixtures/sessions.yml b/test/fixtures/sessions.yml index d9098d9..aea4379 100644 --- a/test/fixtures/sessions.yml +++ b/test/fixtures/sessions.yml @@ -2,6 +2,8 @@ one: user_id: + token: MyString two: user_id: + token: MyString diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml index d5a4366..89edc9f 100644 --- a/test/fixtures/tournaments.yml +++ b/test/fixtures/tournaments.yml @@ -4,10 +4,20 @@ one: name: MyString game_id: status: 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: false two: name: MyString game_id: status: 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: false |