From c3d46241a2298ecec052332c1767a65b010cf9a1 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Mon, 21 Apr 2014 10:33:46 -0400
Subject: run ./generate.sh

---
 test/fixtures/game_settings.yml       | 12 ++++++------
 test/fixtures/server_settings.yml     | 11 -----------
 test/fixtures/tournament_settings.yml | 10 ++++++++--
 test/models/server_setting_test.rb    |  7 -------
 4 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 test/fixtures/server_settings.yml
 delete mode 100644 test/models/server_setting_test.rb

(limited to 'test')

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_settings.yml b/test/fixtures/tournament_settings.yml
index aa5eaef..6cdf24b 100644
--- a/test/fixtures/tournament_settings.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
diff --git a/test/models/server_setting_test.rb b/test/models/server_setting_test.rb
deleted file mode 100644
index eee32c1..0000000
--- a/test/models/server_setting_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class ServerSettingTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
-- 
cgit v1.2.3