Merge branch 'master' of https://github.com/LukeShu/leaguer

6 files changed, 23 insertions, 21 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
diff --git a/test/models/server_setting_test.rb b/test/models/api_requests_test.rb
index eee32c1..18763a7 100644
--- a/test/models/server_setting_test.rb
+++ b/test/models/api_requests_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ServerSettingTest < ActiveSupport::TestCase
+class ApiRequestsTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end
diff --git a/test/models/tournament_preference_test.rb b/test/models/tournament_setting_test.rb
index e200b8e..644df85 100644
--- a/test/models/tournament_preference_test.rb
+++ b/test/models/tournament_setting_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TournamentPreferenceTest < ActiveSupport::TestCase
+class TournamentSettingTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end