Download as
Browse Code »

Commit 5e8e5a7e1c483472dab9875cbefe90fdf034a629

Authored by Gabriela Navarro
Committed by David Silva
1 parent 9d0e6d5d
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

Fix tests for the operating_system removal of database and language 

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Showing 7 changed files with 11 additions and 85 deletions   Show diff stats
test/unit/database_helper_test.rb
  Diff comments   View file @5e8e5a7
@@ -9,8 +9,8 @@ class DatabaseHelperTest &lt; ActiveSupport::TestCase @@ -9,8 +9,8 @@ class DatabaseHelperTest &lt; ActiveSupport::TestCase
9 dd2 = DatabaseDescription.create!(:name => "MySQL") 9 dd2 = DatabaseDescription.create!(:name => "MySQL")
10 10
11 @database_objects = [ 11 @database_objects = [
12 - {:database_description_id => dd1.id.to_s ,:version => "2.0", :operating_system => "debian"},  
13 - {:database_description_id => dd2.id.to_s ,:version => "2.1", :operating_system => "debian"} 12 + {:database_description_id => dd1.id.to_s ,:version => "2.0"},
  13 + {:database_description_id => dd2.id.to_s ,:version => "2.1"}
14 ] 14 ]
15 end 15 end
16 16
@@ -47,28 +47,10 @@ class DatabaseHelperTest &lt; ActiveSupport::TestCase @@ -47,28 +47,10 @@ class DatabaseHelperTest &lt; ActiveSupport::TestCase
47 assert_equal false,DatabaseHelper.valid_list_database?(list_compare) 47 assert_equal false,DatabaseHelper.valid_list_database?(list_compare)
48 end 48 end
49 49
50 - should "return a html text with operating system equals to linux" do  
51 - databases = []  
52 -  
53 - database_description = DatabaseDescription.new  
54 - database_description.name = "teste"  
55 -  
56 - software_database = SoftwareDatabase.new  
57 - software_database.version = 2  
58 - software_database.operating_system = "linux"  
59 - software_database.database_description = database_description  
60 -  
61 - databases << software_database  
62 - db_tables = DatabaseHelper.database_as_tables(databases)  
63 -  
64 - assert_not_nil db_tables.first.call.index("linux")  
65 - end  
66 -  
67 should "remove invalid tables from the list" do 50 should "remove invalid tables from the list" do
68 @database_objects.push({ 51 @database_objects.push({
69 :database_description_id => "I'm not a valid id", 52 :database_description_id => "I'm not a valid id",
70 - :version => "2.5",  
71 - :operating_system => "debian" 53 + :version => "2.5"
72 }) 54 })
73 55
74 database_objects_length = @database_objects.count 56 database_objects_length = @database_objects.count
test/unit/database_validation_test.rb
  Diff comments   View file @5e8e5a7
@@ -7,7 +7,6 @@ class DatabaseValidationTest &lt; ActiveSupport::TestCase @@ -7,7 +7,6 @@ class DatabaseValidationTest &lt; ActiveSupport::TestCase
7 @database = SoftwareDatabase.new 7 @database = SoftwareDatabase.new
8 @database.database_description = @database_desc 8 @database.database_description = @database_desc
9 @database.version = "MYSQL" 9 @database.version = "MYSQL"
10 - @database.operating_system = "debian"  
11 @database 10 @database
12 end 11 end
13 12
@@ -26,11 +25,6 @@ class DatabaseValidationTest &lt; ActiveSupport::TestCase @@ -26,11 +25,6 @@ class DatabaseValidationTest &lt; ActiveSupport::TestCase
26 assert_equal true, !@database.save 25 assert_equal true, !@database.save
27 end 26 end
28 27
29 - should "not save database if operating system are empty" do  
30 - @database.operating_system = " "  
31 - assert_equal true, !@database.save  
32 - end  
33 -  
34 should "not save database if version are empty" do 28 should "not save database if version are empty" do
35 @database.version = " " 29 @database.version = " "
36 assert_equal true, !@database.save 30 assert_equal true, !@database.save
@@ -40,9 +34,4 @@ class DatabaseValidationTest &lt; ActiveSupport::TestCase @@ -40,9 +34,4 @@ class DatabaseValidationTest &lt; ActiveSupport::TestCase
40 @database.version = "A too long version to be a valid version for database" 34 @database.version = "A too long version to be a valid version for database"
41 assert !@database.save 35 assert !@database.save
42 end 36 end
43 -  
44 - should "not save database if operating system is too long" do  
45 - @database.operating_system = "A too long operating system to be a valid db"  
46 - assert !@database.save  
47 - end  
48 end 37 end
test/unit/library_helper_test.rb
  Diff comments   View file @5e8e5a7
