diff options
| author | tkimia <tkimia@purdue.edu> | 2014-04-22 01:50:36 -0400 |
|---|---|---|
| committer | tkimia <tkimia@purdue.edu> | 2014-04-22 01:50:36 -0400 |
| commit | 9c0e7d91ec76c44ca63f87b2bcd46ff16cacc38b (patch) | |
| tree | 163b6c1eb5d9b97a8836f176e7d90f209458ce04 /test/fixtures | |
| parent | d75fe3934366ea5e2581df6111c6bccdb77d1e95 (diff) | |
| parent | aa8437947b28dda73bcfaf3caccb738e5e2f48b3 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/api_requests.yml | 7 | ||||
| -rw-r--r-- | test/fixtures/game_settings.yml | 12 | ||||
| -rw-r--r-- | test/fixtures/server_settings.yml | 11 | ||||
| -rw-r--r-- | test/fixtures/tournament_settings.yml (renamed from test/fixtures/tournament_preferences.yml) | 10 |
4 files changed, 21 insertions, 19 deletions
diff --git a/test/fixtures/api_requests.yml b/test/fixtures/api_requests.yml new file mode 100644 index 0000000..8739914 --- /dev/null +++ b/test/fixtures/api_requests.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + api_name: MyString + +two: + api_name: MyString diff --git a/test/fixtures/game_settings.yml b/test/fixtures/game_settings.yml index 2b574fd..118501b 100644 --- a/test/fixtures/game_settings.yml +++ b/test/fixtures/game_settings.yml @@ -2,18 +2,18 @@ one: game_id: - stype: 1 name: MyString - default: MyText - description: MyText + vartype: 1 type_opt: MyText + description: MyText display_order: 1 + default: MyText two: game_id: - stype: 1 name: MyString - default: MyText - description: MyText + vartype: 1 type_opt: MyText + description: MyText display_order: 1 + default: MyText diff --git a/test/fixtures/server_settings.yml b/test/fixtures/server_settings.yml deleted file mode 100644 index 937a0c0..0000000 --- a/test/fixtures/server_settings.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -# 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 diff --git a/test/fixtures/tournament_preferences.yml b/test/fixtures/tournament_settings.yml index aa5eaef..6cdf24b 100644 --- a/test/fixtures/tournament_preferences.yml +++ b/test/fixtures/tournament_settings.yml @@ -2,12 +2,18 @@ one: tournament_id: - vartype: 1 name: MyString + vartype: 1 + type_opt: MyText + description: MyText + display_order: 1 value: MyText two: tournament_id: - vartype: 1 name: MyString + vartype: 1 + type_opt: MyText + description: MyText + display_order: 1 value: MyText |