summaryrefslogtreecommitdiff
path: root/test/fixtures
diff options
context:
space:
mode:
authorguntasgrewal <guntasgrewal@gmail.com>2014-03-25 16:13:19 -0400
committerguntasgrewal <guntasgrewal@gmail.com>2014-03-25 16:13:19 -0400
commit4d58cc07933fd0a0756c667b38f2e0658302aebf (patch)
treecf7eb70072b35a1eb1a88fbc3c1efcc619001d9d /test/fixtures
parent2f60c447146fd7b6c1604388194b918b8ae3a7b4 (diff)
parentecef4973baed5580e3b2500ce0a65def1132d172 (diff)
Merge branch 'clean'
Diffstat (limited to 'test/fixtures')
-rw-r--r--test/fixtures/game_settings.yml (renamed from test/fixtures/game_options.yml)12
1 files changed, 10 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