solved merge conflicts

3 files changed, 9 insertions, 13 deletions

diff --git a/test/controllers/servers_controller_test.rb b/test/controllers/servers_controller_test.rb
index 5891bb0..3a01d56 100644
--- a/test/controllers/servers_controller_test.rb
+++ b/test/controllers/servers_controller_test.rb
@@ -18,7 +18,7 @@ class ServersControllerTest < ActionController::TestCase
 
   test "should create server" do
     assert_difference('Server.count') do
-      post :create, server: {  }
+      post :create, server: { default_user_permissions: @server.default_user_permissions }
     end
 
     assert_redirected_to server_path(assigns(:server))
@@ -35,7 +35,7 @@ class ServersControllerTest < ActionController::TestCase
   end
 
   test "should update server" do
-    patch :update, id: @server, server: {  }
+    patch :update, id: @server, server: { default_user_permissions: @server.default_user_permissions }
     assert_redirected_to server_path(assigns(:server))
   end
 
diff --git a/test/fixtures/game_settings.yml b/test/fixtures/game_settings.yml
index 7497d02..2b574fd 100644
--- a/test/fixtures/game_settings.yml
+++ b/test/fixtures/game_settings.yml
@@ -2,7 +2,7 @@
 
 one:
   game_id: 
-  type: 1
+  stype: 1
   name: MyString
   default: MyText
   description: MyText
@@ -11,7 +11,7 @@ one:
 
 two:
   game_id: 
-  type: 1
+  stype: 1
   name: MyString
   default: MyText
   description: MyText
diff --git a/test/fixtures/servers.yml b/test/fixtures/servers.yml
index 937a0c0..3001059 100644
--- a/test/fixtures/servers.yml
+++ b/test/fixtures/servers.yml
@@ -1,11 +1,7 @@
 # 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
+one:
+  default_user_permissions: 1
+
+two:
+  default_user_permissions: 1