diff --git a/app/models/object_type.rb b/app/models/object_type.rb index 5b3513a6562e61e5b9f89a42d04e60a1f89360ae..7bc5dd427a3bb29093f4a457bb820008263b45c3 100644 --- a/app/models/object_type.rb +++ b/app/models/object_type.rb @@ -1,5 +1,6 @@ class ObjectType < ActiveRecord::Base has_many :learning_objects - validates :name, presence: true + validates_presence_of :name + validates_uniqueness_of :name end diff --git a/test/fixtures/management/object_types.yml b/test/fixtures/management/object_types.yml deleted file mode 100644 index 937a0c002e426861e33bb25a2a8ce2b20b3efaa3..0000000000000000000000000000000000000000 --- a/test/fixtures/management/object_types.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/models/management/object_type_test.rb b/test/models/management/object_type_test.rb deleted file mode 100644 index cd4652fff674c01a8b909171b078a001d714b032..0000000000000000000000000000000000000000 --- a/test/models/management/object_type_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class Management::ObjectTypeTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/models/object_type_test.rb b/test/models/object_type_test.rb new file mode 100644 index 0000000000000000000000000000000000000000..1c38bb21727897fbf05d25280016f1d6a8bd3047 --- /dev/null +++ b/test/models/object_type_test.rb @@ -0,0 +1,8 @@ +require 'test_helper' + +class ObjectTypeTest < ActiveSupport::TestCase + should have_many :learning_objects + + should validate_presence_of(:name) + should validate_uniqueness_of(:name) +end