diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-26 20:27:09 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-26 20:27:09 -0400 |
| commit | 0776c57b939208736db60d38b4530e8b1c306ec6 (patch) | |
| tree | 6a831d94039c9c86175b73af0aab525e6bd78983 /test/fixtures | |
| parent | 853c307700fa81b924e00bf430c878a3b7029ffe (diff) | |
| parent | 62219ac4e3af36cc15c9ad61701550bee9a8424c (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/tournaments_controller.rb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/games.yml | 2 | ||||
| -rw-r--r-- | test/fixtures/tournament_stages.yml | 6 | ||||
| -rw-r--r-- | test/fixtures/tournaments.yml | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/test/fixtures/games.yml b/test/fixtures/games.yml index b811dec..ac5bad8 100644 --- a/test/fixtures/games.yml +++ b/test/fixtures/games.yml @@ -10,6 +10,7 @@ one: set_rounds: 1 randomized_teams: false sampling_method: MyString + scoring_method: MyString two: parent_id: @@ -21,3 +22,4 @@ two: set_rounds: 1 randomized_teams: false sampling_method: MyString + scoring_method: MyString diff --git a/test/fixtures/tournament_stages.yml b/test/fixtures/tournament_stages.yml index fdb263c..32eaba3 100644 --- a/test/fixtures/tournament_stages.yml +++ b/test/fixtures/tournament_stages.yml @@ -2,10 +2,12 @@ one: tournament_id: - scheduling: MyString structure: MyText + scheduling_method: MyString + seeding_method: MyString two: tournament_id: - scheduling: MyString structure: MyText + scheduling_method: MyString + seeding_method: MyString diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml index 714a963..dd9b56d 100644 --- a/test/fixtures/tournaments.yml +++ b/test/fixtures/tournaments.yml @@ -11,6 +11,7 @@ one: set_rounds: 1 randomized_teams: false sampling_method: MyString + scoring_method: MyString two: game_id: @@ -23,3 +24,4 @@ two: set_rounds: 1 randomized_teams: false sampling_method: MyString + scoring_method: MyString |