Commit dfa11848f0709608df9a592ed7d4bbea77032302
1 parent
14bf05e4
Exists in
master
and in
10 other branches
Added tests for date columns
Showing
2 changed files
with
32 additions
and
2 deletions
Show diff stats
test/enumerable_test.rb
@@ -26,7 +26,13 @@ class TestEnumerable < Minitest::Test | @@ -26,7 +26,13 @@ class TestEnumerable < Minitest::Test | ||
26 | end | 26 | end |
27 | 27 | ||
28 | def create_user(created_at, score = 1) | 28 | def create_user(created_at, score = 1) |
29 | - user = OpenStruct.new(name: "Andrew", score: score, created_at: created_at ? utc.parse(created_at) : nil) | 29 | + user = |
30 | + OpenStruct.new( | ||
31 | + name: "Andrew", | ||
32 | + score: score, | ||
33 | + created_at: created_at ? utc.parse(created_at) : nil, | ||
34 | + created_on: created_at ? Date.parse(created_at) : nil | ||
35 | + ) | ||
30 | @users << user | 36 | @users << user |
31 | user | 37 | user |
32 | end | 38 | end |
test/test_helper.rb
@@ -39,6 +39,7 @@ def create_tables | @@ -39,6 +39,7 @@ def create_tables | ||
39 | t.string :name | 39 | t.string :name |
40 | t.integer :score | 40 | t.integer :score |
41 | t.timestamp :created_at | 41 | t.timestamp :created_at |
42 | + t.date :created_on | ||
42 | end | 43 | end |
43 | 44 | ||
44 | ActiveRecord::Migration.create_table :posts, force: true do |t| | 45 | ActiveRecord::Migration.create_table :posts, force: true do |t| |
@@ -307,7 +308,12 @@ module TestDatabase | @@ -307,7 +308,12 @@ module TestDatabase | ||
307 | end | 308 | end |
308 | 309 | ||
309 | def create_user(created_at, score = 1) | 310 | def create_user(created_at, score = 1) |
310 | - User.create! name: "Andrew", score: score, created_at: created_at ? utc.parse(created_at) : nil | 311 | + User.create!( |
312 | + name: "Andrew", | ||
313 | + score: score, | ||
314 | + created_at: created_at ? utc.parse(created_at) : nil, | ||
315 | + created_on: created_at ? Date.parse(created_at) : nil | ||
316 | + ) | ||
311 | end | 317 | end |
312 | 318 | ||
313 | def teardown | 319 | def teardown |
@@ -934,6 +940,24 @@ module TestGroupdate | @@ -934,6 +940,24 @@ module TestGroupdate | ||
934 | assert_format :month_of_year, "Jan", "%b" | 940 | assert_format :month_of_year, "Jan", "%b" |
935 | end | 941 | end |
936 | 942 | ||
943 | + # date column | ||
944 | + | ||
945 | + def test_date_column | ||
946 | + expected = { | ||
947 | + Date.parse("2013-05-03") => 1 | ||
948 | + } | ||
949 | + assert_equal expected, result(:day, "2013-05-03", false, dates: true) | ||
950 | + end | ||
951 | + | ||
952 | + def test_date_column_with_time_zone | ||
953 | + # TODO change for Groupdate 3.0 | ||
954 | + skip | ||
955 | + expected = { | ||
956 | + Date.parse("2013-05-03") => 1 | ||
957 | + } | ||
958 | + assert_equal expected, result(:day, "2013-05-03", true, dates: true) | ||
959 | + end | ||
960 | + | ||
937 | # helpers | 961 | # helpers |
938 | 962 | ||
939 | def assert_format(method, expected, format, options = {}) | 963 | def assert_format(method, expected, format, options = {}) |