From 2db16406953ee7638a5659db86068aa349247317 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Wed, 17 Aug 2011 09:06:22 +0200 Subject: [PATCH] finish pending scenarios for statistics feature and update CHANGELOG --- doc/CHANGELOG | 15 ++++++++- features/show_statistics.feature | 35 +++++++++++++------- features/step_definitions/todo_edit_steps.rb | 1 + 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/doc/CHANGELOG b/doc/CHANGELOG index b30f0707..b71ceb9c 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -15,13 +15,26 @@ == Version 2.1devel +NOTE: to use this version you need to migrate your database. Not migrating will +cause new actions not to appear! + This version of tracks has moved to a new place on github. Also the wiki moved -to github, see the changed URLs above +to github, see the changed URLs above. New features: 1. redesign of the completed todos: a new overview page. Also all context and project pages have a link to their completed actions 2. New locales (es and fr) and updated locales (de, nl) +3. You can star an action right from the form to add a new action + +Under the hood: +1. Upgraded rails to 2.3.12, jquery to 1.6.1 and jquery-ui to 1.8.13 +2. fixed several issues with the REST API +3. upgraded the act_as_statemachine plugin. This change requires a + migration, see note above! + +See https://github.com/tracksapp/tracks/compare/v2.0...master for all +detailled changes == Version 2.0 diff --git a/features/show_statistics.feature b/features/show_statistics.feature index 7a74aeef..228e4855 100644 --- a/features/show_statistics.feature +++ b/features/show_statistics.feature @@ -7,17 +7,16 @@ Feature: Show statistics Given the following user record | login | password | is_admin | | testuser | secret | false | + Given I have logged in as "testuser" with password "secret" Scenario: Show statistics with no history - Given I have logged in as "testuser" with password "secret" - And I have no todos + Given I have no todos When I go to the statistics page Then I should see "Totals" And I should see " More statistics will appear here once you have added some actions." Scenario: Show statistics with history - Given I have logged in as "testuser" with password "secret" - And I have 5 todos + Given I have 5 todos And I have 2 deferred todos And I have 2 completed todos When I go to the statistics page @@ -32,16 +31,14 @@ Feature: Show statistics And I should see "Tags" Scenario: Click through to see chart of all actions per month - Given I have logged in as "testuser" with password "secret" - And I have 5 todos + Given I have 5 todos When I go to the statistics page And I click on the chart for actions done in the last 12 months Then I should see a chart And I should see "to return to the statistics page" Scenario: Click through to see all incomplete actions of a week - Given I have logged in as "testuser" with password "secret" - And I have 5 todos + Given I have 5 todos And I have 2 deferred todos When I go to the statistics page And I click on the chart for running time of all incomplete actions @@ -52,8 +49,7 @@ Feature: Show statistics And I should see "to show the actions from week 0 and further" Scenario: Click through to see all incomplete visible actions of a week - Given I have logged in as "testuser" with password "secret" - And I have 5 todos + Given I have 5 todos And I have 3 deferred todos When I go to the statistics page And I click on the chart for running time of all incomplete actions @@ -63,8 +59,23 @@ Feature: Show statistics And I should see "to return to the statistics page" And I should see "to show the actions from week 0 and further" + @selenium Scenario: I can edit the todos selected from a chart - Given this is a pending scenario + Given I have 5 todos + When I go to the statistics page + And I click on the chart for running time of all incomplete actions + Then I should see 5 todos + And I should see "todo 1" + When I edit the description of "todo 1" to "foo bar" + Then I should not see the todo "todo 1" + And I should see the todo "foo bar" + @selenium @wip Scenario: Marking a todo selected from a chart as complete will remove it from the page - Given this is a pending scenario + Given I have 5 todos + When I go to the statistics page + And I click on the chart for running time of all incomplete actions + Then I should see 5 todos + And I should see "todo 1" + When I mark "todo 1" as complete + Then I should not see the todo "todo 1" \ No newline at end of file diff --git a/features/step_definitions/todo_edit_steps.rb b/features/step_definitions/todo_edit_steps.rb index 3a95e8b5..88d5cfdc 100644 --- a/features/step_definitions/todo_edit_steps.rb +++ b/features/step_definitions/todo_edit_steps.rb @@ -9,6 +9,7 @@ When /^I mark "([^"]*)" as complete$/ do |action_description| todo_container = "fail" # fail this test if @source_view is wrong todo_container = "p#{todo.project_id}items" if @source_view=="project" todo_container = "c#{todo.context_id}items" if @source_view=="context" || @source_view=="todos" || @source_view=="tag" + todo_container = "tickler_container" if @source_view=="stats" # container should be there selenium.is_element_present("//div[@id='#{todo_container}']").should be_true