diff options
author | Tomer Kimia <tkimia@purdue.edu> | 2014-04-01 18:52:51 -0400 |
---|---|---|
committer | Tomer Kimia <tkimia@purdue.edu> | 2014-04-01 18:52:51 -0400 |
commit | f3125c3087ac7d47d1698b328c76620f6a5464e8 (patch) | |
tree | 0317eb2937326d889e1b23f31dba9c756e3f4703 /test/fixtures | |
parent | aa6e8f12a24e33d88a5751cee5e93bf4a038e2ef (diff) | |
parent | e6b160bd81e51e0bd88e5c2563a06ea5f0d64620 (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'test/fixtures')
-rw-r--r-- | test/fixtures/matches.yml | 2 | ||||
-rw-r--r-- | test/fixtures/remote_usernames.yml | 11 | ||||
-rw-r--r-- | test/fixtures/tournament_preferences.yml (renamed from test/fixtures/tournament_options.yml) | 0 | ||||
-rw-r--r-- | test/fixtures/tournaments.yml | 10 |
4 files changed, 13 insertions, 10 deletions
diff --git a/test/fixtures/matches.yml b/test/fixtures/matches.yml index 00af9f5..8e86062 100644 --- a/test/fixtures/matches.yml +++ b/test/fixtures/matches.yml @@ -5,9 +5,11 @@ one: tournament_id: name: MyString winner_id: + remote_id: MyString two: status: 1 tournament_id: name: MyString winner_id: + remote_id: MyString diff --git a/test/fixtures/remote_usernames.yml b/test/fixtures/remote_usernames.yml new file mode 100644 index 0000000..baa1714 --- /dev/null +++ b/test/fixtures/remote_usernames.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + game_id: + user_id: + json_value: MyText + +two: + game_id: + user_id: + json_value: MyText diff --git a/test/fixtures/tournament_options.yml b/test/fixtures/tournament_preferences.yml index aa5eaef..aa5eaef 100644 --- a/test/fixtures/tournament_options.yml +++ b/test/fixtures/tournament_preferences.yml diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml index 89edc9f..d5a4366 100644 --- a/test/fixtures/tournaments.yml +++ b/test/fixtures/tournaments.yml @@ -4,20 +4,10 @@ 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 |