summaryrefslogtreecommitdiff
path: root/test/controllers
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-04-06 22:20:28 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-04-06 22:20:28 -0400
commitbf798e57a760b68c3c7460789cef6389141c067d (patch)
tree16cd7400b7f289b4aa6ec90e253c4d30d7a1a08c /test/controllers
parent91fee659eadaf6bcc4d063fd5645950da1250896 (diff)
parent628173fce3de8f5d3e31109b3aa7c964fdab38ca (diff)
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'test/controllers')
-rw-r--r--test/controllers/servers_controller_test.rb4
1 files changed, 2 insertions, 2 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