Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-25 19:48:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into new-gui

Browse source
This commit is contained in:
Reinier Balt 2013-07-29 12:37:20 +02:00
commit 41ff0e20ae
2 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/stats_controller.rb
View file

@ -377,7 +377,7 @@ class StatsController < ApplicationController
# the block should return an array of indexes each is added to the hash and summed
def convert_to_array(records, upper_bound)
a = Array.new(upper_bound, 0)
records.each { |r| (yield r).each { |i| a[i] += 1 } }
records.each { |r| (yield r).each { |i| a[i] += 1 if a[i] } }
a
end

22
test/controllers/stats_controller_test.rb
View file

@ -142,6 +142,28 @@ class StatsControllerTest < ActionController::TestCase
end
end
def test_empty_last12months_data
Timecop.travel(Time.local(2013, 1, 15)) do
login_as(:admin_user)
@current_user = User.find(users(:admin_user).id)
@current_user.todos.delete_all
given_todos_for_stats
get :actions_done_last12months_data
assert_response :success
end
end
def test_out_of_bounds_events_for_last12months_data
login_as(:admin_user)
@current_user = User.find(users(:admin_user).id)
@current_user.todos.delete_all
create_todo_in_past(2.years)
create_todo_in_past(15.months)
get :actions_done_last12months_data
assert_response :success
end
def test_actions_done_last30days_data
login_as(:admin_user)
@current_user = User.find(users(:admin_user).id)