diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
| commit | 031b31dfcc2b99836021d6e251c78a9fc339d444 (patch) | |
| tree | 4193ce7f3cd69f60a304e7d720baf943cf09da86 /test/fixtures | |
| parent | cd6b94cfc989800d65acc0fbceeebe35da5be4af (diff) | |
| parent | 0f2b05889cba090e4824f62965ee8d131da09973 (diff) | |
Settled Merge Conflicts.
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 | 12 |
4 files changed, 15 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..25bb065 100644 --- a/test/fixtures/tournaments.yml +++ b/test/fixtures/tournaments.yml @@ -4,20 +4,12 @@ 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 + ger: MyString 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 + ger: MyString randomized_teams: false |