Download as
Browse Code »

Commit 8187e5191f699e5663f7c78f6580a0b14da14eef

Authored by Gust
1 parent d15030b9
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

Add instituition tests 

Signed-off-by: Parley Martins <parley@outlook.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Showing 2 changed files with 18 additions and 2 deletions   Show diff stats
controllers/mpog_software_plugin_controller.rb
  Diff comments   View file @8187e51
@@ -73,7 +73,7 @@ class MpogSoftwarePluginController &lt; ApplicationController @@ -73,7 +73,7 @@ class MpogSoftwarePluginController &lt; ApplicationController
73 end 73 end
74 74
75 institution = private_create_institution() 75 institution = private_create_institution()
76 - if environment.admins.include?(current_user.person) 76 + if environment.admins.include?(current_user.person) and params[:edit_institution_page] == false
77 environment.admins.each do |adm| 77 environment.admins.each do |adm|
78 institution.community.add_admin(adm) 78 institution.community.add_admin(adm)
79 end 79 end
test/functional/mpog_software_plugin_controller_test.rb
  Diff comments   View file @8187e51
@@ -9,6 +9,7 @@ class MpogSoftwarePluginControllerTest &lt; ActionController::TestCase @@ -9,6 +9,7 @@ class MpogSoftwarePluginControllerTest &lt; ActionController::TestCase
9 def setup 9 def setup
10 @admin = create_user("adminuser").person 10 @admin = create_user("adminuser").person
11 @admin.stubs(:has_permission?).returns("true") 11 @admin.stubs(:has_permission?).returns("true")
  12 + @controller.stubs(:current_user).returns(@admin.user)
12 13
13 @environment = Environment.default 14 @environment = Environment.default
14 @environment.enabled_plugins = ['MpogSoftwarePlugin'] 15 @environment.enabled_plugins = ['MpogSoftwarePlugin']
@@ -173,4 +174,19 @@ class MpogSoftwarePluginControllerTest &lt; ActionController::TestCase @@ -173,4 +174,19 @@ class MpogSoftwarePluginControllerTest &lt; ActionController::TestCase
173 assert json_response["success"] 174 assert json_response["success"]
174 end 175 end
175 176
176 -end 177 + should "add environment admins to institution when created via admin panel" do
  178 + @controller.stubs(:verify_recaptcha).returns(true)
  179 + admin2 = create_user("another_admin").person
  180 + admin2.stubs(:has_permission?).returns("true")
  181 + @environment.add_admin(admin2)
  182 + @environment.save
  183 +
  184 + fields = InstitutionTestHelper.generate_form_fields "Private Institution", "BR", "DF", "Brasilia", "12.323.557/8900-10", "PrivateInstitution"
  185 + fields[:institutions][:acronym] = "PI"
  186 + fields[:edit_institution_page] = false
  187 + post :new_institution, fields
  188 +
  189 + assert(Institution.last.community.admins.include?(admin2) )
  190 + end
  191 +
  192 +end
177 \ No newline at end of file 193 \ No newline at end of file