diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 22:21:39 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 22:21:39 -0500 |
| commit | e7562550fdaff859b0ead5a37e58c5f2b920ca80 (patch) | |
| tree | b68d699bf397b7167a8713d789770b7ca59bdb16 /test/fixtures | |
| parent | 4b672af0e7893a9db1c059c97b06afeafb9c742c (diff) | |
| parent | 5f2247dd1e701a91fb0359bf7265bdadd5486a60 (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/team_match_pairs.yml | 9 | ||||
| -rw-r--r-- | test/fixtures/tournament_user_pairs.yml | 9 | ||||
| -rw-r--r-- | test/fixtures/tournaments.yml | 4 | ||||
| -rw-r--r-- | test/fixtures/user_team_pairs.yml | 9 | ||||
| -rw-r--r-- | test/fixtures/user_tournament_pairs.yml | 9 |
5 files changed, 2 insertions, 38 deletions
diff --git a/test/fixtures/team_match_pairs.yml b/test/fixtures/team_match_pairs.yml deleted file mode 100644 index 5f9cf2f..0000000 --- a/test/fixtures/team_match_pairs.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - team_id: - match_id: - -two: - team_id: - match_id: diff --git a/test/fixtures/tournament_user_pairs.yml b/test/fixtures/tournament_user_pairs.yml deleted file mode 100644 index dbc4a88..0000000 --- a/test/fixtures/tournament_user_pairs.yml +++ /dev/null @@ -1,9 +0,0 @@ -# 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 c58a1ed..27c92f9 100644 --- a/test/fixtures/tournaments.yml +++ b/test/fixtures/tournaments.yml @@ -2,20 +2,20 @@ one: 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 - status: 1 two: 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 - status: 1 diff --git a/test/fixtures/user_team_pairs.yml b/test/fixtures/user_team_pairs.yml deleted file mode 100644 index a76036f..0000000 --- a/test/fixtures/user_team_pairs.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - user_id: - team_id: - -two: - user_id: - team_id: diff --git a/test/fixtures/user_tournament_pairs.yml b/test/fixtures/user_tournament_pairs.yml deleted file mode 100644 index 974ee71..0000000 --- a/test/fixtures/user_tournament_pairs.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - user_id: - tournament_id: - -two: - user_id: - tournament_id: |