bulk_time_entry_plugin 0.4.0 → 0.5.0

data/Rakefile

@@ -6,7 +6,7 @@ Dir[File.expand_path(File.dirname(__FILE__)) + "/lib/tasks/**/*.rake"].sort.each
 RedminePluginSupport::Base.setup do |plugin|
   plugin.project_name = 'bulk_time_entry_plugin'
   plugin.default_task = [:test]
-  plugin.tasks = [:doc, :release, :clean, :test, :db]
+  plugin.tasks = [:doc, :release, :clean, :test, :db, :metrics]
   # TODO: gem not getting this automaticly
   plugin.redmine_root = File.expand_path(File.dirname(__FILE__) + '/../../../')
 end
@@ -35,3 +35,4 @@ begin
 rescue LoadError
   puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
+

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/app/controllers/bulk_time_entries_controller.rb

@@ -4,55 +4,45 @@ class BulkTimeEntriesController < ApplicationController
   layout 'base'
   before_filter :load_activities
   before_filter :load_allowed_projects
+  before_filter :load_first_project
+  before_filter :check_for_no_projects
 
   helper :custom_fields
+  include BulkTimeEntriesHelper
 
   protect_from_forgery :only => [:index, :save]
   
   def index
     @time_entries = [TimeEntry.new(:spent_on => Date.today.to_s)]
-
-    if @projects.empty?
-      render :action => 'no_projects'
-    end
   end
 
-  def get_issues(project_id)
-    @issues = Issue.find(:all, :conditions => { :project_id => project_id })
-  end
-  
   def load_assigned_issues
-    get_issues params[:project_id]
-    render(:update) do |page|
-      page.replace_html params[:entry_id]+'_issues', :partial => 'issues_selector', :locals => { :issues => @issues, :rnd => params[:entry_id].split('_')[1]  }
+    @issues = get_issues(params[:project_id])
+    @selected_project = BulkTimeEntriesController.allowed_project?(params[:project_id])
+    respond_to do |format|
+      format.js {}
     end
   end
   
   
   def save
     if request.post? 
-      @time_entries = params[:time_entries]
+      @unsaved_entries = {}
+      @saved_entries = {}
 
-      render :update do |page|
-        @time_entries.each_pair do |html_id, entry|
-          next unless BulkTimeEntriesController.allowed_project?(entry[:project_id])
-          @time_entry = TimeEntry.new(entry)
-          @time_entry.hours = nil if @time_entry.hours.blank? or @time_entry.hours <= 0
-          @time_entry.project_id = entry[:project_id] # project_id is protected from mass assignment
-          @time_entry.user = User.current
-          unless @time_entry.save
-            page.replace "entry_#{html_id}", :partial => 'time_entry', :object => @time_entry
-          else
-            time_entry_target = if @time_entry.issue
-                                  "#{h(@time_entry.project.name)} - #{h(@time_entry.issue.subject)}"
-                                else
-                                  "#{h(@time_entry.project.name)}"
-                                end
-            page.replace_html "entry_#{html_id}", "<div class='flash notice'>#{l(:text_time_added_to_project, :count => @time_entry.hours, :target => time_entry_target)}#{" (#{@time_entry.comments})" unless @time_entry.comments.blank?}.</div>"
-          end
+      params[:time_entries].each_pair do |html_id, entry|
+        time_entry = TimeEntry.create_bulk_time_entry(entry)
+        if time_entry.new_record?
+          @unsaved_entries[html_id] = time_entry
+        else
+          @saved_entries[html_id] = time_entry
         end
       end
-    end    
+      
+      respond_to do |format|
+        format.js {}
+      end
+    end
   end
     
   def add_entry
@@ -65,18 +55,14 @@ class BulkTimeEntriesController < ApplicationController
     
     @time_entry = TimeEntry.new(:spent_on => spent_on.to_s)
     respond_to do |format|
-      format.js do
-        render :update do |page| 
-          page.insert_html :bottom, 'entries', :partial => 'time_entry', :object => @time_entry
-        end
-      end
+      format.js {}
     end
   end
   
   private
 
   def load_activities
-    @activities = BulkTimeEntryCompatibility::Enumeration::activities
+    @activities = TimeEntryActivity.all
   end
   
   def load_allowed_projects
@@ -84,28 +70,18 @@ class BulkTimeEntriesController < ApplicationController
       Project.allowed_to_condition(User.current, :log_time))
   end
 
