redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #653 from carlolars/webdav_move_test

Browse Source 
Webdav move test
This commit is contained in:
Karel Picman 2017-02-10 07:57:31 +01:00 committed by GitHub
commit e56f77b9ac
8 changed files with 367 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/dmsf_file.rb
View File

@ -242,12 +242,13 @@ class DmsfFile < ActiveRecord::Base
projects
end
def move_to(project, folder)
def move_to(container, folder)
if self.locked_for_user?
errors[:base] << l(:error_file_is_locked)
return false
end
project = container.is_a?(Project) ? container : container.project
# If the target project differs from the source project we must physically move the disk files
if self.project != project
self.dmsf_file_revisions.all.each do |rev|
@ -257,7 +258,8 @@ class DmsfFile < ActiveRecord::Base
end
end
self.project = project
self.container_type = self.container_type
self.container_id = container.id
self.dmsf_folder = folder
new_revision = self.last_revision.clone
new_revision.dmsf_file = self
@ -274,6 +276,10 @@ class DmsfFile < ActiveRecord::Base
end
def copy_to(container, folder = nil)
copy_to_filename(container, folder, self.name)
end
def copy_to_filename(container, folder=nil, filename)
project = container.is_a?(Project) ? container : container.project
# If the target project differs from the source project we must physically move the disk files
if (self.project != project) && self.last_revision
@ -285,7 +291,7 @@ class DmsfFile < ActiveRecord::Base
file.dmsf_folder = folder
file.container_type = self.container_type
file.container_id = container.id
file.name = self.name
file.name = filename
file.notification = Setting.plugin_redmine_dmsf['dmsf_default_notifications'].present?
if file.save && self.last_revision
new_revision = self.last_revision.clone

1
lib/redmine_dmsf/webdav/controller.rb
View File

@ -188,7 +188,6 @@ module RedmineDmsf
status
end
end
true
end
end

10
lib/redmine_dmsf/webdav/dmsf_resource.rb
View File

@ -333,9 +333,15 @@ module RedmineDmsf
if (project == resource.project) && resource.basename.match(/.\.tmp$/i)
Rails.logger.info "WebDAV MOVE: #{file.name} -> #{resource.basename}, possible MSOffice rename to .tmp when saving."
# Renaming the file to X.tmp, might be Office that is saving a file. Keep the original file.
return InternalServerError unless file.copy_to(resource.project, f)
file.copy_to_filename(resource.project, f, resource.basename)
Created
else
return InternalServerError unless file.move_to(resource.project, f)
if (project == resource.project) && (file.last_revision.size == 0)
# Moving a zero sized file within the same project, just update the dmsf_folder
file.dmsf_folder = f
else
return InternalServerError unless file.move_to(resource.project, f)
end
# Update Revision and names of file [We can link to old physical resource, as it's not changed]
if file.last_revision

22
test/fixtures/dmsf_file_revisions.yml vendored
View File

@ -139,4 +139,24 @@ dmsf_file_revisions_007:
deleted_by_user_id: NULL
user_id: 1
dmsf_workflow_assigned_by: NULL
dmsf_workflow_started_by: NULL
dmsf_workflow_started_by: NULL
dmsf_file_revisions_008:
id: 8
dmsf_file_id: 10
source_dmsf_file_revision_id: NULL
name: "zero.txt"
disk_filename: "zero.txt"
size: 0
mime_type: text/plain
title: "Zero Size File"
description: NULL
workflow: NULL
minor_version: 0
major_version: 1
comment: NULL
deleted: 0
deleted_by_user_id: NULL
user_id: 1
dmsf_workflow_assigned_by: NULL
dmsf_workflow_started_by: NULL

22
test/fixtures/dmsf_files.yml vendored
View File

@ -79,4 +79,24 @@ dmsf_files_008:
name: "test.pdf"
notification: 0
deleted: 0
deleted_by_user_id: NULL
deleted_by_user_id: NULL
dmsf_files_009:
id: 9
container_id: 1
container_type: "Project"
dmsf_folder_id: NULL
name: "myfile.txt"
notification: 0
deleted: 0
deleted_by_user_id: NULL
dmsf_files_010:
id: 10
container_id: 1
container_type: "Project"
dmsf_folder_id: NULL
name: "zero.txt"
notification: 0
deleted: 0
deleted_by_user_id: NULL

