From 6aa8b8d2f9814a0e767b1d7c5504f2576ce430b6 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Thu, 17 Nov 2011 17:07:55 +0100 Subject: [PATCH] replace new repeating todo form with jquery dialog. And some refactoring --- app/controllers/recurring_todos_controller.rb | 81 ++++++----- app/models/recurring_todo.rb | 6 +- .../recurring_todos/_recurring_todo.html.erb | 7 +- .../recurring_todos/_recurring_todo_form.erb | 23 +-- app/views/recurring_todos/create.js.erb | 2 +- app/views/recurring_todos/index.html.erb | 15 +- public/javascripts/application.js | 131 ++++++++++------- public/stylesheets/standard.css | 24 +--- .../recurring_todos_controller_test.rb | 134 +++++++++++------- 9 files changed, 228 insertions(+), 195 deletions(-) diff --git a/app/controllers/recurring_todos_controller.rb b/app/controllers/recurring_todos_controller.rb index dd34bb1b..69517597 100644 --- a/app/controllers/recurring_todos_controller.rb +++ b/app/controllers/recurring_todos_controller.rb @@ -9,8 +9,8 @@ class RecurringTodosController < ApplicationController @page_title = t('todos.recurring_actions_title') @source_view = params['_source_view'] || 'recurring_todo' find_and_inactivate - @recurring_todos = current_user.recurring_todos.active - @completed_recurring_todos = current_user.recurring_todos.completed.find(:all, :limit => 10) + @recurring_todos = current_user.recurring_todos.active.find(:all, :include => [:tags, :taggings]) + @completed_recurring_todos = current_user.recurring_todos.completed.find(:all, :limit => 10, :include => [:tags, :taggings]) @no_recurring_todos = @recurring_todos.size == 0 @no_completed_recurring_todos = @completed_recurring_todos.size == 0 @@ -21,15 +21,15 @@ class RecurringTodosController < ApplicationController def new end - + def show end - + def done @page_title = t('todos.completed_recurring_actions_title') @source_view = params['_source_view'] || 'recurring_todo' items_per_page = 20 - page = params[:page] || 1 + page = params[:page] || 1 @completed_recurring_todos = current_user.recurring_todos.completed.paginate :page => params[:page], :per_page => items_per_page @total = @count = current_user.recurring_todos.completed.count @range_low = (page.to_i-1) * items_per_page + 1 @@ -54,7 +54,7 @@ class RecurringTodosController < ApplicationController params['recurring_todo']['recurring_period']=params['recurring_edit_todo']['recurring_period'] params['recurring_todo']['end_date']=parse_date_per_user_prefs(params['recurring_todo_edit_end_date']) params['recurring_todo']['start_from']=parse_date_per_user_prefs(params['recurring_todo_edit_start_from']) - + # update project if params['recurring_todo']['project_id'].blank? && !params['project_name'].nil? if params['project_name'] == 'None' @@ -70,7 +70,7 @@ class RecurringTodosController < ApplicationController end params["recurring_todo"]["project_id"] = project.id end - + # update context if params['recurring_todo']['context_id'].blank? && !params['context_name'].blank? context = current_user.contexts.find_by_name(params['context_name'].strip) @@ -88,14 +88,14 @@ class RecurringTodosController < ApplicationController %w{monday tuesday wednesday thursday friday saturday sunday}.each do |day| params["recurring_todo"]["weekly_return_"+day]=' ' if params["recurring_todo"]["weekly_return_"+day].nil? end - + @saved = @recurring_todo.update_attributes params["recurring_todo"] respond_to do |format| format.js end end - + def create p = RecurringTodoCreateParamsHelper.new(params) p.attributes['end_date']=parse_date_per_user_prefs(p.attributes['end_date']) @@ -109,7 +109,7 @@ class RecurringTodosController < ApplicationController @new_project_created = project.new_record_before_save? @recurring_todo.project_id = project.id end - + if p.context_specified_by_name? context = current_user.contexts.find_or_create_by_name(p.context_name) @new_context_created = context.new_record_before_save? @@ -134,13 +134,13 @@ class RecurringTodosController < ApplicationController @new_recurring_todo = RecurringTodo.new else @status_message = t('todos.error_saving_recurring') - end - + end + respond_to do |format| - format.js + format.js end end - + def destroy # remove all references to this recurring todo @todos = @recurring_todo.todos @@ -149,16 +149,16 @@ class RecurringTodosController < ApplicationController t.recurring_todo_id = nil t.save end - + # delete the recurring todo @saved = @recurring_todo.destroy # count remaining recurring todos @active_remaining = current_user.recurring_todos.active.count @completed_remaining = current_user.recurring_todos.completed.count - + respond_to do |format| - + format.html do if @saved notify :notice, t('todos.recurring_deleted_success'), 2.0 @@ -168,10 +168,10 @@ class RecurringTodosController < ApplicationController redirect_to :action => 'index' end end - + format.js do render - end + end end end @@ -184,19 +184,19 @@ class RecurringTodosController < ApplicationController if @recurring_todo.active? @completed_remaining = current_user.recurring_todos.completed.count - + # from completed back to active -> check if there is an active todo @active_todos = @recurring_todo.todos.active.count # create todo if there is no active todo belonging to the activated # recurring_todo @new_recurring_todo = create_todo_from_recurring_todo(@recurring_todo) if @active_todos == 0 end - + respond_to do |format| - format.js + format.js end end - + def toggle_star @recurring_todo.toggle_star! @saved = @recurring_todo.save! @@ -204,13 +204,13 @@ class RecurringTodosController < ApplicationController format.js end end - + class RecurringTodoCreateParamsHelper def initialize(params) @params = params['request'] || params @attributes = params['request'] && params['request']['recurring_todo'] || params['recurring_todo'] - + # make sure all selectors (recurring_period, recurrence_selector, # daily_selector, monthly_selector and yearly_selector) are first in hash # so that they are processed first by the model @@ -221,47 +221,47 @@ class RecurringTodosController < ApplicationController 'yearly_selector' => @attributes['yearly_selector'] } end - + def attributes @attributes end - + def selector_attributes return @selector_attributes end - + def project_name @params['project_name'].strip unless @params['project_name'].nil? end - + def context_name @params['context_name'].strip unless @params['context_name'].nil? end - + def tag_list @params['tag_list'] end - + def project_specified_by_name? return false unless @attributes['project_id'].blank? return false if project_name.blank? return false if project_name == 'None' true end - + def context_specified_by_name? return false unless @attributes['context_id'].blank? return false if context_name.blank? true end - + end private - + def init @days_of_week = [] - 0.upto 6 do |i| + 0.upto 6 do |i| @days_of_week << [t('date.day_names')[i], i] end @@ -274,15 +274,18 @@ class RecurringTodosController < ApplicationController @projects = current_user.projects.find(:all, :include => [:default_context]) @contexts = current_user.contexts.find(:all) end - + def get_recurring_todo_from_param @recurring_todo = current_user.recurring_todos.find(params[:id]) end def find_and_inactivate # find active recurring todos without active todos and inactivate them - recurring_todos = current_user.recurring_todos.active - recurring_todos.each { |rt| rt.toggle_completion! if rt.todos.not_completed.count == 0} + + current_user.recurring_todos.active.all( + :select => "recurring_todos.id, recurring_todos.state", + :joins => "LEFT JOIN todos fai_todos ON (recurring_todos.id = fai_todos.recurring_todo_id) AND (NOT fai_todos.state='completed')", + :conditions => "fai_todos.id IS NULL").each { |rt| current_user.recurring_todos.find(rt.id).toggle_completion! } end - + end diff --git a/app/models/recurring_todo.rb b/app/models/recurring_todo.rb index 913ee2ff..634b242b 100644 --- a/app/models/recurring_todo.rb +++ b/app/models/recurring_todo.rb @@ -467,7 +467,11 @@ class RecurringTodo < ActiveRecord::Base end def starred? - tags.any? {|tag| tag.name == Todo::STARRED_TAG_NAME } + return has_tag?(Todo::STARRED_TAG_NAME) + end + + def has_tag?(tag_name) + return self.tags.any? {|tag| tag.name == tag_name} end def get_due_date(previous) diff --git a/app/views/recurring_todos/_recurring_todo.html.erb b/app/views/recurring_todos/_recurring_todo.html.erb index 3abafc4a..2bff4883 100644 --- a/app/views/recurring_todos/_recurring_todo.html.erb +++ b/app/views/recurring_todos/_recurring_todo.html.erb @@ -1,8 +1,9 @@ <% @recurring_todo = recurring_todo -%>
- <%= recurring_todo_remote_delete_icon %> <%= recurring_todo_remote_edit_icon -%> - - <%= recurring_todo_remote_star_icon %> <%= recurring_todo_remote_toggle_checkbox -%> + <%= recurring_todo_remote_delete_icon %> + <%= recurring_todo_remote_edit_icon -%> + <%= recurring_todo_remote_star_icon %> + <%= recurring_todo_remote_toggle_checkbox -%>
<%= sanitize(recurring_todo.description) %> <%= recurring_todo_tag_list %> diff --git a/app/views/recurring_todos/_recurring_todo_form.erb b/app/views/recurring_todos/_recurring_todo_form.erb index d6ffed83..a2f60355 100644 --- a/app/views/recurring_todos/_recurring_todo_form.erb +++ b/app/views/recurring_todos/_recurring_todo_form.erb @@ -1,10 +1,10 @@ <%- reset_tab_index %>
- <% + <% form_for(@new_recurring_todo, :html=> { :id=>'recurring-todo-form-new-action', :name=>'recurring_todo', :class => 'inline-form' }) do -%>
<%= error_messages_for("item", :object_name => 'action') %>
- +
<%= @@ -14,12 +14,12 @@ - + - + - <%= text_field_tag "tag_list", nil, :size => 30, :tabindex => next_tab_index -%> + <%= text_field_tag "tag_list", nil, :size => 30, :tabindex => next_tab_index -%>
@@ -88,17 +88,6 @@ <%= radio_button_tag('recurring_todo[recurring_target]', 'show_from_date', false, {:tabindex => next_tab_index})%> <%= t('todos.recurrence.from_tickler') %>

