From 8187e5191f699e5663f7c78f6580a0b14da14eef Mon Sep 17 00:00:00 2001 From: Gust Date: Tue, 11 Nov 2014 11:34:56 -0200 Subject: [PATCH] Add instituition tests --- controllers/mpog_software_plugin_controller.rb | 2 +- test/functional/mpog_software_plugin_controller_test.rb | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/controllers/mpog_software_plugin_controller.rb b/controllers/mpog_software_plugin_controller.rb index f42d670..7bd24b3 100644 --- a/controllers/mpog_software_plugin_controller.rb +++ b/controllers/mpog_software_plugin_controller.rb @@ -73,7 +73,7 @@ class MpogSoftwarePluginController < ApplicationController end institution = private_create_institution() - if environment.admins.include?(current_user.person) + if environment.admins.include?(current_user.person) and params[:edit_institution_page] == false environment.admins.each do |adm| institution.community.add_admin(adm) end diff --git a/test/functional/mpog_software_plugin_controller_test.rb b/test/functional/mpog_software_plugin_controller_test.rb index 4626350..186e89a 100644 --- a/test/functional/mpog_software_plugin_controller_test.rb +++ b/test/functional/mpog_software_plugin_controller_test.rb @@ -9,6 +9,7 @@ class MpogSoftwarePluginControllerTest < ActionController::TestCase def setup @admin = create_user("adminuser").person @admin.stubs(:has_permission?).returns("true") + @controller.stubs(:current_user).returns(@admin.user) @environment = Environment.default @environment.enabled_plugins = ['MpogSoftwarePlugin'] @@ -173,4 +174,19 @@ class MpogSoftwarePluginControllerTest < ActionController::TestCase assert json_response["success"] end -end + should "add environment admins to institution when created via admin panel" do + @controller.stubs(:verify_recaptcha).returns(true) + admin2 = create_user("another_admin").person + admin2.stubs(:has_permission?).returns("true") + @environment.add_admin(admin2) + @environment.save + + fields = InstitutionTestHelper.generate_form_fields "Private Institution", "BR", "DF", "Brasilia", "12.323.557/8900-10", "PrivateInstitution" + fields[:institutions][:acronym] = "PI" + fields[:edit_institution_page] = false + post :new_institution, fields + + assert(Institution.last.community.admins.include?(admin2) ) + end + +end \ No newline at end of file -- libgit2 0.21.2