diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:56:06 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:56:06 -0400 |
| commit | 45c5d311492ef98ed702beaf043d289a705a5e0b (patch) | |
| tree | c0bea2e65d21127a1fd34a245b5bb7fc47123bb0 /test/fixtures | |
| parent | 9d226fcd27b6c2470edf718ad36a262348891470 (diff) | |
| parent | c927cd7c043d982f8ffb51c8a78288d88d825d82 (diff) | |
Merge branch 'clean2'
Conflicts:
app/models/team.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/matches.yml | 6 | ||||
| -rw-r--r-- | test/fixtures/teams.yml | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/test/fixtures/matches.yml b/test/fixtures/matches.yml index ff81182..4213238 100644 --- a/test/fixtures/matches.yml +++ b/test/fixtures/matches.yml @@ -3,15 +3,13 @@ one: status: 1 tournament_stage_id: - name: MyString winner_id: - remote_id: MyString + remote_id: MyText submitted_peer_evaluations: 1 two: status: 1 tournament_stage_id: - name: MyString winner_id: - remote_id: MyString + remote_id: MyText submitted_peer_evaluations: 1 diff --git a/test/fixtures/teams.yml b/test/fixtures/teams.yml index 4efc76e..937a0c0 100644 --- a/test/fixtures/teams.yml +++ b/test/fixtures/teams.yml @@ -1,7 +1,11 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - match_id: - -two: - match_id: +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value |