From 4737c2f948050968aa6de0e25bb625ccc204f24c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Wed, 1 Apr 2015 16:50:02 +0200
Subject: [PATCH] Travis CI compatiblity

---
 lib/redmine_dmsf/test/unit_test.rb |  6 ++--
 test/unit/dmsf_links_test.rb       | 48 +++++++++++++++---------------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/lib/redmine_dmsf/test/unit_test.rb b/lib/redmine_dmsf/test/unit_test.rb
index 36b4b8b0..cb17304d 100644
--- a/lib/redmine_dmsf/test/unit_test.rb
+++ b/lib/redmine_dmsf/test/unit_test.rb
@@ -1,8 +1,10 @@
+# encoding: utf-8
+#
 # Redmine plugin for Document Management System "Features"
 #
 # Copyright (C) 2011    Vít Jonáš <vit.jonas@gmail.com>
 # Copyright (C) 2012    Daniel Munn <dan.munn@munnster.co.uk>
-# Copyright (C) 2011-14 Karel Pičman <karel.picman@kontron.com>
+# Copyright (C) 2011-15 Karel Pičman <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
@@ -34,7 +36,7 @@ module RedmineDmsf
       def self.fixtures(*table_names)
         dir = File.join( File.dirname(__FILE__), '../../../test/fixtures')
         table_names.each do |x|
-          ActiveRecord::Fixtures.create_fixtures(dir, x) if File.exist?("#{dir}/#{x}.yml")
+          ActiveRecord::FixtureSet.create_fixtures(dir, x) if File.exist?("#{dir}/#{x}.yml")
         end
         super(table_names)
       end      
diff --git a/test/unit/dmsf_links_test.rb b/test/unit/dmsf_links_test.rb
index da071cab..83510bf9 100644
--- a/test/unit/dmsf_links_test.rb
+++ b/test/unit/dmsf_links_test.rb
@@ -47,36 +47,36 @@ class DmsfLinksTest < RedmineDmsf::Test::UnitTest
   
   def test_create
     # Folder link
-    folder_link = DmsfLink.new(
-      :target_project_id => @project1.id,
-      :target_id => @folder1.id,
-      :target_type => DmsfFolder.model_name,
-      :name => 'folder1_link2',
-      :project_id => @project1.id,
-      :created_at => DateTime.now(),
-      :updated_at => DateTime.now())
+    folder_link = DmsfLink.new
+    folder_link.target_project_id = @project1.id
+    folder_link.target_id = @folder1.id
+    folder_link.target_type = DmsfFolder.model_name
+    folder_link.name = 'folder1_link2'
+    folder_link.project_id = @project1.id
+    folder_link.created_at = DateTime.now()
+    folder_link.updated_at = DateTime.now()
     assert folder_link.save, folder_link.errors.full_messages.to_sentence
     
     # File link
-    file_link = DmsfLink.new(
-      :target_project_id => @project1.id,
-      :target_id => @file1.id,
-      :target_type => DmsfFile.model_name,
-      :name => 'file1_link2',
-      :project_id => @project1.id,
-      :created_at => DateTime.now(),
-      :updated_at => DateTime.now())
+    file_link = DmsfLink.new
+    file_link.target_project_id = @project1.id
+    file_link.target_id = @file1.id
+    file_link.target_type = DmsfFile.model_name
+    file_link.name = 'file1_link2'
+    file_link.project_id = @project1.id
+    file_link.created_at = DateTime.now()
+    file_link.updated_at = DateTime.now()
     assert file_link.save, file_link.errors.full_messages.to_sentence
     
     # External link
-    external_link = DmsfLink.new(      
-      :target_project_id => @project1.id,
-      :external_url => 'http://www.redmine.org/plugins/dmsf',
-      :target_type => 'DmsfUrl',
-      :name => 'DMSF plugin',
-      :project_id => @project1.id,
-      :created_at => DateTime.now(),
-      :updated_at => DateTime.now())
+    external_link = DmsfLink.new
+    external_link.target_project_id = @project1.id
+    external_link.external_url = 'http://www.redmine.org/plugins/dmsf'
+    external_link.target_type = 'DmsfUrl'
+    external_link.name = 'DMSF plugin'
+    external_link.project_id = @project1.id
+    external_link.created_at = DateTime.now()
+    external_link.updated_at = DateTime.now()
     assert external_link.save, external_link.errors.full_messages.to_sentence
   end