Merge branch 'clean'

2 files changed, 11 insertions, 3 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
diff --git a/test/models/game_option_test.rb b/test/models/game_setting_test.rb
index 1ae5701..8ab8bcf 100644
--- a/test/models/game_option_test.rb
+++ b/test/models/game_setting_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class GameOptionTest < ActiveSupport::TestCase
+class GameSettingTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end