From 0c0b98b1d9001c40adc3b939bebe25348f14e26d Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Mon, 29 Jul 2013 10:14:48 -0300 Subject: [PATCH] rails3: fix unit tests for the Unit class --- app/models/unit.rb | 2 ++ test/unit/unit_test.rb | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/models/unit.rb b/app/models/unit.rb index a16f3f6..bb8fbf5 100644 --- a/app/models/unit.rb +++ b/app/models/unit.rb @@ -1,5 +1,7 @@ class Unit < ActiveRecord::Base + attr_accessible :name, :singular, :plural + validates_presence_of :singular validates_presence_of :plural diff --git a/test/unit/unit_test.rb b/test/unit/unit_test.rb index 4fe29a5..bdadc70 100644 --- a/test/unit/unit_test.rb +++ b/test/unit/unit_test.rb @@ -4,24 +4,30 @@ class UnitTest < ActiveSupport::TestCase should 'require singular name' do unit = Unit.new; unit.valid? - assert_match /can't be blank/, unit.errors["singular"] + assert_match /can't be blank/, unit.errors["singular"].first end should 'require plural name' do unit = Unit.new; unit.valid? - assert_match /can't be blank/, unit.errors["plural"] + assert_match /can't be blank/, unit.errors["plural"].first end should 'belongs and require an environment' do unit = Unit.new; unit.valid? - assert_match /can't be blank/, unit.errors["environment_id"] + assert_match /can't be blank/, unit.errors["environment_id"].first unit.environment = Environment.default; unit.valid? - assert_nil unit.errors["environment_id"] + assert_nil unit.errors["environment_id"].first end should 'increment position automatically' do - first = Unit.create!(:singular => 'Litre', :plural => 'Litres', :environment => Environment.default) - second = Unit.create!(:singular => 'Meter', :plural => 'Meters', :environment => Environment.default) + first = Unit.new(:singular => 'Litre', :plural => 'Litres').tap do |u| + u.environment = Environment.default + u.save! + end + second = Unit.new(:singular => 'Meter', :plural => 'Meters').tap do |u| + u.environment = Environment.default + u.save! + end assert_equal 1, first.position assert_equal 2, second.position end -- libgit2 0.21.2