diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-27 16:59:11 -0400 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-27 16:59:11 -0400 |
| commit | a683a208e31d5bafe7658521921f9f2c1a637418 (patch) | |
| tree | abf23ef14f584583973796b3da573c5061eb8533 /test/fixtures | |
| parent | aeda550c2ad04c9496a803b1d7f1d34a4566a9fe (diff) | |
| parent | d8acc6785ee41a2628cd0d59d91916b2f087290b (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/views/tournaments/show.html.erb
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/game_settings.yml (renamed from test/fixtures/game_options.yml) | 12 | ||||
| -rw-r--r-- | test/fixtures/matches.yml | 2 | ||||
| -rw-r--r-- | test/fixtures/tournaments.yml | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/test/fixtures/game_options.yml b/test/fixtures/game_settings.yml index eb4760a..5626c97 100644 --- a/test/fixtures/game_options.yml +++ b/test/fixtures/game_settings.yml @@ -1,11 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - vartype: 1 + game_id: + type: 1 name: MyString default: MyText + discription: MyText + type_opt: MyText + display_order: 1 two: - vartype: 1 + game_id: + type: 1 name: MyString default: MyText + discription: MyText + type_opt: MyText + display_order: 1 diff --git a/test/fixtures/matches.yml b/test/fixtures/matches.yml index 956229c..00af9f5 100644 --- a/test/fixtures/matches.yml +++ b/test/fixtures/matches.yml @@ -1,11 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: + status: 1 tournament_id: name: MyString winner_id: two: + status: 1 tournament_id: name: MyString winner_id: diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml index 27c92f9..89edc9f 100644 --- a/test/fixtures/tournaments.yml +++ b/test/fixtures/tournaments.yml @@ -1,6 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: + name: MyString game_id: status: 1 min_players_per_team: 1 @@ -11,6 +12,7 @@ one: randomized_teams: false two: + name: MyString game_id: status: 1 min_players_per_team: 1 |