@@ -27,7 +27,7 @@ class LibraryHelperTest &lt; ActiveSupport::TestCase @@ -27,7 +27,7 @@ class LibraryHelperTest &lt; ActiveSupport::TestCase
27 end 27 end
28 28
29 should "have same information from the list passed as parameter" do 29 should "have same information from the list passed as parameter" do
30 - list_compare = LibraryHelper.list_libraries(@license_objects) 30 + list_compare = LibraryHelper.list_library(@license_objects)
31 assert_equal @license_objects.first[:name], list_compare.first.name 31 assert_equal @license_objects.first[:name], list_compare.first.name
32 end 32 end
33 33
test/unit/software_database_test.rb
  Diff comments   View file @5e8e5a7
@@ -4,8 +4,7 @@ class SoftwareDatabaseTest &lt; ActiveSupport::TestCase @@ -4,8 +4,7 @@ class SoftwareDatabaseTest &lt; ActiveSupport::TestCase
4 def setup 4 def setup
5 DatabaseDescription.create!(name: "PostgreSQL") 5 DatabaseDescription.create!(name: "PostgreSQL")
6 @software_database = SoftwareDatabase.new( 6 @software_database = SoftwareDatabase.new(
7 - :version => "1.0",  
8 - :operating_system => "Debian" 7 + :version => "1.0"
9 ) 8 )
10 @software_database.database_description_id = 1 9 @software_database.database_description_id = 1
11 end 10 end
@@ -33,15 +32,4 @@ class SoftwareDatabaseTest &lt; ActiveSupport::TestCase @@ -33,15 +32,4 @@ class SoftwareDatabaseTest &lt; ActiveSupport::TestCase
33 @software_database.version = "a"*21 32 @software_database.version = "a"*21
34 assert !@software_database.save, "Version must have until 20 characters" 33 assert !@software_database.save, "Version must have until 20 characters"
35 end 34 end
36 -  
37 - should "not save if operating system is empty" do  
38 - @software_database.operating_system = nil  
39 - assert !@software_database.save, "Operating system must be filled"  
40 - end  
41 -  
42 - should "not save if operating system has more than 20 characters" do  
43 - invalid_msg = "Operating system must have until 20 characters"  
44 - @software_database.operating_system = "a"*21  
45 - assert !@software_database.save, invalid_msg  
46 - end  
47 end 35 end
test/unit/software_info_validation_test.rb
  Diff comments   View file @5e8e5a7
@@ -12,8 +12,7 @@ class SoftwareInfoValidationTest &lt; ActiveSupport::TestCase @@ -12,8 +12,7 @@ class SoftwareInfoValidationTest &lt; ActiveSupport::TestCase
12 @language = ProgrammingLanguage.new(:name => 'C++') 12 @language = ProgrammingLanguage.new(:name => 'C++')
13 @language.save 13 @language.save
14 @software_language = SoftwareLanguage.new( 14 @software_language = SoftwareLanguage.new(
15 - :version => '1',  
16 - :operating_system => 'os' 15 + :version => '1'
17 ) 16 )
18 @software_language.programming_language = @language 17 @software_language.programming_language = @language
19 @software_language.save 18 @software_language.save
@@ -21,8 +20,7 @@ class SoftwareInfoValidationTest &lt; ActiveSupport::TestCase @@ -21,8 +20,7 @@ class SoftwareInfoValidationTest &lt; ActiveSupport::TestCase
21 @database = DatabaseDescription.new(:name => 'Oracle') 20 @database = DatabaseDescription.new(:name => 'Oracle')
22 @database.save 21 @database.save
23 @software_database = SoftwareDatabase.new( 22 @software_database = SoftwareDatabase.new(
24 - :version => '2',  
25 - :operating_system => 'os2' 23 + :version => '2'
26 ) 24 )
27 @software_database.database_description = @database 25 @software_database.database_description = @database
28 @software_database.save 26 @software_database.save
test/unit/software_language_helper_test.rb
  Diff comments   View file @5e8e5a7