-  def self.allowed_project?(project_id)
-    return User.current.projects.find_by_id(project_id, Project.allowed_to_condition(User.current, :log_time))
+  def load_first_project
+    @first_project = @projects.sort_by(&:lft).first unless @projects.empty?
   end
 
-  # Redmine 0.8 compatibility fix
-  if Redmine::VERSION::MAJOR <= 0 && Redmine::VERSION::MINOR < 9
-    include ERB::Util
-    
-    def project_tree_options_for_select(projects)
-      result = []
-      user_projects_by_root = projects.group_by(&:root) 
-      user_projects_by_root.keys.sort.each do |root| 
-        result  << [h(root.name), root.id] 
-        user_projects_by_root[root].sort.each do |project| 
-          next if project == root 
-          result << ["» #{h(project.name)}", project.id] 
-        end 
-      end
-      return result
+  def check_for_no_projects
+    if @projects.empty?
+      render :action => 'no_projects'
+      return false
     end
-    helper_method :project_tree_options_for_select
-    
   end
 
+  def self.allowed_project?(project_id)
+    return User.current.projects.find_by_id(project_id, :conditions => Project.allowed_to_condition(User.current, :log_time))
+  end
 end

data/app/helpers/bulk_time_entries_helper.rb

@@ -11,28 +11,32 @@ module BulkTimeEntriesHelper
   end
   
   def grouped_options_for_issues(issues)
-    open_issues = []
-    closed_issues = []
-    issues.each do |issue|
-      if issue.closed?
-        closed_issues << issue
-      else
-        open_issues << issue
-      end
-    end
+    closed_issues, open_issues = *issues.partition {|issue| issue.closed?}
 
     html = '<option></option>'
     unless open_issues.empty?
-      html << "<optgroup label='#{l(:label_open_issues)}'>"
-      html << options_from_collection_for_select(open_issues, :id, :to_s)
-      html << "</optgroup>"
+      html << labeled_option_group_from_collection_for_select(:label_open_issues, open_issues)
     end
 
     unless closed_issues.empty?
-      html << "<optgroup label='#{l(:label_closed_issues)}'>"
-      html << options_from_collection_for_select(closed_issues, :id, :to_s)
-      html << "</optgroup>"
+      html << labeled_option_group_from_collection_for_select(:label_closed_issues, closed_issues)
     end
     html
   end
+
+  def labeled_option_group_from_collection_for_select(label, collection)
+    html = "<optgroup label='#{l(label)}'>"
+    html << options_from_collection_for_select(collection, :id, :to_s)
+    html << "</optgroup>"
+    html
+  end
+
+  def get_issues(project_id)
+    project = BulkTimeEntriesController.allowed_project?(project_id)
+    if project
+      project.issues.all(:order => 'id ASC')
+    else
+      []
+    end
+  end
 end

data/app/views/bulk_time_entries/_activities_selector.html.erb

@@ -0,0 +1,6 @@
+      <%= label_for_field :activity_id, rnd, :required => true %>
+      <% if activities.present? %>
+      <%= select_tag "time_entries[#{rnd}][activity_id]", options_from_collection_for_select(activities, :id, :name) %>
+      <% else %>
+      <em><%= l(:label_no_data) %></em>
+      <% end %>

data/app/views/bulk_time_entries/_time_entry.html.erb

@@ -4,15 +4,15 @@
   @object = time_entry 
   @object_name = 'time_entry' -%>
   <div class="box" id="entry_<%= rnd %>">
-    <%= error_messages_for 'time_entry' %>
+    <%= error_messages_for 'time_entry', :object => time_entry %>
     <p>
       <%= label_for_field :project_id, rnd, :required => true %>
