summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2014-04-06 13:18:00 -0400
committerLuke Shumaker <shumakl@purdue.edu>2014-04-06 13:18:00 -0400
commitd2e4f58410c20f5e7b9e8e0dde3fd55d201af4bb (patch)
treeb3d500e7072cb8edcae13d20a9999c65400d966b /test
parent540980e84dc22e2064ad33f79c0b526628848fa9 (diff)
run generate
Diffstat (limited to 'test')
-rw-r--r--test/controllers/servers_controller_test.rb4
-rw-r--r--test/fixtures/servers.yml14
2 files changed, 7 insertions, 11 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/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