Download as
Browse Code »

Commit f78b8a0587c59d7ee8886abf54e8d3317f87b1c1

Authored by Fabio Teixeira
Committed by David Silva
1 parent f5f7a6a5
Exists in master and in 5 other branches fix_search_by_software_highlight_block, r4, refactor_software_info_365, stable, update_translations

Refactory OperatingSystem 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Showing 2 changed files with 13 additions and 10 deletions   Show diff stats
lib/operating_system.rb
  Diff comments   View file @f78b8a0
@@ -4,7 +4,11 @@ class OperatingSystem &lt; ActiveRecord::Base @@ -4,7 +4,11 @@ class OperatingSystem &lt; ActiveRecord::Base
4 belongs_to :software_info 4 belongs_to :software_info
5 belongs_to :operating_system_name 5 belongs_to :operating_system_name
6 6
7 - validates_length_of :version, maximum: 20, too_long: _("Operating system is too long (maximum is 20 characters)")  
8 -  
9 - validates :version, :operating_system_name, :presence=>true  
10 -end  
11 \ No newline at end of file 7 \ No newline at end of file
  8 + validates :operating_system_name, presence: true
  9 + validates :version,
  10 + presence: true,
  11 + length: {
  12 + maximum: 20,
  13 + too_long: _('too long (maximum is 20 characters)')
  14 + }
  15 +end
test/unit/operating_system_validation_test.rb
  Diff comments   View file @f78b8a0
@@ -14,22 +14,21 @@ class OperatingSystemValidationTest &lt; ActiveSupport::TestCase @@ -14,22 +14,21 @@ class OperatingSystemValidationTest &lt; ActiveSupport::TestCase
14 end 14 end
15 15
16 should "save OperatingSystem if all fields are filled" do 16 should "save OperatingSystem if all fields are filled" do
17 - assert @operating_system.save 17 + assert_equal true, @operating_system.save
18 end 18 end
19 19
20 should "not save if OperatingSystem does not have version" do 20 should "not save if OperatingSystem does not have version" do
21 @operating_system.version = " " 21 @operating_system.version = " "
22 - assert !@operating_system.save 22 + assert_equal false, @operating_system.save
23 end 23 end
24 24
25 should "not save if OperatingSystem does not have operating_system_name" do 25 should "not save if OperatingSystem does not have operating_system_name" do
26 @operating_system.operating_system_name = nil 26 @operating_system.operating_system_name = nil
27 - assert !@operating_system.save 27 + assert_equal false, @operating_system.save
28 end 28 end
29 29
30 should "not save if OperatingSystem have a version too long" do 30 should "not save if OperatingSystem have a version too long" do
31 - @operating_system.version = "A too long version to be a valid operating system version"  
32 - assert !@operating_system.save 31 + @operating_system.version = "A too long version to be a valid"
  32 + assert_equal false, @operating_system.save
33 end 33 end
34 -  
35 end 34 end