@@ -9,9 +9,9 @@ class SoftwareLanguageHelperTest &lt; ActiveSupport::TestCase @@ -9,9 +9,9 @@ class SoftwareLanguageHelperTest &lt; ActiveSupport::TestCase
9 pl2 = ProgrammingLanguage.create(:name => "Java") 9 pl2 = ProgrammingLanguage.create(:name => "Java")
10 10
11 @software_language_objects = [ 11 @software_language_objects = [
12 - {:programming_language_id => pl1.id.to_s ,:version => "2.0", :operating_system => "debian"},  
13 - {:programming_language_id => pl2.id.to_s ,:version => "2.1", :operating_system => "debian"},  
14 - {:programming_language_id => pl1.id.to_s ,:version => "2.2", :operating_system => "debian"}] 12 + {:programming_language_id => pl1.id.to_s ,:version => "2.0"},
  13 + {:programming_language_id => pl2.id.to_s ,:version => "2.1"},
  14 + {:programming_language_id => pl1.id.to_s ,:version => "2.2"}]
15 @software_language_objects 15 @software_language_objects
16 end 16 end
17 17
@@ -48,27 +48,10 @@ class SoftwareLanguageHelperTest &lt; ActiveSupport::TestCase @@ -48,27 +48,10 @@ class SoftwareLanguageHelperTest &lt; ActiveSupport::TestCase
48 assert_equal false,SoftwareLanguageHelper.valid_list_language?(list_compare) 48 assert_equal false,SoftwareLanguageHelper.valid_list_language?(list_compare)
49 end 49 end
50 50
51 - should "return a html text with operating system equals to linux" do  
52 - softwares_languages = []  
53 -  
54 - programming_language = ProgrammingLanguage.new  
55 - programming_language.name = "teste"  
56 -  
57 - software_language = SoftwareLanguage.new  
58 - software_language.version = 2  
59 - software_language.operating_system = "linux"  
60 - software_language.programming_language = programming_language  
61 -  
62 - softwares_languages << software_language  
63 - lang_table = SoftwareLanguageHelper.language_as_tables(softwares_languages)  
64 - assert_not_nil lang_table.first.call.index("linux")  
65 - end  
66 -  
67 should "remove invalid tables from the list" do 51 should "remove invalid tables from the list" do
68 @software_language_objects.push({ 52 @software_language_objects.push({
69 :programming_language_id => "I'm not a valid id", 53 :programming_language_id => "I'm not a valid id",
70 - :version => "2.0",  
71 - :operating_system => "debian" 54 + :version => "2.0"
72 }) 55 })
73 56
74 software_language_objects_length = @software_language_objects.count 57 software_language_objects_length = @software_language_objects.count
test/unit/software_language_validation.rb
  Diff comments   View file @5e8e5a7
@@ -35,19 +35,6 @@ class SoftwareLanguageValidationTest &lt; ActiveSupport::TestCase @@ -35,19 +35,6 @@ class SoftwareLanguageValidationTest &lt; ActiveSupport::TestCase
35 assert_equal true, !@software_language.save 35 assert_equal true, !@software_language.save
36 end 36 end
37 37
38 - should "Don't save SoftwareLanguage if operating system is too long" do  
39 - operating_system = "A too long to be valid as a operating system"  
40 - @software_language = create_software_language  
41 - @software_language.operating_system = operating_system  
42 - assert_equal true, !@software_language.save  
43 - end  
44 -  
45 - should "Save SoftwareLanguage if operating_system is not filed" do  
46 - @software_language = create_software_language  
47 - @software_language.operating_system = ""  
48 - assert_equal false, @software_language.save  
49 - end  
50 -  
51 private 38 private
52 39
53 def create_software_language 40 def create_software_language
@@ -55,7 +42,6 @@ class SoftwareLanguageValidationTest &lt; ActiveSupport::TestCase @@ -55,7 +42,6 @@ class SoftwareLanguageValidationTest &lt; ActiveSupport::TestCase
55 software_language.software_info = @software_info 42 software_language.software_info = @software_info
56 software_language.programming_language = ProgrammingLanguage.last 43 software_language.programming_language = ProgrammingLanguage.last
57 software_language.version = "version" 44 software_language.version = "version"
58 - software_language.operating_system = "GNU/Linux"  
59 software_language 45 software_language
60 end 46 end
61 47