jro_apps/redmine Commit - r9267:59f14478eda8

Merged r9387 from trunk....

Jean-Philippe Lang -

r9267:59f14478eda8

parent child

Context file:

r9267:59f14478eda8

Collapse all files

lib/redmine/core_ext/string/conversions.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # 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.
             module Redmine #:nodoc:
               module CoreExtensions #:nodoc:
                 module String #:nodoc:
                   # Custom string conversions
                   module Conversions
                     # Parses hours format and returns a float
                     def to_hours
                       s = self.dup
                       s.strip!
                       if s =~ %r{^(\d+([.,]\d+)?)h?$}
                         s = $1
                       else
                         # 2:30 => 2.5
                         s.gsub!(%r{^(\d+):(\d+)$}) { $1.to_i + $2.to_i / 60.0 }
                         # 2h30, 2h, 30m => 2.5, 2, 0.5
-                        s.gsub!(%r{^((\d+)\s*(h|hours?))?\s*((\d+)\s*(m|min)?)?$}) { |m| ($1 || $4) ? ($2.to_i + $5.to_i / 60.0) : m[0] }
+                        s.gsub!(%r{^((\d+)\s*(h|hours?))?\s*((\d+)\s*(m|min)?)?$}i) { |m| ($1 || $4) ? ($2.to_i + $5.to_i / 60.0) : m[0] }
                       end
                       # 2,5 => 2.5
                       s.gsub!(',', '.')
                       begin; Kernel.Float(s); rescue; nil; end
                     end
                     # Object#to_a removed in ruby1.9
                     if RUBY_VERSION > '1.9'
                       def to_a
                         [self.dup]
                       end
                     end
                   end
                 end
               end
             end

test/unit/time_entry_test.rb +1 0

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # 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__)
             class TimeEntryTest < ActiveSupport::TestCase
               fixtures :issues, :projects, :users, :time_entries,
                        :members, :roles, :member_roles,
                        :trackers, :issue_statuses,
                        :projects_trackers,
                        :journals, :journal_details,
                        :issue_categories, :enumerations,
                        :groups_users,
                        :enabled_modules,
                        :workflows
               def test_hours_format
                 assertions = { "2"      => 2.0,
                                "21.1"   => 21.1,
                                "2,1"    => 2.1,
                                "1,5h"   => 1.5,
                                "7:12"   => 7.2,
                                "10h"    => 10.0,
                                "10 h"   => 10.0,
                                "45m"    => 0.75,
                                "45 m"   => 0.75,
                                "3h15"   => 3.25,
                                "3h 15"  => 3.25,
                                "3 h 15"   => 3.25,
                                "3 h 15m"  => 3.25,
                                "3 h 15 m" => 3.25,
                                "3 hours"  => 3.0,
                                "12min"    => 0.2,
+                               "12 Min"    => 0.2,
                               }
                 assertions.each do |k, v|
                   t = TimeEntry.new(:hours => k)
                   assert_equal v, t.hours, "Converting #{k} failed:"
                 end
               end
               def test_hours_should_default_to_nil
                 assert_nil TimeEntry.new.hours
               end
               def test_spent_on_with_blank
                 c = TimeEntry.new
                 c.spent_on = ''
                 assert_nil c.spent_on
               end
               def test_spent_on_with_nil
                 c = TimeEntry.new
                 c.spent_on = nil
                 assert_nil c.spent_on
               end
               def test_spent_on_with_string
                 c = TimeEntry.new
                 c.spent_on = "2011-01-14"
                 assert_equal Date.parse("2011-01-14"), c.spent_on
               end
               def test_spent_on_with_invalid_string
                 c = TimeEntry.new
                 c.spent_on = "foo"
                 assert_nil c.spent_on
               end
               def test_spent_on_with_date
                 c = TimeEntry.new
                 c.spent_on = Date.today
                 assert_equal Date.today, c.spent_on
               end
               def test_spent_on_with_time
                 c = TimeEntry.new
                 c.spent_on = Time.now
                 assert_equal Date.today, c.spent_on
               end
               def test_validate_time_entry
                 anon     = User.anonymous
                 project  = Project.find(1)
                 issue    = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => anon.id, :status_id => 1,
                                      :priority => IssuePriority.all.first, :subject => 'test_create',
                                      :description => 'IssueTest#test_create', :estimated_hours => '1:30')
                 assert issue.save
                 activity = TimeEntryActivity.find_by_name('Design')
                 te = TimeEntry.create(:spent_on => '2010-01-01',
                                       :hours    => 100000,
                                       :issue    => issue,
                                       :project  => project,
                                       :user     => anon,
                                       :activity => activity)
                 assert_equal 1, te.errors.count
               end
               def test_set_project_if_nil
                 anon     = User.anonymous
                 project  = Project.find(1)
                 issue    = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => anon.id, :status_id => 1,
                                      :priority => IssuePriority.all.first, :subject => 'test_create',
                                      :description => 'IssueTest#test_create', :estimated_hours => '1:30')
                 assert issue.save
                 activity = TimeEntryActivity.find_by_name('Design')
                 te = TimeEntry.create(:spent_on => '2010-01-01',
                                       :hours    => 10,
                                       :issue    => issue,
                                       :user     => anon,
                                       :activity => activity)
                 assert_equal project.id, te.project.id
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages