Download as
Browse Code »

Commit 5b3ded014807fe900be505bd602028c5da0fbdea

Authored by Fabio Teixeira
Committed by David Silva
1 parent 587d9307
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 broken unit tests 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Showing 4 changed files with 1 additions and 9 deletions   Show diff stats
test/unit/database_helper_test.rb
  Diff comments   View file @5b3ded0
@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39; @@ -2,8 +2,6 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39;
2 2
3 class DatabaseHelperTest < ActiveSupport::TestCase 3 class DatabaseHelperTest < ActiveSupport::TestCase
4 4
5 - include DatabaseHelper  
6 -  
7 def setup 5 def setup
8 dd1 = DatabaseDescription.create(:name => "Oracle") 6 dd1 = DatabaseDescription.create(:name => "Oracle")
9 dd2 = DatabaseDescription.create!(:name => "MySQL") 7 dd2 = DatabaseDescription.create!(:name => "MySQL")
test/unit/library_helper_test.rb
  Diff comments   View file @5b3ded0
@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39; @@ -2,8 +2,6 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39;
2 2
3 class LibraryHelperTest < ActiveSupport::TestCase 3 class LibraryHelperTest < ActiveSupport::TestCase
4 4
5 - include LibraryHelper  
6 -  
7 def setup 5 def setup
8 @license_objects = [ 6 @license_objects = [
9 {"name" => "license1" ,"version" => "2.0", "license" => "debian", "software_id" => "1"}, 7 {"name" => "license1" ,"version" => "2.0", "license" => "debian", "software_id" => "1"},
@@ -48,7 +46,7 @@ class LibraryHelperTest &lt; ActiveSupport::TestCase @@ -48,7 +46,7 @@ class LibraryHelperTest &lt; ActiveSupport::TestCase
48 library_description.name = "Lib" 46 library_description.name = "Lib"
49 47
50 libraries << library_description 48 libraries << library_description
51 - lib_table = LibraryHelper.library_as_tables(libraries) 49 + lib_table = LibraryHelper.libraries_as_tables(libraries)
52 50
53 assert_not_nil lib_table.first.call.index("lib") 51 assert_not_nil lib_table.first.call.index("lib")
54 end 52 end
test/unit/operating_system_helper_test.rb
  Diff comments   View file @5b3ded0
@@ -6,8 +6,6 @@ OperatingSystemName.create(:name=&gt;&quot;CentOS&quot;) @@ -6,8 +6,6 @@ OperatingSystemName.create(:name=&gt;&quot;CentOS&quot;)
6 6
7 class OperatingSystemHelperTest < ActiveSupport::TestCase 7 class OperatingSystemHelperTest < ActiveSupport::TestCase
8 8
9 - include OperatingSystemHelper  
10 -  
11 def setup 9 def setup
12 @operating_system_objects = [ 10 @operating_system_objects = [
13 {:operating_system_name_id => "1" ,:version => "2.0"}, 11 {:operating_system_name_id => "1" ,:version => "2.0"},
test/unit/software_language_helper_test.rb
  Diff comments   View file @5b3ded0
@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39; @@ -2,8 +2,6 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39;
2 2
3 class SoftwareLanguageHelperTest < ActiveSupport::TestCase 3 class SoftwareLanguageHelperTest < ActiveSupport::TestCase
4 4
5 - include SoftwareLanguageHelper  
6 -  
7 def setup 5 def setup
8 pl1 = ProgrammingLanguage.create(:name => "Python") 6 pl1 = ProgrammingLanguage.create(:name => "Python")
9 pl2 = ProgrammingLanguage.create(:name => "Java") 7 pl2 = ProgrammingLanguage.create(:name => "Java")