-      <% projects = project_tree_options_for_select(Project.has_module(:time_tracking)) %>
+      <% projects = project_tree_options_for_select(@projects, :selected => @first_project) %>
       <%= f.select :project_id, projects, {}, 
         { :onchange => "new Ajax.Request('#{url_for :action => 'load_assigned_issues'}', { parameters: { project_id: $F(this), entry_id: $(this).up(1).id } } )" } %>&nbsp;
     </p>
     <p id="entry_<%= rnd %>_issues">
-    <% @issues = controller.get_issues projects.first.id %>
+    <% @issues = get_issues @first_project.id %>
     <%= render :partial => 'issues_selector', :locals => { :issues => @issues, :f => f, :rnd => rnd } %>
     </p>
     <p>
@@ -27,9 +27,8 @@
       <%= label_for_field :comments, rnd %>
       <%= f.text_field :comments, :size => 100, :maxlength => 255 %>
     </p>
-    <p>
-      <%= label_for_field :activity_id, rnd, :required => true %>
-      <%= f.select :activity_id, (@activities.collect {|p| [p.name, p.id]}) %>
+    <p id="entry_<%= rnd %>_activities">
+      <%= render :partial => 'activities_selector', :locals => {:rnd => rnd, :activities => @first_project.activities } %>
     </p>
     <% time_entry.custom_field_values.each do |value| %>
       <p><%= custom_field_tag_with_label "time_entries[#{rnd}]", value %></p>
@@ -37,4 +36,5 @@
   </div>
 <% end %>
 
+<%= javascript_tag("Element.scrollTo('time_entries_#{time_entry.id}_project_id')") %>
 <%= javascript_tag("Form.Element.focus('time_entries_#{time_entry.id}_project_id')") %>

data/app/views/bulk_time_entries/add_entry.js.rjs

@@ -0,0 +1 @@
+page.insert_html :bottom, 'entries', :partial => 'time_entry', :object => @time_entry

data/app/views/bulk_time_entries/load_assigned_issues.js.rjs

@@ -0,0 +1,3 @@
+page.replace_html params[:entry_id]+'_issues', :partial => 'issues_selector', :locals => { :issues => @issues, :rnd => params[:entry_id].split('_')[1]  }
+
+page.replace_html params[:entry_id]+'_activities', :partial => 'activities_selector', :locals => { :rnd => params[:entry_id].split('_')[1], :activities => (@selected_project.present? ? @selected_project.activities : [])  }

data/app/views/bulk_time_entries/save.js.rjs

