Download as
Browse Code »

Commit db6b43ef48539509db0095b7af252a1e4baadd98

Authored by Fabio Teixeira
Committed by David Silva
1 parent 5b3ded01
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 functional tests 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Showing 2 changed files with 15 additions and 13 deletions   Show diff stats
lib/mpog_software_plugin.rb
  Diff comments   View file @db6b43e
... ... @@ -143,7 +143,6 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
143 143 !context.session[:hide_incomplete_percentage].blank?
144 144  
145 145 person = Person.where(:user_id => context.session[:user]).first
146   - puts "="*80,person,"="*80
147 146 call_percentage_profile_template(person)
148 147 end
149 148  
... ... @@ -283,7 +282,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
283 282 end
284 283 end
285 284  
286   - manage_user_institutions(user, leave_communities, enter_communities)
  285 + manage_user_institutions(user, old_communities, new_communities)
287 286 end
288 287  
289 288 def show_sisp_field
... ... @@ -362,7 +361,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
362 361 }
363 362 end
364 363  
365   - def manage_user_institutions(leave_communities, enter_communities)
  364 + def manage_user_institutions(user, old_communities, new_communities)
366 365 leave_communities = (old_communities - new_communities)
367 366 enter_communities = (new_communities - old_communities)
368 367  
... ...
test/functional/profile_editor_controller_test.rb
  Diff comments   View file @db6b43e
... ... @@ -60,11 +60,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
60 60 end
61 61  
62 62 should "add new institution for user into edit profile" do
63   - user = fast_create(User)
64   - user.person = fast_create(Person)
65   - user.person.user = user
66   - user.save!
67   - user.person.save!
  63 + user = create_basic_user
68 64  
69 65 params_user = Hash.new
70 66 params_user[:institution_ids] = []
... ... @@ -79,16 +75,12 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
79 75 end
80 76  
81 77 should "remove institutions for user into edit profile" do
82   - user = fast_create(User)
83   - user.person = fast_create(Person)
  78 + user = create_basic_user
84 79  
85 80 @institution_list.each do |institution|
86 81 user.institutions << institution
87 82 end
88   -
89   - user.person.user = user
90 83 user.save!
91   - user.person.save!
92 84  
93 85 params_user = Hash.new
94 86 params_user[:institution_ids] = []
... ... @@ -99,4 +91,15 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
99 91  
100 92 assert_equal 0, User.last.institutions.count
101 93 end
  94 +
  95 + protected
  96 +
  97 + def create_basic_user
  98 + user = fast_create(User)
  99 + user.person = fast_create(Person)
  100 + user.person.user = user
  101 + user.save!
  102 + user.person.save!
  103 + user
  104 + end
102 105 end
... ...