Download as
Browse Code »

Commit f78b8a0587c59d7ee8886abf54e8d3317f87b1c1

Authored by Fabio Teixeira
Committed by David Silva
1 parent f5f7a6a5
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

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