@@ -0,0 +1,12 @@
+@unsaved_entries.each do |html_id, entry|
+  page.replace "entry_#{html_id}", :partial => 'time_entry', :object => entry
+end
+
+@saved_entries.each do |html_id, entry|
+  time_entry_target = if entry.issue
+                        "#{h(entry.project.name)} - #{h(entry.issue.subject)}"
+                      else
+                        "#{h(entry.project.name)}"
+                      end
+  page.replace_html "entry_#{html_id}", "<div class='flash notice'>#{l(:text_time_added_to_project, :count => entry.hours, :target => time_entry_target)}#{" (#{entry.comments})" unless entry.comments.blank?}.</div>"
+end

data/config/locales/de.yml

@@ -0,0 +1,6 @@
+de:
+  bulk_time_entry_title: Zeiterfassung
+  label_bulk_time_entries: Zeiterfassung
+  label_bulk_time_add_another: Weiteren Eintrag hinzufügen
+  text_bulk_time_entry_permission: Sie haben keine Berechtigung um Zeiten für irgendein Projekt zu erfassen
+  text_time_added_to_project: "{{count}} Stunde/n im Projekt {{target}} erfasst"

data/config/locales/nl.yml

@@ -0,0 +1,7 @@
+nl:
+  bulk_time_entry_title: Bulk tijd loggen
+  label_bulk_time_entries: Bulk tijd loggen
+  label_bulk_time_add_another: Voeg extra toe
+  text_bulk_time_entry_permission: Je hebt geen rechten om op een project tijd te loggen
+  text_time_added_to_project: %s uren toegevoegd aan project
+

data/init.rb

@@ -1 +1,23 @@
-require File.dirname(__FILE__) + "/rails/init"
+require 'redmine'
+
+config.gem 'fastercsv' if respond_to? :config
+
+Redmine::Plugin.register :bulk_time_entry_plugin do
+  name 'Bulk Time Entry'
+  author 'Eric Davis'
+  description 'This is a plugin to enter multiple time entries at one time.'
+  version '0.5.0'
+
+  requires_redmine :version_or_higher => '0.9.0'
+  
+  menu :top_menu, :bulk_time_entry, {:controller => "bulk_time_entries", :action => 'index'}, 
+    :caption => :bulk_time_entry_title, :if => Proc.new{User.current.allowed_to?(:log_time, nil, :global => true)} 
+end
+
+# Patches to the Redmine core.
+require 'dispatcher'
+
+Dispatcher.to_prepare :bulk_time_entry_plugin do
+  require_dependency 'time_entry'
+  TimeEntry.send(:include, BulkTimeEntryPlugin::Patches::TimeEntryPatch)
+end

data/lang/de.yml

@@ -0,0 +1,5 @@
+bulk_time_entry_title: Zeiterfassung
+label_bulk_time_entries: Zeiterfassung
+label_bulk_time_add_another: Weiteren Eintrag hinzufügen
+text_bulk_time_entry_permission: Sie haben keine Berechtigung um Zeiten für irgendein Projekt zu erfassen
+text_time_added_to_project: %s Stunde/n zum Projekt hinzugefügt

data/lang/nl.yml

@@ -0,0 +1,6 @@
+bulk_time_entry_title: Bulk tijd loggen
+label_bulk_time_entries: Bulk tijd loggen
+label_bulk_time_add_another: Voeg extra toe
+text_bulk_time_entry_permission: Je hebt geen rechten om op een project tijd te loggen
+text_time_added_to_project: %s uren toegevoegd aan project
+

data/lib/bulk_time_entry_compatibility.rb

@@ -1,22 +1,3 @@
-begin
-  require 'time_entry_activity'
-rescue LoadError
-  # TimeEntryActivity is not available
-end
-
 # Wrappers around the Redmine core API changes between versions
 module BulkTimeEntryCompatibility
-  class Enumeration
-    # Wrapper around Redmine's API since Enumerations changed in r2472
-    # This can be removed once 0.9.0 is stable
-    def self.activities
-      if Object.const_defined?('TimeEntryActivity')
-        return ::TimeEntryActivity.all
-      elsif ::Enumeration.respond_to?(:activities)
-        return ::Enumeration.activities
-      else
-        return ::Enumeration::get_values('ACTI')
-      end
-    end
-  end
 end

data/lib/bulk_time_entry_plugin/patches/time_entry_patch.rb

@@ -0,0 +1,25 @@
+module BulkTimeEntryPlugin
+  module Patches
+    module TimeEntryPatch
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+
+        def create_bulk_time_entry(entry)
+          time_entry = TimeEntry.new(entry)
+          time_entry.hours = nil if time_entry.hours.blank? or time_entry.hours <= 0
+          if BulkTimeEntriesController.allowed_project?(entry[:project_id])
+            time_entry.project_id = entry[:project_id] # project_id is protected from mass assignment
+          end
+          time_entry.user = User.current
+          time_entry.save
+          time_entry
+        end
+        
+      end
+      
+    end
+  end
+end

data/rails/init.rb

@@ -1,13 +1 @@
-require 'redmine'
-
-config.gem 'fastercsv' if respond_to? :config
-
-Redmine::Plugin.register :bulk_time_entry_plugin do
-  name 'Bulk Time Entry'
-  author 'Eric Davis'
-  description 'This is a plugin to enter multiple time entries at one time.'
-  version '0.4.0'
-  
-  menu :top_menu, :bulk_time_entry, {:controller => "bulk_time_entries", :action => 'index'}, 
-    :caption => :bulk_time_entry_title, :if => Proc.new{User.current.allowed_to?(:log_time, nil, :global => true)} 
-end
+require File.dirname(__FILE__) + "/../init"

data/test/functional/bulk_time_entries_controller_test.rb

@@ -10,6 +10,8 @@ class BulkTimeEntriesControllerTest < ActionController::TestCase
 
   should_have_before_filter :load_activities
   should_have_before_filter :load_allowed_projects
+  should_have_before_filter :load_first_project
+  should_have_before_filter :check_for_no_projects
 
   context "GET to :index" do
     context "as a user without any projects" do
@@ -21,7 +23,7 @@ class BulkTimeEntriesControllerTest < ActionController::TestCase
       end
       
       should_respond_with :success
-      should_assign_to :time_entries
+      should_not_assign_to :time_entries
       should_assign_to :projects
       should_render_template :no_projects
 
@@ -38,7 +40,134 @@ class BulkTimeEntriesControllerTest < ActionController::TestCase
       should_respond_with :success
       should_assign_to :time_entries
       should_assign_to :projects
+      should_assign_to :first_project
       should_render_template :index
     end
   end
+
+  context "POST to :save with valid params and a valid user" do
+    setup do
+      @project = Project.generate!
+      @activity = TimeEntryActivity.generate!
+
+      generate_user_and_login_for_project(@project)
+      @issue = Issue.generate!(:project => @project, :tracker => @project.trackers.first, :priority => IssuePriority.generate!(:name => 'Low'))
+    end
+
+    should "save a new time entry" do
+
+      assert_difference('TimeEntry.count',2) do
+        post :save, :time_entries => {
+          "1234" => {
+            "comments" => 'a comment',
+            "project_id" => @project.id,
+            "issue_id" => @issue.id,
+            "activity_id" => @activity.id,
+            "spent_on" => Date.today.to_s,
+            "hours" => '42'
+          },
+          "9658" => {
+            "comments" => 'a comment',
+            "project_id" => @project.id,
+            "issue_id" => @issue.id,
+            "activity_id" => @activity.id,
+            "spent_on" => Date.today.to_s,
+            "hours" => '42'
+          }
+        }
+      end
+      
+    end
+
+    should "replace the time entry form with a flash message" do
+      post :save, :time_entries => {
+        "1234" => {
+          "comments" => 'a comment',
+          "project_id" => @project.id,
+          "issue_id" => @issue.id,
+          "activity_id" => @activity.id,
+          "spent_on" => Date.today.to_s,
+          "hours" => '42'
+        }
+      }
+
+      assert_select_rjs :replace_html, 'entry_1234', :text => /notice/
+    end
+  end
+
+  context "POST to :save with invalid params and a valid user" do
+    setup do
+      @project = Project.generate!
+      @activity = TimeEntryActivity.generate!
+
+      generate_user_and_login_for_project(@project)
+      @issue = Issue.generate!(:project => @project, :tracker => @project.trackers.first, :priority => IssuePriority.generate!(:name => 'Low'))
+    end
+    should "not save a time entry" do
+
+      assert_no_difference('TimeEntry.count') do
+        post :save, :time_entries => {
+          "1234" => {
+            "comments" => 'a comment',
+            "project_id" => @project.id,
+            "issue_id" => @issue.id,
+            "activity_id" => @activity.id,
+            "spent_on" => '',
+            "hours" => '42'
+          }
+        }
+      end
+      
+    end
+
+    should "re-render the time entry from" do
+      post :save, :time_entries => {
+        "1234" => {
+          "comments" => 'a comment',
+          "project_id" => @project.id,
+          "issue_id" => @issue.id,
+          "activity_id" => @activity.id,
+          "spent_on" => '',
+          "hours" => '42'
+        }
+      }
+
+      assert_select_rjs :replace, 'entry_1234', :text => /blank/
+    end
+  end
+
+  context "POST to :load_assigned_issues with an allowed project" do
+    setup do
+      @project = Project.generate!
+      generate_user_and_login_for_project(@project)
+    end
+
+    should "replace the issues selector" do
+      post :load_assigned_issues, :entry_id => '1234', :project_id => @project.id.to_s
+      assert_select_rjs :replace_html, '1234_issues'
+    end
+
+    should "replace the activities selector" do
+      post :load_assigned_issues, :entry_id => '1234', :project_id => @project.id.to_s
+      assert_select_rjs :replace_html, '1234_activities'
+    end
+  end
+
+  context "POST to :load_assigned_issues with an unallowed project" do
+    setup do
+      @project = Project.generate!
+      generate_user_and_login_for_project(@project)
+      @unallowed_project = Project.generate!
+    end
+
+    should "replace the issues selector with an empty select field" do
+      post :load_assigned_issues, :entry_id => '1234', :project_id => @unallowed_project.id.to_s
+      assert_select_rjs :replace_html, '1234_issues', :text => /no data to display/
+    end
+
+    should "replace the activities selector with an empty select field" do
+      post :load_assigned_issues, :entry_id => '1234', :project_id => @unallowed_project.id.to_s
+      assert_select_rjs :replace_html, '1234_activities', :text => /no data to display/
+    end
+  end
 end

data/test/test_helper.rb

@@ -8,9 +8,13 @@ Engines::Testing.set_fixture_path
 class ActiveSupport::TestCase
   def setup
     User.anonymous
-    non_member = Role.generate!
-    non_member.builtin = Role::BUILTIN_NON_MEMBER
-    non_member.save!
+    begin
+      Role.non_member
+    rescue
+      non_member = Role.generate!
+      non_member.builtin = Role::BUILTIN_NON_MEMBER
+      non_member.save!
+    end
   end
 end
 

data/test/unit/helpers/bulk_time_entries_helper_test.rb

@@ -0,0 +1,88 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+class BulkTimeEntriesHelperTest < HelperTestCase
+  include ApplicationHelper
+  include BulkTimeEntriesHelper
+  include ActionController::Assertions::SelectorAssertions
+
+  # Used by assert_select
+  def html_document
+    HTML::Document.new(@response.body)
+  end
+
+  def setup
+    @response = ActionController::TestResponse.new
+    super
+  end
+
+  context "#grouped_options_for_issues" do
+    setup do
+      @project = Project.generate!
+    end
+
+    context "with no issues" do
+      should "return an empty option" do
+        @response.body = grouped_options_for_issues([])
+        assert_select 'option', :text => ''
+      end
+    end
+
+    context "with issues" do
+      setup do
+        closed = IssueStatus.generate!(:is_closed => true)
+        @issues = [
+                   Issue.generate_for_project!(@project, :tracker => @project.trackers.first),
+                   Issue.generate_for_project!(@project, :tracker => @project.trackers.first, :status => closed),
+                   Issue.generate_for_project!(@project, :tracker => @project.trackers.first),
+                   Issue.generate_for_project!(@project, :tracker => @project.trackers.first)
+                  ]
+        @response.body = grouped_options_for_issues(@issues)
+      end
+
+      should 'render an option tag per issue plan a blank one' do
+        assert_select 'option', :count => 5
+      end
+
+      should 'group the open issues with the Open Issues label' do
+        assert_select 'optgroup[label=?]', l(:label_open_issues) do
+          assert_select 'option', :count => 3
+        end
+      end
+
+      should 'group the closed issues with the Closed Issues label' do
+        assert_select 'optgroup[label=?]', l(:label_closed_issues) do
+          assert_select 'option', :count => 1
+        end
+      end
+    end
+  end
+
+  context "#get_issues" do
+    context "as a user without any projects" do
+      should "be empty" do
+        @user = User.generate_with_protected!
+        User.current = @user
+        @project = Project.generate!
+        Issue.generate_for_project!(@project)
+        Issue.generate_for_project!(@project)
+        
+        assert get_issues(@project.id).empty?
+      end
+    end
+
+    context "as a user with a project" do
+      should "return the project's issues" do
+        @project = Project.generate!
+        generate_user_and_login_for_project(@project)
+        User.current = @user
+        issue1 = Issue.generate_for_project!(@project)
+        issue2 = Issue.generate_for_project!(@project)
+
+        result = get_issues(@project.id)
+        assert_equal 2, result.size
+        assert result.include? issue1
+        assert result.include? issue2
+      end
+    end
+  end
+end

data/test/unit/lib/bulk_time_entry_plugin/patches/time_entry_patch_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class BulkTimeEntryPlugin::Patches::TimeEntryPatchTest < ActiveSupport::TestCase
+  context "TimeEntry#create_bulk_time_entry" do
+    setup do
+      User.current = @user = User.generate_with_protected!
+      @project = Project.generate!
+      @role = Role.generate!(:permissions => Redmine::AccessControl.permissions.collect(&:name))
+      Member.generate!(:project => @project, :roles => [@role], :principal => @user)
+      @valid_params = {:project_id => @project.id, :hours => 5, :activity_id => TimeEntryActivity.generate!.id, :spent_on => Date.today.to_s}
+    end
+
+    should "return the unsaved TimeEntry if the current user is not allowed to log time to the project" do
+      @role.update_attributes(:permissions => [])
+
+      assert_no_difference('TimeEntry.count') do
+        @entry = TimeEntry.create_bulk_time_entry(@valid_params)
+      end
+      assert_equal false, @entry.valid?
+    end
+    
+    context "saving a valid record" do
+      should "save a new Time Entry record" do
+        assert_difference('TimeEntry.count') do
+          @entry = TimeEntry.create_bulk_time_entry(@valid_params)
+        end
+
+        assert @entry.is_a? TimeEntry
+      end
+
+      should "set the project of the new record" do
+        @entry = TimeEntry.create_bulk_time_entry(@valid_params)
+        assert_equal @project, @entry.project
+      end
+
+      should "assign the current user" do
+        @entry = TimeEntry.create_bulk_time_entry(@valid_params)
+        assert_equal @user, @entry.user
+      end
+
+      should "set hours to nil if they are passed in as 0" do
+        @entry = TimeEntry.create_bulk_time_entry(@valid_params.merge(:hours => 0))
+        assert_equal @user, @entry.user
+      end
+      
+    end
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bulk_time_entry_plugin
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Eric Davis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-30 00:00:00 -08:00
+date: 2010-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -32,30 +32,41 @@ files:
 - app/controllers/bulk_time_entries_controller.rb
 - app/helpers/bulk_time_entries_helper.rb
 - app/models/bulk_time_entry.rb
+- app/views/bulk_time_entries/_activities_selector.html.erb
 - app/views/bulk_time_entries/_issues_selector.html.erb
 - app/views/bulk_time_entries/_time_entry.html.erb
+- app/views/bulk_time_entries/add_entry.js.rjs
 - app/views/bulk_time_entries/index.html.erb
+- app/views/bulk_time_entries/load_assigned_issues.js.rjs
 - app/views/bulk_time_entries/no_projects.html.erb
+- app/views/bulk_time_entries/save.js.rjs
+- config/locales/de.yml
 - config/locales/en.yml
 - config/locales/fr.yml
 - config/locales/hu.yml
 - config/locales/it.yml
 - config/locales/ko.yml
+- config/locales/nl.yml
 - config/locales/pl.yml
 - init.rb
+- lang/de.yml
 - lang/en.yml
 - lang/fr.yml
 - lang/hu.yml
 - lang/it.yml
 - lang/ko.yml
+- lang/nl.yml
 - lang/pl.yml
 - lib/bulk_time_entry_compatibility.rb
+- lib/bulk_time_entry_plugin/patches/time_entry_patch.rb
 - lib/tasks/import_from_csv.rake
 - rails/init.rb
 - test/functional/bulk_time_entries_controller_test.rb
 - test/test_helper.rb
 - test/unit/bulk_time_entry_test.rb
 - test/unit/bulk_time_entry_transaction_test.rb
+- test/unit/helpers/bulk_time_entries_helper_test.rb
+- test/unit/lib/bulk_time_entry_plugin/patches/time_entry_patch_test.rb
 - test/unit/sanity_test.rb
 has_rdoc: true
 homepage: https://projects.littlestreamsoftware.com/projects/redmine-bte
@@ -89,5 +100,7 @@ test_files:
 - test/test_helper.rb
 - test/unit/bulk_time_entry_transaction_test.rb
 - test/unit/bulk_time_entry_test.rb
+- test/unit/helpers/bulk_time_entries_helper_test.rb
+- test/unit/lib/bulk_time_entry_plugin/patches/time_entry_patch_test.rb
 - test/unit/sanity_test.rb
 - test/functional/bulk_time_entries_controller_test.rb