diff options
| author | shumakl <shumakl@purdue.edu> | 2014-04-03 12:32:48 -0400 |
|---|---|---|
| committer | shumakl <shumakl@purdue.edu> | 2014-04-03 12:32:48 -0400 |
| commit | 4015a27f66eafee66137bc27a76843bd48139772 (patch) | |
| tree | f2e4347606fa9bdec73ede85d562a7b891c85df2 /test/fixtures | |
| parent | 8d5325cd6019b784ba2da66d19c41daaadbc19e0 (diff) | |
| parent | 8e3e46b7951120f1ec34949d607a7672ad03f820 (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/alerts_controller.rb
app/controllers/application_controller.rb
app/controllers/matches_controller.rb
app/controllers/servers_controller.rb
app/controllers/sessions_controller.rb
app/controllers/tournaments_controller.rb
app/controllers/users_controller.rb
app/models/match.rb
app/models/team.rb
app/models/tournament.rb
app/views/sessions/_form.html.erb
app/views/sessions/index.html.erb
app/views/sessions/index.json.jbuilder
app/views/sessions/show.html.erb
app/views/sessions/show.json.jbuilder
app/views/tournaments/index.html.erb
config/routes.rb
generate.sh
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/remote_usernames.yml | 4 | ||||
| -rw-r--r-- | test/fixtures/sessions.yml | 2 | ||||
| -rw-r--r-- | test/fixtures/tournaments.yml | 10 |
3 files changed, 14 insertions, 2 deletions
diff --git a/test/fixtures/remote_usernames.yml b/test/fixtures/remote_usernames.yml index baa1714..0b3055a 100644 --- a/test/fixtures/remote_usernames.yml +++ b/test/fixtures/remote_usernames.yml @@ -3,9 +3,9 @@ one: game_id: user_id: - json_value: MyText + user_name: MyString two: game_id: user_id: - json_value: MyText + user_name: MyString diff --git a/test/fixtures/sessions.yml b/test/fixtures/sessions.yml index d9098d9..aea4379 100644 --- a/test/fixtures/sessions.yml +++ b/test/fixtures/sessions.yml @@ -2,6 +2,8 @@ one: user_id: + token: MyString two: user_id: + token: MyString diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml index d5a4366..89edc9f 100644 --- a/test/fixtures/tournaments.yml +++ b/test/fixtures/tournaments.yml @@ -4,10 +4,20 @@ one: name: MyString 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 two: name: MyString 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 |