-
-
- - -
-
+ <% end %>
diff --git a/app/views/recurring_todos/create.js.erb b/app/views/recurring_todos/create.js.erb index e2c9428d..29fa9e32 100644 --- a/app/views/recurring_todos/create.js.erb +++ b/app/views/recurring_todos/create.js.erb @@ -1,8 +1,8 @@ <% if @saved -%> TracksPages.page_notify('notice', "<%=@status_message%>", 5); - RecurringTodosPage.toggle_overlay(); add_recurring_todo_to_active_container(); replace_form_with_empty_form(); + $( "#new-recurring-todo" ).dialog( "close" ); TracksPages.set_page_badge(<%= @down_count %>); <% else -%> TracksPages.show_errors(html_for_error_messages()); diff --git a/app/views/recurring_todos/index.html.erb b/app/views/recurring_todos/index.html.erb index 14ced9b0..8e6c932d 100644 --- a/app/views/recurring_todos/index.html.erb +++ b/app/views/recurring_todos/index.html.erb @@ -8,7 +8,7 @@ <%= render :partial => @recurring_todos %>
- +
<%= link_to "Show all", done_recurring_todos_path%>

<%= t('common.last') %> <%= t('todos.completed_recurring') %>

@@ -26,12 +26,9 @@
-
-
-
- <%= render :partial => "recurring_todo_form" %> -
- +
+ <%= render :partial => "recurring_todo_form" %> +
+ \ No newline at end of file diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 7e5ec824..a6d027d3 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -991,64 +991,93 @@ var RecurringTodosPage = { $('#recurring_edit_'+this).hide(); }); }, + reset_radio: function () { + $('input:radio[name="recurring_todo[recurring_period]"]')[0].checked = true; + }, toggle_overlay: function () { var overlay_element = document.getElementById("overlay"); overlay_element.style.visibility = (overlay_element.style.visibility == "visible") ? "hidden" : "visible"; }, setup_behavior: function() { - /* cancel button on new recurring todo form */ - $("#recurring_todo_new_action_cancel").live('click', function(){ - $('#recurring-todo-form-new-action input:text:first').focus(); - RecurringTodosPage.hide_all_recurring(); - $('#recurring_daily').show(); - RecurringTodosPage.toggle_overlay(); - }); - /* cancel button on edit recurring todo form */ - $("#recurring_todo_edit_action_cancel").live('click', function(){ - $('#recurring-todo-form-edit-action input:text:first').focus(); - RecurringTodosPage.hide_all_recurring(); - $('#recurring_daily').show(); - RecurringTodosPage.toggle_overlay(); - }); - /* change recurring period radio input on edit form */ - $("#recurring_edit_period input").live('click', function(){ - RecurringTodosPage.hide_all_edit_recurring(); - $('#recurring_edit_'+this.id.split('_')[5]).show(); - }); - /* change recurring period radio input on new form */ - $("#recurring_period input").live('click', function(){ - RecurringTodosPage.hide_all_recurring(); - $('#recurring_'+this.id.split('_')[4]).show(); - }); - /* add new recurring todo plus-button in sidebar */ - $("#add-new-recurring-todo").live('click', function(){ - $('#new-recurring-todo').show(); - $('#edit-recurring-todo').hide(); - RecurringTodosPage.toggle_overlay(); - }); - /* submit form when editing a recurring todo */ - $("#recurring_todo_edit_action_submit").live('click', function (ev) { + /* add new recurring todo plus-button in sidebar */ + $("#add-new-recurring-todo").live('click', function(){ + $( "#new-recurring-todo" ).dialog( "open" ); + }); + + /* setup dialog for new repeating action */ + $( "#new-recurring-todo" ).dialog({ + autoOpen: false, + height: 690, + width: 750, + modal: true, + buttons: { + "Create": function() { + submit_with_ajax_and_block_element('form.#recurring-todo-form-new-action', $(this)); + }, + Cancel: function() { + $( this ).dialog( "close" ); + } + }, + show: "fade", + hide: "fade", + close: function() { + $('#recurring-todo-form-new-action input:text:first').focus(); + RecurringTodosPage.hide_all_recurring(); + RecurringTodosPage.reset_radio(); + $('#recurring_daily').show(); + } + }); + + /* change recurring period radio input on new form */ + $("#recurring_period input").live('click', function(){ + RecurringTodosPage.hide_all_recurring(); + $('#recurring_'+this.id.split('_')[4]).show(); + }); + + /* setup dialog for new repeating action */ + $( "#edit-recurring-todo" ).dialog({ + autoOpen: false, + height: 690, + width: 750, + modal: true, + buttons: { + "Create": function() { submit_with_ajax_and_block_element('form#recurring-todo-form-edit-action', $(this)); - return false; - }); - /* submit form for new recurring todo */ - $("#recurring_todo_new_action_submit").live('click', function (ev) { - submit_with_ajax_and_block_element('form.#recurring-todo-form-new-action', $(this)); - return false; - }); - /* set behavior for edit recurring todo */ - $(".item-container a.edit_icon").live('click', function (ev){ - get_with_ajax_and_block_element(this.href, $(this).parents(".item-container")); - return false; - }); - /* delete button to delete a todo from the list */ - $('.item-container a.delete_icon').live('click', function(evt){ - var confirm_message = $(this).attr("x_confirm_message") - if(confirm(confirm_message)){ - delete_with_ajax_and_block_element(this.href, $(this).parents('.project')); + }, + Cancel: function() { + $( this ).dialog( "close" ); + } + }, + show: "fade", + hide: "fade", + close: function() { + $('#recurring-todo-form-edit-action input:text:first').focus(); + RecurringTodosPage.hide_all_recurring(); + RecurringTodosPage.reset_radio(); + $('#recurring_daily').show(); + } + }); + + /* change recurring period radio input on edit form */ + $("#recurring_edit_period input").live('click', function(){ + RecurringTodosPage.hide_all_edit_recurring(); + $('#recurring_edit_'+this.id.split('_')[5]).show(); + }); + + /* set behavior for edit recurring todo */ + $(".item-container a.edit_icon").live('click', function (ev){ + get_with_ajax_and_block_element(this.href, $(this).parents(".item-container")); + return false; + }); + + /* delete button to delete a todo from the list */ + $('.item-container a.delete_icon').live('click', function(evt){ + var confirm_message = $(this).attr("x_confirm_message") + if(confirm(confirm_message)){ + delete_with_ajax_and_block_element(this.href, $(this).parents('.project')); } - return false; - }); + return false; + }); } } diff --git a/public/stylesheets/standard.css b/public/stylesheets/standard.css index fa8f893a..ff92ce9a 100644 --- a/public/stylesheets/standard.css +++ b/public/stylesheets/standard.css @@ -203,26 +203,6 @@ a.show_successors:hover, a.link_to_successors:hover {background-image: url(../im width: 100%; } -#overlay { - visibility: hidden; - position: absolute; - left: 0px; - top: 0px; - width: 100%; - height: 100%; - z-index: 102; - text-align: center; - background-image:url("../images/trans70.png"); -} - -#overlay #new-recurring-todo, #overlay #edit-recurring-todo { - width:750px; - background-color: #fff; - border:1px solid #000; - padding: 15px; - margin: 70px auto; -} - .recurring_container { padding: 0px 5px 0px 5px; border: 1px solid #999; @@ -278,8 +258,8 @@ a.show_successors:hover, a.link_to_successors:hover {background-image: url(../im #navlist a:hover { color: #CCC; } #develop-notify-bar { - line-height:0.5; - background-image: url(/images/construction.gif); + line-height:0.5; + background-image: url(/images/construction.gif); background-repeat: repeat-x; } diff --git a/test/functional/recurring_todos_controller_test.rb b/test/functional/recurring_todos_controller_test.rb index 725c79ce..bdfeef65 100644 --- a/test/functional/recurring_todos_controller_test.rb +++ b/test/functional/recurring_todos_controller_test.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper') class RecurringTodosControllerTest < ActionController::TestCase fixtures :users, :preferences, :projects, :contexts, :todos, :tags, :taggings, :recurring_todos - + def setup @controller = RecurringTodosController.new @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new @@ -12,30 +12,30 @@ class RecurringTodosControllerTest < ActionController::TestCase get :index assert_redirected_to :controller => 'login', :action => 'login' end - + def test_destroy_recurring_todo login_as(:admin_user) xhr :post, :destroy, :id => 1, :_source_view => 'todo' - begin + begin rc = RecurringTodo.find(1) rescue - rc = nil + rc = nil end assert_nil rc end - + def test_new_recurring_todo login_as(:admin_user) orig_rt_count = RecurringTodo.count orig_todo_count = Todo.count - put :create, - "context_name"=>"library", - "project_name"=>"Build a working time machine", - "recurring_todo" => + put :create, + "context_name"=>"library", + "project_name"=>"Build a working time machine", + "recurring_todo" => { - "daily_every_x_days"=>"1", - "daily_selector"=>"daily_every_x_day", - "description"=>"new recurring pattern", + "daily_every_x_days"=>"1", + "daily_selector"=>"daily_every_x_day", + "description"=>"new recurring pattern", "end_date" => "31/08/2010", "ends_on" => "ends_on_end_date", "monthly_day_of_week" => "1", @@ -59,15 +59,15 @@ class RecurringTodosControllerTest < ActionController::TestCase "yearly_month_of_year2"=>"8", "yearly_month_of_year"=>"6", "yearly_selector"=>"yearly_every_x_day" - }, + }, "tag_list"=>"one, two, three, four" - + # check new recurring todo added - assert_equal orig_rt_count+1, RecurringTodo.count + assert_equal orig_rt_count+1, RecurringTodo.count # check new todo added assert_equal orig_todo_count+1, Todo.count end - + def test_recurring_todo_toggle_check # the test fixtures did add recurring_todos but not the corresponding todos, # so we check complete and uncheck to force creation of a todo from the @@ -78,22 +78,22 @@ class RecurringTodosControllerTest < ActionController::TestCase xhr :post, :toggle_check, :id=>1, :_source_view=>"" recurring_todo_1 = RecurringTodo.find(1) assert recurring_todo_1.completed? - + # remove remaining todo todo = Todo.find_by_recurring_todo_id(1) todo.recurring_todo_id = 2 todo.save - + todo_count = Todo.count - + # mark as active - xhr :post, :toggle_check, :id=>1, :_source_view=>"" + xhr :post, :toggle_check, :id=>1, :_source_view=>"" recurring_todo_1.reload assert recurring_todo_1.active? - + # by making active, a new todo should be created from the pattern assert_equal todo_count+1, Todo.count - + # find the new todo and check its description new_todo = Todo.find_by_recurring_todo_id 1 assert_equal "Call Bill Gates every day", new_todo.description @@ -101,9 +101,9 @@ class RecurringTodosControllerTest < ActionController::TestCase def test_creating_recurring_todo_with_show_from_in_past login_as(:admin_user) - + @yearly = RecurringTodo.find(5) # yearly on june 8th - + # change due date in four days from now and show from 10 days before, i.e. 6 # days ago target_date = Time.now.utc + 4.days @@ -114,37 +114,37 @@ class RecurringTodosControllerTest < ActionController::TestCase # @yearly.errors.each {|obj, error| puts error} # end assert @yearly.save - + # toggle twice to force generation of new todo xhr :post, :toggle_check, :id=>5, :_source_view=>"" xhr :post, :toggle_check, :id=>5, :_source_view=>"" new_todo = Todo.find_by_recurring_todo_id 5 - + # due date should be the target_date assert_equal users(:admin_user).at_midnight(Date.new(target_date.year, target_date.month, target_date.day)), new_todo.due - + # show_from should be nil since now+4.days-10.days is in the past assert_equal nil, new_todo.show_from end - + def test_last_sunday_of_march # this test is a duplicate of the unit test. Only this test covers the # codepath in the controllers - + login_as(:admin_user) orig_rt_count = RecurringTodo.count orig_todo_count = Todo.count - put :create, - "context_name"=>"library", - "project_name"=>"Build a working time machine", - "recurring_todo" => + put :create, + "context_name"=>"library", + "project_name"=>"Build a working time machine", + "recurring_todo" => { - "daily_every_x_days"=>"1", - "daily_selector"=>"daily_every_x_day", - "description"=>"new recurring pattern", + "daily_every_x_days"=>"1", + "daily_selector"=>"daily_every_x_day", + "description"=>"new recurring pattern", "end_date" => "", "ends_on" => "no_end_date", "monthly_day_of_week" => "1", @@ -168,36 +168,36 @@ class RecurringTodosControllerTest < ActionController::TestCase "yearly_month_of_year2"=>"3", "yearly_month_of_year"=>"10", "yearly_selector"=>"yearly_every_xth_day" - }, + }, "tag_list"=>"one, two, three, four" - + # check new recurring todo added - assert_equal orig_rt_count+1, RecurringTodo.count + assert_equal orig_rt_count+1, RecurringTodo.count # check new todo added assert_equal orig_todo_count+1, Todo.count # find the newly created todo new_todo = Todo.find_by_description("new recurring pattern") assert !new_todo.nil? - + # the date should be 31 march 2013 assert_equal Time.zone.local(2013,3,31), new_todo.due end - + def test_recurring_todo_with_due_date_and_show_always login_as(:admin_user) orig_rt_count = RecurringTodo.count orig_todo_count = Todo.count - put :create, - "context_name"=>"library", - "project_name"=>"Build a working time machine", - "recurring_todo" => + put :create, + "context_name"=>"library", + "project_name"=>"Build a working time machine", + "recurring_todo" => { - "daily_every_x_days"=>"1", - "daily_selector"=>"daily_every_x_day", - "description"=>"new recurring pattern", + "daily_every_x_days"=>"1", + "daily_selector"=>"daily_every_x_day", + "description"=>"new recurring pattern", "end_date" => "", "ends_on" => "no_end_date", "monthly_day_of_week" => "1", @@ -221,20 +221,50 @@ class RecurringTodosControllerTest < ActionController::TestCase "yearly_month_of_year2"=>"3", "yearly_month_of_year"=>"10", "yearly_selector"=>"yearly_every_xth_day" - }, + }, "tag_list"=>"one, two, three, four" - + # check new recurring todo added - assert_equal orig_rt_count+1, RecurringTodo.count + assert_equal orig_rt_count+1, RecurringTodo.count # check new todo added assert_equal orig_todo_count+1, Todo.count # find the newly created recurring todo recurring_todo = RecurringTodo.find_by_description("new recurring pattern") assert !recurring_todo.nil? - + assert_equal "due_date", recurring_todo.target assert_equal true, recurring_todo.show_always? end + def test_find_and_inactivate + login_as(:admin_user) + + rt = RecurringTodo.find(recurring_todos(:call_bill_gates_every_day).id) + todo = Todo.find_by_recurring_todo_id(rt.id) + + assert_not_nil todo + assert_equal "active", todo.state, "todo should be active" + assert_equal "active", rt.state, "repeat pattern should be active" + + get :index # will call find_and_inactivate + + rt.reload + assert_equal "active", rt.state, "repeat pattern should still be active" + + # disconnect todo from pattern thus leaving the pattern without + # any active todos, but in active state + todo.reload + todo.recurring_todo_id=nil + todo.save! + + todo.reload + rt.reload + assert_equal "active", rt.state, "repeat pattern should still be active and not changed" + + get :index + rt.reload + assert_equal "completed", rt.state, "repeat pattern should be completed" + end + end