Merge branch 'master' into new-gui

Conflicts:
	Gemfile.lock
This commit is contained in:
Reinier Balt 2014-01-07 21:01:55 +01:00
parent fa537fbeb0
commit eb1502d4e0
28 changed files with 385 additions and 221 deletions

View file

@ -1,3 +1,4 @@
require 'date'
require 'test/unit'
require 'active_support/core_ext/object/blank'
require_relative '../../app/services/rich_message_extractor.rb'
@ -5,11 +6,15 @@ require_relative '../../app/services/rich_message_extractor.rb'
class RichMessageExtractorTest < Test::Unit::TestCase
def test_message_with_all_options
message = "ohai@some-context>in-this-project"
message = "ohai@some-context~this-project>131012<131014#tag1#tag2*"
extractor = RichMessageExtractor.new(message)
assert_equal "ohai", extractor.description
assert_equal "some-context", extractor.context
assert_equal "in-this-project", extractor.project
assert_equal "this-project", extractor.project
assert_equal "2013-10-12", extractor.show_from.to_s
assert_equal "2013-10-14", extractor.due.to_s
assert_equal ["tag1","tag2"], extractor.tags
assert extractor.starred?
end
def test_message_without_project
@ -20,12 +25,12 @@ class RichMessageExtractorTest < Test::Unit::TestCase
assert_equal nil, extractor.project
end
def test_message_without_project
message = " ohai @ some-context"
def test_message_without_context
message = " ohai ~ some-project"
extractor = RichMessageExtractor.new(message)
assert_equal "ohai", extractor.description
assert_equal "some-context", extractor.context
assert_equal nil, extractor.project
assert_equal "", extractor.context
assert_equal "some-project", extractor.project
end
def test_message_without_project_or_context
@ -52,4 +57,52 @@ class RichMessageExtractorTest < Test::Unit::TestCase
assert_equal nil, extractor.project
end
def test_message_with_tags
message = "some tags#tag 1#tag2"
extractor = RichMessageExtractor.new(message)
assert_equal ["tag 1","tag2"], extractor.tags
end
def test_message_with_no_tags
message = "no tags"
extractor = RichMessageExtractor.new(message)
assert_equal nil, extractor.tags
end
def test_message_with_due_date
message = "datetest<141013"
extractor = RichMessageExtractor.new(message)
assert_equal "2014-10-13", extractor.due.to_s
end
def test_message_with_no_due_date
message = "no date"
extractor = RichMessageExtractor.new(message)
assert_equal nil, extractor.due
end
def test_message_with_show_from
message = "datetest>161013"
extractor = RichMessageExtractor.new(message)
assert_equal "2016-10-13", extractor.show_from.to_s
end
def test_message_with_no_show_from
message = "no tickler"
extractor = RichMessageExtractor.new(message)
assert_equal nil, extractor.show_from
end
def test_message_with_star
message = "star test*"
extractor = RichMessageExtractor.new(message)
assert extractor.starred?
end
def test_message_with_no_star
message = "no star test"
extractor = RichMessageExtractor.new(message)
refute extractor.starred?
end
end