From adf06a74910ad2fa4f741ede35f7328534b46618 Mon Sep 17 00:00:00 2001
From: Mateus Rambo Strey <mars11@inf.ufpr.br>
Date: Fri, 11 Mar 2016 09:08:11 -0300
Subject: [PATCH] fix object_type validation
---
app/models/object_type.rb | 3 ++-
test/fixtures/management/object_types.yml | 11 -----------
test/models/management/object_type_test.rb | 7 -------
test/models/object_type_test.rb | 8 ++++++++
4 files changed, 10 insertions(+), 19 deletions(-)
delete mode 100644 test/fixtures/management/object_types.yml
delete mode 100644 test/models/management/object_type_test.rb
create mode 100644 test/models/object_type_test.rb
diff --git a/app/models/object_type.rb b/app/models/object_type.rb
index 5b3513a6..7bc5dd42 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 937a0c00..00000000
--- 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 cd4652ff..00000000
--- 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 00000000..1c38bb21
--- /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
--
GitLab