diff --git a/init.rb b/init.rb index 04137d71..176f7871 100644 --- a/init.rb +++ b/init.rb @@ -24,7 +24,7 @@ Redmine::Plugin.register :redmine_dmsf do name "DMSF" author "Vit Jonas / Daniel Munn" description "Document Management System Features" - version "1.4.1 stable" + version "1.4.2 devel" url "https://github.com/danmunn/redmine_dmsf" author_url "https://code.google.com/p/redmine-dmsf/" @@ -40,7 +40,7 @@ Redmine::Plugin.register :redmine_dmsf do "dmsf_index_database" => Rails.root.join("files/dmsf_index").to_s, "dmsf_stemming_lang" => "english", "dmsf_stemming_strategy" => "STEM_NONE", - "dmsf_webdav" => 1 + "dmsf_webdav" => "1" } menu :project_menu, :dmsf, { :controller => "dmsf", :action => "show" }, :caption => :menu_dmsf, :before => :documents, :param => :id diff --git a/test/fixtures/dmsf_folders.yml b/test/fixtures/dmsf_folders.yml index 2ada52fd..148f92da 100644 --- a/test/fixtures/dmsf_folders.yml +++ b/test/fixtures/dmsf_folders.yml @@ -3,7 +3,7 @@ one: id: 1 - name: folder1 + title: folder1 project_id: 1 @@ -14,7 +14,7 @@ one: two: id: 2 - name: folder2 + title: folder2 project_id: 1 diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b68ba10..2ef35e2f 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,7 @@ # Redmine plugin for Document Management System "Features" # # Copyright (C) 2011 Vít Jonáš +# Copyright (C) 2012 Daniel Munn # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -17,7 +18,11 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Load the normal Rails helper -require File.expand_path(File.dirname(__FILE__) + '/../../../../test/test_helper') +require File.expand_path(File.dirname(__FILE__) + '/../../../test/test_helper') # Ensure that we are using the temporary fixture path -Engines::Testing.set_fixture_path +#Engines::Testing.set_fixture_path + +#use fixtures from redmine +ActiveSupport::TestCase.fixture_path = File.dirname(__FILE__) + '/../../../test/fixtures' +