From 28f9ab48ff03e1da6cbaa52d55f1f70cf18f7b95 Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Thu, 25 Jan 2018 10:27:36 +0100
Subject: [PATCH] #492 unit tests

---
 app/controllers/dmsf_controller.rb            |  3 --
 app/views/dmsf/add_email.js.erb               |  2 +-
 .../autocomplete_for_user.js.erb              |  4 +--
 app/views/dmsf_folder_permissions/new.js.erb  |  2 +-
 test/functional/dmsf_controller_test.rb       | 33 +++++++++++++++++++
 5 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index 8d4d6520..fb4cad3a 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -338,9 +338,6 @@ class DmsfController < ApplicationController
 
   def add_email
     @principals = users_for_new_users
-    # respond_to do |format|
-    #   format.js
-    # end
   end
 
   def append_email
diff --git a/app/views/dmsf/add_email.js.erb b/app/views/dmsf/add_email.js.erb
index 57b24026..1a8b5882 100644
--- a/app/views/dmsf/add_email.js.erb
+++ b/app/views/dmsf/add_email.js.erb
@@ -20,6 +20,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-$('#ajax-modal').html("<%= escape_javascript(render :partial => 'dmsf/add_email', :locals => { :emails => 'xxx'}) %>");
+$('#ajax-modal').html("<%= escape_javascript(render :partial => 'dmsf/add_email') %>");
 showModal('ajax-modal', '400px');
 $('#ajax-modal').addClass('new-user');
diff --git a/app/views/dmsf_folder_permissions/autocomplete_for_user.js.erb b/app/views/dmsf_folder_permissions/autocomplete_for_user.js.erb
index 25c76513..a43d2d5a 100644
--- a/app/views/dmsf_folder_permissions/autocomplete_for_user.js.erb
+++ b/app/views/dmsf_folder_permissions/autocomplete_for_user.js.erb
@@ -20,6 +20,4 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-$('#users_for_watcher').html('<%= escape_javascript(render_principals_for_new_email(@principals)) %>');
-$('#users_for_watcher').html('<%= escape_javascript(
-  render_principals_for_new_folder_permissions(@principals)) %>');
+$('#users_for_watcher').html('<%= escape_javascript(render_principals_for_new_folder_permissions(@principals)) %>');
diff --git a/app/views/dmsf_folder_permissions/new.js.erb b/app/views/dmsf_folder_permissions/new.js.erb
index 8be92ac9..f35b6b51 100644
--- a/app/views/dmsf_folder_permissions/new.js.erb
+++ b/app/views/dmsf_folder_permissions/new.js.erb
@@ -20,7 +20,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-$('#users_for_watcher').html('<%= escape_javascript(render_principals_for_new_email(@principals)) %>');
+$('#users_for_watcher').html('<%= escape_javascript(render_principals_for_new_folder_permissions(@principals)) %>');
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'dmsf_folder_permissions/new') %>');
 showModal('ajax-modal', '400px');
 $('#ajax-modal').addClass('new-user');
diff --git a/test/functional/dmsf_controller_test.rb b/test/functional/dmsf_controller_test.rb
index a9ae8f33..05671fbc 100644
--- a/test/functional/dmsf_controller_test.rb
+++ b/test/functional/dmsf_controller_test.rb
@@ -252,4 +252,37 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase
     assert_select "input:match('value', ?)", Setting.plugin_redmine_dmsf['dmsf_documents_email_links_only']
   end
 
+  def test_add_email_forbidden
+    xhr :get, :add_email, id: @project.id
+    assert_response :forbidden
+  end
+
+  def test_add_email
+    @role.add_permission! :view_dmsf_files
+    xhr :get, :add_email, id: @project.id
+    assert_response :success
+  end
+
+  def test_append_email_forbidden
+    post :append_email, :id => @project, :user_ids => @project.members.collect{ |m| m.user.id }, :format => 'js'
+    assert_response :forbidden
+  end
+
+  def test_append_email_forbidden
+    @role.add_permission! :view_dmsf_files
+    post :append_email, :id => @project, :user_ids => @project.members.collect{ |m| m.user.id }, :format => 'js'
+    assert_response :success
+  end
+
+  def test_autocomplete_for_user_forbidden
+    xhr :get, :autocomplete_for_user, id: @project.id
+    assert_response :forbidden
+  end
+
+  def test_autocomplete_for_user
+    @role.add_permission! :view_dmsf_files
+    xhr :get, :autocomplete_for_user, id: @project
+    assert_response :success
+  end
+
 end
\ No newline at end of file