test/unit/bulk_time_entry_transaction_test.rb @@ -3,17 +3,27 @@ require 'fastercsv' class BulkTimeEntry def self.import_from_csv(file) csv_file = File.read(file) + row_counter = 0 - FasterCSV.parse(csv_file) do |row| - time = TimeEntry.new(:issue_id => row[0], - :comments => row[1].strip, # TODO: truncate - :spent_on => row[2], - :activity => TimeEntryActivity.find_by_name(row[3].strip), - :hours => row[4]) - time.user = User.find_by_login(row[5].strip) + begin + ActiveRecord::Base.transaction do + FasterCSV.parse(csv_file) do |row| + time = TimeEntry.new(:issue_id => row[0], + :comments => row[1].strip, # TODO: truncate + :spent_on => row[2], + :activity => TimeEntryActivity.find_by_name(row[3].strip), + :hours => row[4]) + time.user = User.find_by_login(row[5].strip) - time.save! + time.save! + row_counter += 1 + end + end + rescue ActiveRecord::StatementInvalid, ActiveRecord::RecordNotSaved, ActiveRecord::RecordInvalid => ex + return "ERROR: #{ex.message}" end + return "Imported #{row_counter} records" end + end app/models/bulk_time_entry.rb @@ -5,7 +5,7 @@ namespace :bulk_time_entry do task :csv => [:environment] do csv_file = ENV['CSV_FILE'] || File.join(RAILS_ROOT, 'time_entries.csv') - BulkTimeEntry.import_from_csv(csv_file) + puts BulkTimeEntry.import_from_csv(csv_file) end end lib/tasks/import_from_csv.rake @@ -25,6 +25,31 @@ end class Test::Unit::TestCase end +module BulkTimeEntryTestHelper + def mock_csv_file(name, data='') + file = mock + file.stubs(:name).returns(name) + File.stubs(:read).with(name).returns(data) + file + end + + def generate_csv_data(count=5) + @activity ||= TimeEntryActivity.generate! + @user ||= User.generate_with_protected! + + @project ||= Project.generate! + @tracker ||= Tracker.generate! + @project.trackers << @tracker unless @project.trackers.include? @tracker + + csv_data = [] + 5.times { + issue = Issue.generate!(:tracker => @tracker, :project => @project) + csv_data << [issue.id.to_s, 'A comment', Date.today.to_s, @activity.name, (rand * 10).round(2).to_s, @user.login] + } + csv_data + end +end + # Shoulda class Test::Unit::TestCase end test/test_helper.rb @@ -2,29 +2,12 @@ require File.dirname(__FILE__) + '/../test_helper' require 'fastercsv' +# Failing records are tested in BulkTimeEntryTransaction since Rails +# can't turn fixture transactions off for a single test case. class BulkTimeEntryTest < Test::Unit::TestCase - def mock_csv_file(name, data='') - file = mock - file.stubs(:name).returns(name) - File.stubs(:read).with(name).returns(data) - file - end - - def generate_csv_data(count=5) - @project ||= Project.generate! - @tracker ||= Tracker.generate! - @project.trackers << @tracker unless @project.trackers.include? @tracker - - csv_data = [] - 5.times { - issue = Issue.generate!(:tracker => @tracker, :project => @project) - csv_data << [issue.id.to_s, 'A comment', Date.today.to_s, @activity.name, (rand * 10).round(2).to_s, @user.login] - } - csv_data - end + include BulkTimeEntryTestHelper context "#import_from_csv" do - context "non-readable file" do setup do @file = '/a/test_file.csv' @@ -56,10 +39,6 @@ class BulkTimeEntryTest < Test::Unit::TestCase end context "valid file" do - setup do - @activity = TimeEntryActivity.generate! - @user = User.generate_with_protected! - end should "skip empty lines" @@ -93,11 +72,6 @@ class BulkTimeEntryTest < Test::Unit::TestCase end end - - context "with a failing record" do - should "rollback the import if any record fails" - should "raise an exception" - end end end end test/unit/bulk_time_entry_test.rb 8cc2fddf7f67ca66411d2f8db1348e04308c40e2 Eric Davis edavis@littlestreamsoftware.com http://github.com/edavis10/redmine-bulk_time_entry_plugin/commit/fcca95918cca0afbbd88d3ab297b9fceea4a9f5d fcca95918cca0afbbd88d3ab297b9fceea4a9f5d 2009-09-28T17:02:08-07:00 2009-09-28T17:02:08-07:00 [#3038] Wrapped the import in a transaction. ff9cbfa175c3437522159cb54a8482aaf62f3620 Eric Davis edavis@littlestreamsoftware.com