summaryrefslogtreecommitdiff
path: root/test/fixtures
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2014-04-06 13:19:20 -0400
committerLuke Shumaker <shumakl@purdue.edu>2014-04-06 13:19:20 -0400
commit82840d22116835474614b80ebe72c282bcfc5f5e (patch)
treeea24c3648274c664ba014f28356ae353d049b643 /test/fixtures
parent0d42079611ed2aeacd71b926580fdc3b943cf1ba (diff)
parentd2e4f58410c20f5e7b9e8e0dde3fd55d201af4bb (diff)
Merge branch 'clean2'
Conflicts: app/views/servers/show.html.erb
Diffstat (limited to 'test/fixtures')
-rw-r--r--test/fixtures/servers.yml14
1 files changed, 5 insertions, 9 deletions
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