diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-03-06 22:34:08 -0500 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-03-06 22:34:08 -0500 |
| commit | 3ce5876375cbb3057ffc96e2886ba57cbd875dc9 (patch) | |
| tree | e59dc46b293cdcd4ad8ad5b33bd4703f65adb0d9 /test/fixtures | |
| parent | ce8b05ed8fa3466c727269daa47ba7df672fdca1 (diff) | |
| parent | 70bae69d731afc5300ffa5b176732ebe27d0810f (diff) | |
Fixed some merge errors in show.html.erb
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: |