281
test/integration/webdav/dmsf_webdav_move_test.rb Normal file
View File

@ -0,0 +1,281 @@
# encoding: utf-8
#
# Redmine plugin for Document Management System "Features"
#
# Copyright (C) 2012 Daniel Munn <dan.munn@munnster.co.uk>
# Copyright (C) 2011-17 Karel Picman <karel.picman@kontron.com>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require File.expand_path('../../../test_helper', __FILE__)
require 'fileutils'
class DmsfWebdavMoveTest < RedmineDmsf::Test::IntegrationTest
fixtures :projects, :users, :email_addresses, :members, :member_roles, :roles,
:enabled_modules, :dmsf_folders, :dmsf_files, :dmsf_file_revisions
def setup
DmsfLock.delete_all # Delete all locks that are in our test DB - probably not safe but ho hum
timestamp = DateTime.now.strftime("%y%m%d%H%M")
DmsfFile.storage_path = File.expand_path("./dmsf_test-#{timestamp}", DmsfHelper.temp_dir)
Dir.mkdir(DmsfFile.storage_path) unless File.directory?(DmsfFile.storage_path)
# Copy the physical files to the temporary storage
FileUtils.cp_r File.dirname(__FILE__) + "/../../fixtures/files/.", DmsfFile.storage_path
@admin = credentials 'admin'
@jsmith = credentials 'jsmith'
@project1 = Project.find_by_id 1
# Fix permissions for jsmith's role
@role = Role.find 1 #
@role.add_permission! :view_dmsf_folders
@role.add_permission! :folder_manipulation
Setting.plugin_redmine_dmsf['dmsf_webdav'] = '1'
Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = 'WEBDAV_READ_WRITE'
super
end
def teardown
# Delete our tmp folder
begin
FileUtils.rm_rf DmsfFile.storage_path
rescue Exception => e
error e.message
end
end
def test_truth
assert_kind_of Project, @project1
assert_kind_of Role, @role
end
def test_move_denied_for_anonymous
file = DmsfFile.find_by_id 1
new_name = "#{file.name}.moved"
assert_no_difference 'file.dmsf_file_revisions.count' do
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{file.name}", nil,
{:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"}
assert_response 401
end
end
def test_move_to_new_filename_without_folder_manipulation_permission
@role.remove_permission! :folder_manipulation
file = DmsfFile.find_by_id 1
new_name = "#{file.name}.moved"
assert_no_difference 'file.dmsf_file_revisions.count' do
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{file.name}", nil,
@jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
assert_response 403
end
end
def test_move_to_new_filename_without_folder_manipulation_permission_as_admin
@role.remove_permission! :folder_manipulation
file = DmsfFile.find_by_id 1
new_name = "#{file.name}.moved"
assert_difference 'file.dmsf_file_revisions.count', +1 do
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{file.name}", nil,
@admin.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
assert_response 201 # Created
f = DmsfFile.find_file_by_name @project1, nil, "#{new_name}"
assert f, "Moved file '#{new_name}' not found in project."
end
end
def test_move_non_existent_file
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/not_a_file.txt", nil,
@jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/moved_file.txt"})
assert_response 404 # NotFound
end
def test_move_wrong_destination
file = DmsfFile.find_by_id 1
new_name = "#{file.name}.moved"
assert_no_difference 'file.dmsf_file_revisions.count' do
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{file.name}", nil,
@jsmith.merge!({:destination => "http://www.wrong-url.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
assert_response 502 # BadGateway
end
end
def test_move_to_new_filename
file = DmsfFile.find_by_id 1
new_name = "#{file.name}.moved"
assert_difference 'file.dmsf_file_revisions.count', +1 do
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{file.name}", nil,
@jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
assert_response 201 # Created
f = DmsfFile.find_file_by_name @project1, nil, "#{new_name}"
assert f, "Moved file '#{new_name}' not found in project."
end
end
def test_move_zero_sized_to_new_filename
file = DmsfFile.find_by_id 10
new_name = "#{file.name}.moved"
assert_no_difference 'file.dmsf_file_revisions.count' do
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{file.name}", nil,
@jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
assert_response 201 # Created
f = DmsfFile.find_file_by_name @project1, nil, "#{new_name}"
assert f, "Moved file '#{new_name}' not found in project."
end
end
def test_move_to_new_folder
file = DmsfFile.find_by_id 1
folder = DmsfFolder.find_by_id 1
assert_kind_of DmsfFile, file
assert_kind_of DmsfFolder, folder
assert_difference 'file.dmsf_file_revisions.count', +1 do
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{file.name}", nil,
@jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{folder.title}/#{file.name}"})
assert_response 201 # Created
file2 = DmsfFile.find_by_id 1
assert_equal folder.id, file2.dmsf_folder_id
end
end
def test_move_zero_sized_to_new_folder
file = DmsfFile.find_by_id 10
folder = DmsfFolder.find_by_id 1
assert_kind_of DmsfFile, file
assert_kind_of DmsfFolder, folder
assert_no_difference 'file.dmsf_file_revisions.count' do
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{file.name}", nil,
@jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{folder.title}/#{file.name}"})
assert_response 201 # Created
file2 = DmsfFile.find_by_id 10
assert_equal folder.id, file2.dmsf_folder_id
end
end
def test_move_to_existing_filename
file = DmsfFile.find_by_id 1
file2 = DmsfFile.find_by_id 9
new_name = "#{file2.name}"
assert_no_difference 'file2.dmsf_file_revisions.count' do
assert_no_difference 'file.dmsf_file_revisions.count' do
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{file.name}", nil,
@jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
assert_response 405 # MethodNotAllowed
end
end
end
def test_move_when_file_is_locked_by_other
file = DmsfFile.find_by_id 1
log_user 'admin', 'admin' # login as admin
assert !User.current.anonymous?, 'Current user is anonymous'
assert file.lock!, "File failed to be locked by #{User.current.name}"
new_name = "#{file.name}.moved"
assert_no_difference 'file.dmsf_file_revisions.count' do
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{file.name}", nil,
@jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
assert_response 423 # Locked
end
end
def test_move_when_file_is_locked_by_other_and_user_is_admin
file = DmsfFile.find_by_id 1
log_user 'jsmith', 'jsmith' # login as jsmith
assert !User.current.anonymous?, 'Current user is anonymous'
assert file.lock!, "File failed to be locked by #{User.current.name}"
new_name = "#{file.name}.moved"
assert_no_difference 'file.dmsf_file_revisions.count' do
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{file.name}", nil,
@admin.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
assert_response 423 # Locked
end
end
def test_move_when_file_is_locked_by_user
file = DmsfFile.find_by_id 1
log_user 'jsmith', 'jsmith' # login as jsmith
assert !User.current.anonymous?, 'Current user is anonymous'
assert file.lock!, "File failed to be locked by #{User.current.name}"
# Move once
new_name = "#{file.name}.m1"
assert_difference 'file.dmsf_file_revisions.count', +1 do
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{file.name}", nil,
@jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
assert_response 201 # Created
end
# Move twice
new_name2 = "#{new_name}.m2"
assert_difference 'file.dmsf_file_revisions.count', +1 do
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{new_name}", nil,
@jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name2}"})
assert_response 201 # Created
end
end
def test_move_msoffice_save_file
# When some versions of MsOffice saves a file it use the following sequence:
# 1. Save changes to a new temporary document, XXX.tmp
# 2. Rename (MOVE) document to YYY.tmp. History is lost here if original document is moved.
# 3. Rename (MOVE) XXX.tmp to document name. XXX.tmp must be merged to original document or else the history is lost.
# 4. Delete YYY.tmp.
# Verify that steps 2 and 3 works.
original_file = DmsfFile.find_by_id 1
temp_file_name = "ABCDEF.tmp"
# Make sure that the temp-file does not exist.
temp_file = DmsfFile.find_file_by_name @project1, nil, "#{temp_file_name}"
assert !temp_file, "File '#{temp_file_name}' should not exist yet."
# Move the original file to ABCDEF.tmp. The original file should not change but a new file should be created.
assert_no_difference 'original_file.dmsf_file_revisions.count' do
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{original_file.name}", nil,
@jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{temp_file_name}"})
assert_response 201 # Created
end
# Verify that a new file acutally has been created
temp_file = DmsfFile.find_file_by_name @project1, nil, "#{temp_file_name}"
assert temp_file, "File '#{temp_file_name}' not found, move failed."
assert_equal temp_file.dmsf_file_revisions.count,1
assert_not_equal temp_file.id, original_file.id
# Move a temporary file (use ABCDEF.tmp) to the original file.
assert_difference 'original_file.dmsf_file_revisions.count', +1 do
xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{temp_file_name}", nil,
@jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{original_file.name}"})
assert_response 201 # Created
end
end
end

24
test/unit/dmsf_file_test.rb
View File

@ -37,6 +37,7 @@ class DmsfFileTest < RedmineDmsf::Test::UnitTest
@file6 = DmsfFile.find_by_id 6
@file7 = DmsfFile.find_by_id 7
@file8 = DmsfFile.find_by_id 8
@folder1 = DmsfFolder.find_by_id 1
@issue1 = Issue.find_by_id 1
User.current = nil
end
@ -53,6 +54,7 @@ class DmsfFileTest < RedmineDmsf::Test::UnitTest
assert_kind_of DmsfFile, @file6
assert_kind_of DmsfFile, @file7
assert_kind_of DmsfFile, @file8
assert_kind_of DmsfFolder, @folder1
assert_kind_of Issue, @issue1
end
@ -142,6 +144,28 @@ class DmsfFileTest < RedmineDmsf::Test::UnitTest
@file4.dmsf_folder.lock!
end
def test_copy_to_filename
assert_no_difference '@file1.dmsf_file_revisions.count' do
new_file = @file1.copy_to_filename(@file1.project, nil, "new_file.txt")
assert_not_equal new_file.id, @file1.id
assert_nil new_file.dmsf_folder_id
assert_nil @file1.dmsf_folder_id
assert_not_equal new_file.name, @file1.name
assert_equal new_file.dmsf_file_revisions.count, 1
end
end
def test_copy_to
assert_no_difference '@file1.dmsf_file_revisions.count' do
new_file = @file1.copy_to(@file1.project, @folder1)
assert_not_equal new_file.id, @file1.id
assert_not_equal @file1.dmsf_folder_id, @folder1.id
assert_equal new_file.dmsf_folder_id, @folder1.id
assert_equal new_file.name, @file1.name
assert_equal new_file.dmsf_file_revisions.count, 1
end
end
def test_save_and_destroy_with_cache
RedmineDmsf::Webdav::Cache.init_testcache

6
test/unit/project_patch_test.rb
View File

@ -65,7 +65,7 @@ class ProjectPatchTest < RedmineDmsf::Test::UnitTest
def test_dmsf_count
hash = @project1.dmsf_count
assert_equal 5, hash[:files]
assert_equal 7, hash[:files]
assert_equal 5, hash[:folders]
end
@ -77,7 +77,7 @@ class ProjectPatchTest < RedmineDmsf::Test::UnitTest
end
def test_copy_dmsf
assert_equal 1, @project1.dmsf_files.visible.count
assert_equal 3, @project1.dmsf_files.visible.count
assert_equal 2, @project1.dmsf_folders.visible.count
assert_equal 1, @project1.file_links.visible.count
assert_equal 1, @project1.folder_links.visible.count
@ -88,7 +88,7 @@ class ProjectPatchTest < RedmineDmsf::Test::UnitTest
assert_equal 0, @project3.folder_links.visible.count
assert_equal 0, @project3.url_links.visible.count
@project3.copy_dmsf(@project1)
assert_equal 1, @project3.dmsf_files.visible.count
assert_equal 3, @project3.dmsf_files.visible.count
assert_equal 2, @project3.dmsf_folders.visible.count
assert_equal 1, @project3.file_links.visible.count
assert_equal 1, @project3.folder_links.visible.count