diff --git a/app/views/todos/_toggle_successors.html.erb b/app/views/todos/_toggle_successors.html.erb
index 1d752488..089d3821 100644
--- a/app/views/todos/_toggle_successors.html.erb
+++ b/app/views/todos/_toggle_successors.html.erb
@@ -1,10 +1,10 @@
+<% item = toggle_successors %>
<%= link_to(image_tag( 'blank.png', :width=>'16', :height=>'16', :border=>'0' ), "#", {:class => 'show_successors', :title => 'Show successors'}) %>
<%= render :partial => "todos/successor",
:collection => item.pending_successors,
- :locals => { :todo => item,
- :parent_container_type => parent_container_type,
+ :locals => { :parent_container_type => parent_container_type,
:suppress_dependencies => true,
:predecessor => item }
%>
diff --git a/app/views/todos/error.js.erb b/app/views/todos/error.js.erb
index b300ea67..71036e4d 100644
--- a/app/views/todos/error.js.erb
+++ b/app/views/todos/error.js.erb
@@ -1 +1,4 @@
-page.notify :error, @error_message || t('common.server_error'), 8.0
\ No newline at end of file
+<%
+# TODO: is this ever called?
+-%>
+TracksPages.page_notify('error', "<%=@error_message || t('common.server_error')%>", 8);
diff --git a/app/views/todos/index.html.erb b/app/views/todos/index.html.erb
index 2bca0603..41060304 100644
--- a/app/views/todos/index.html.erb
+++ b/app/views/todos/index.html.erb
@@ -6,10 +6,11 @@
<% unless @done.nil? -%>
<%= render(
:partial => "todos/completed",
- :locals => { :done => @done, :collapsible => true, :append_descriptor => nil }) -%>
+ :object => @done,
+ :locals => { :collapsible => true, :append_descriptor => nil }) -%>
<% end -%>
<%= render :partial => "shared/add_new_item_form" %>
- <%= render :template => "sidebar/sidebar.html.erb" %>
+ <%= render :file => "sidebar/sidebar.html.erb" %>
\ No newline at end of file
diff --git a/app/views/todos/tag.html.erb b/app/views/todos/tag.html.erb
index 641dc164..f0886bb2 100644
--- a/app/views/todos/tag.html.erb
+++ b/app/views/todos/tag.html.erb
@@ -1,5 +1,5 @@
-
>
+
>
<%= t('todos.no_actions_found')%>
<%= t('todos.no_actions_with', :tag_name=>@tag_name) %>
@@ -18,12 +18,12 @@
<% end -%>
<% unless @hidden_todos.nil? -%>
- <%= render :partial => "todos/hidden", :locals => { :hidden => @hidden_todos, :collapsible => true, :append_descriptor => t('todos.tagged_with', :tag_name => @tag_name) } %>
+ <%= render :partial => "todos/hidden", :object => @hidden_todos, :locals => { :collapsible => true, :append_descriptor => t('todos.tagged_with', :tag_name => @tag_name) } %>
<% end -%>
<% unless @done.nil? -%>
- <%= render :partial => "todos/completed",
- :locals => { :done => @done, :collapsible => true, :append_descriptor => t('todos.tagged_with', :tag_name => @tag_name) } %>
+ <%= render :partial => "todos/completed", :object => @done,
+ :locals => { :collapsible => true, :append_descriptor => t('todos.tagged_with', :tag_name => @tag_name) } %>
<% end -%>
diff --git a/app/views/todos/toggle_check.js.erb b/app/views/todos/toggle_check.js.erb
index bdae4211..ae4130c3 100644
--- a/app/views/todos/toggle_check.js.erb
+++ b/app/views/todos/toggle_check.js.erb
@@ -1,72 +1,133 @@
-if @saved
- page[@todo].remove
- page.show "empty_"+@original_item_due_id if @old_due_empty
- if @todo.completed?
+<% if !@saved -%>
+ TracksPages.page_notify('error', "Could not mark this todo complete", 5);
+<% else -%>
+ <% if @wants_redirect_after_complete -%>
+ redirect_after_complete();
+ <% else
+ animation = []
+ animation << "remove_todo"
+ if @todo.completed?
+ animation << "add_to_completed_container"
+ animation << "add_new_recurring_todo"
+ animation << "activate_pending_todos"
+ animation << "remove_source_container"
+ else
+ animation << "add_todo_to_context"
+ animation << "block_predecessors"
+ end -%>
+ <%= render_animation(animation) %>
+ TracksPages.set_page_badge(<%= @down_count %>);
+ <% end -%>
+<% end -%>
- # completed todos move from their context to the completed container
- unless @prefs.hide_completed_actions?
- page.insert_html :top, "completed_containeritems", :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => "completed" }
- page.visual_effect :highlight, dom_id(@todo, 'line'), {'startcolor' => "'#99ff99'"}
- page[empty_container_msg_div_id].show if @down_count == 0 && !empty_container_msg_div_id.nil?
- page.show 'tickler-empty-nd' if source_view_is(:project) && @deferred_count == 0 && @pending_count == 0
- page.hide 'empty-d' # If we've checked something as done, completed items can't be empty
- end
- # Activate pending todos that are successors of the completed
- @pending_to_activate.each do |t|
- logger.debug "#300: Removing #{t.description} from pending block and adding it to active"
- page[t].remove if source_view_is(:project) or source_view_is(:tag)
- page.insert_html :bottom, item_container_id(t), :partial => 'todos/todo', :locals => { :todo => t, :parent_container_type => parent_container_type }
- page.visual_effect :highlight, dom_id(t, 'line'), {'startcolor' => "'#99ff99'"}
- end
-
- # remove container if empty
- if @remaining_in_context == 0 && source_view_is_one_of(:todo, :tag)
- page.visual_effect :fade, "c"+@todo.context.id.to_s, :duration => 0.4
- end
+function redirect_after_complete() {
+ redirect_to("<%= project_path(@todo.project) -%>");
+}
- if @original_item_was_deferred && source_view_is(:tag)
- # we go from the deferred container to the completed container in tag view
- # check for empty message
- page['tickler-empty-nd'].show if @deferred_tag_count == 0
- end
+function remove_todo(next_steps) {
+ $('#<%= dom_id(@todo) %>').fadeOut(400, function() {
+ $('#<%= dom_id(@todo) %>').remove();
+ <%= show_empty_message_in_source_container -%>
+ next_steps.go();
+ });
+}
- # show new todo if the completed todo was recurring
+function add_to_completed_container(next_steps) {
+ <% unless current_user.prefs.hide_completed_actions? -%>
+ $('#<%= item_container_id(@todo) %>').append(html_for_todo());
+ $("#empty-d").slideUp(100);
+ highlight_updated_todo(next_steps);
+ <% end -%>
+}
+
+function add_todo_to_context(next_steps) {
+ $('#<%= item_container_id(@todo) %>').append(html_for_todo());
+ $('#c<%= @todo.context_id %>').fadeIn(500, function() {
+ highlight_updated_todo(next_steps);
+ <%= show_empty_message_in_source_container -%>
+ });
+}
+
+function add_new_recurring_todo(next_steps) {
+ <% # show new todo if the completed todo was recurring
if @todo.from_recurring_todo?
- unless @new_recurring_todo.nil? || @new_recurring_todo.deferred?
- page.call "todoItems.ensureVisibleWithEffectAppear", item_container_id(@new_recurring_todo)
- page.insert_html :bottom, item_container_id(@new_recurring_todo), :partial => 'todos/todo', :locals => { :todo => @new_recurring_todo, :parent_container_type => parent_container_type }
- page.visual_effect :highlight, dom_id(@new_recurring_todo, 'line'), {'startcolor' => "'#99ff99'"}
- else
- if @todo.recurring_todo.todos.active.count == 0
- page.notify :notice, t('todos.recurrence_completed'), 6.0 if @new_recurring_todo.nil?
- end
+ unless @new_recurring_todo.nil? || @new_recurring_todo.deferred? -%>
+ $('#<%= item_container_id(@new_recurring_todo) %>').append(html_for_recurring_todo());
+ $('#c<%= @new_recurring_todo.context_id %>').fadeIn(500, function() {
+ highlight_updated_recurring_todo(next_steps);
+ });
+ <% else
+ if @todo.recurring_todo.todos.active.count == 0 && @new_recurring_todo.nil? -%>
+ TracksPages.page_notify('notice', "<%=t('todos.recurrence_completed')%>", 6);
+ <% end
end
- end
-
- else
- # todo is activated from completed container
- page.call "todoItems.ensureVisibleWithEffectAppear", item_container_id(@todo)
- page.insert_html :bottom, item_container_id(@todo), :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => parent_container_type }
- page.visual_effect :highlight, dom_id(@todo, 'line'), {'startcolor' => "'#99ff99'"}
- page.show "empty-d" if @completed_count == 0
- page.show "c"+@todo.context.id.to_s
- page[empty_container_msg_div_id].hide unless empty_container_msg_div_id.nil? # If we've checked something as undone, incomplete items can't be empty
- # If active todos are successors of the reactivated todo they will be blocked
- @active_to_block.each do |t|
- logger.debug "#300: Block #{t.description} that are a successor of #{@todo.description}"
- page[t].remove # Remove it from active
- if source_view_is(:project) or source_view_is(:tag) # Insert it in deferred/pending block if existing
- logger.debug "Insert #{t.description} in #{item_container_id(t)} block"
- page.insert_html :bottom, item_container_id(t), :partial => 'todos/todo', :locals => { :todo => t, :parent_container_type => parent_container_type }
- end
- end
- end
-
- page.hide "status"
- page.replace_html "badge_count", @down_count
- if @todo.completed? && !@todo.project_id.nil? && @prefs.show_project_on_todo_done && !source_view_is(:project)
- page.redirect_to project_path(@todo.project_id)
- end
-else
- page.replace_html "status", content_tag("div", content_tag("h2", t(:todo_errors, :count => @todo.errors.count)) + content_tag("p", t('common.errors_with_fields')) + content_tag("ul", @todo.errors.each_full { |msg| content_tag("li", msg) }), "id" => "errorExplanation", "class" => "errorExplanation")
-end
+ end -%>
+}
+
+<% if @new_recurring_todo # hide js if @new_recurring_todo is not there-%>
+function highlight_updated_recurring_todo(next_steps) {
+ highlight_todo('#<%= dom_id(@new_recurring_todo)%>');
+ next_steps.go();
+}
+<% end -%>
+
+function highlight_updated_todo(next_steps) {
+ highlight_todo('#<%= dom_id(@todo)%>');
+ next_steps.go();
+}
+
+function highlight_todo(id) {
+ $(id).effect('highlight', {}, 2000, function(){ });
+}
+
+function activate_pending_todos(next_steps) {
+ <% # Activate pending todos that are successors of the completed
+ if @saved && @pending_to_activate
+ # do not render the js in case of an error or if no todos to activate
+ @pending_to_activate.each do |t|
+ if source_view_is(:project) or source_view_is(:tag) -%>
+ $('#<%= dom_id(t) %>').fadeOut(400, function() {
+ $('#<%= dom_id(t) %>').remove();
+ next_steps.go();
+ });
+ <% end -%>
+ $('#<%= item_container_id(t) %>').append("<%= escape_javascript(render(:partial => 'todos/todo', :locals => { :todo => t, :parent_container_type => parent_container_type }))%>");
+ highlight_todo('#<%= dom_id(t)%>');
+ <% end -%>
+ <% end -%>
+}
+
+function block_predecessors(next_steps) {
+ <% # Activate pending todos that are successors of the completed
+ if @saved && @active_to_block
+ # do not render the js in case of an error or if no todos to block
+ @active_to_block.each do |t| %>
+ $('#<%= dom_id(t) %>').fadeOut(400, function() {
+ $('#<%= dom_id(t) %>').remove();
+ <% if source_view_is(:project) or source_view_is(:tag) # Insert it in deferred/pending block if existing -%>
+ $('#<%= item_container_id(t) %>').append("<%= escape_javascript(render(:partial => 'todos/todo', :locals => { :todo => t, :parent_container_type => parent_container_type }))%>");
+ highlight_todo('#<%= dom_id(t)%>');
+ <% end -%>
+ });
+ <% end -%>
+ next_steps.go();
+ <% end -%>
+}
+
+function remove_source_container(next_steps) {
+ <% if (@remaining_in_context == 0 && source_view_is_one_of(:todo, :tag))
+ # remove context with deleted todo
+ -%>
+ $('#c<%=@todo.context_id%>').fadeOut(1000, function() {
+ next_steps.go();
+ });
+ <% end %>
+}
+
+function html_for_todo() {
+ return "<%= @saved ? escape_javascript(render(:partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => "completed" })) : "" %>";
+}
+
+function html_for_recurring_todo() {
+ return "<%= @saved ? escape_javascript(render(:partial => 'todos/todo', :locals => { :todo => @new_recurring_todo, :parent_container_type => parent_container_type })) : "" %>";
+}
\ No newline at end of file
diff --git a/app/views/todos/update.js.erb b/app/views/todos/update.js.erb
index 26c63ad7..dcce8554 100644
--- a/app/views/todos/update.js.erb
+++ b/app/views/todos/update.js.erb
@@ -15,11 +15,12 @@
end
animation << "hide_context" if update_needs_to_hide_context
animation << "highlight_updated_todo"
+ animation << "update_empty_tag_container" if source_view_is(:tag)
%>
<%= render_animation(animation) %>
TracksPages.page_notify('notice', '<%=@status_message%>', 5);
- update_badge_count();
+ TracksPages.set_page_badge(<%= @down_count %>);
<% end %>
function remove_todo(next_steps) {
@@ -65,7 +66,16 @@ function hide_context(next_steps) {
}
function highlight_updated_todo(next_steps) {
- $('#<%= dom_id(@todo)%>').effect('highlight', {}, 2000, function(){ next_steps.go(); });
+ $('#<%= dom_id(@todo)%>').effect('highlight', {}, 2000, function(){ });
+ next_steps.go();
+}
+
+function update_empty_tag_container(next_steps) {
+ <% if @down_count==0 -%>
+ $('#no_todos_in_tag_view').slideDown(400, function(){ next_steps.go(); });
+ <% else -%>
+ $('#no_todos_in_tag_view').fadeOut(100, function(){ next_steps.go(); });
+ <% end -%>
}
function update_badge_count() {
diff --git a/config/environments/cucumber.rb b/config/environments/cucumber.rb
index d5b79a26..8517416d 100644
--- a/config/environments/cucumber.rb
+++ b/config/environments/cucumber.rb
@@ -21,6 +21,7 @@ config.action_controller.allow_forgery_protection = false
# ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test
+config.gem 'cucumber', :lib => false, :version => '=0.9.8' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
config.gem 'cucumber-rails', :lib => false, :version => '>=0.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
config.gem 'database_cleaner', :lib => false, :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
config.gem 'webrat', :lib => false, :version => '>=0.7.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
\ No newline at end of file
diff --git a/config/environments/selenium.rb b/config/environments/selenium.rb
index 1d3df9be..10eb9aa0 100644
--- a/config/environments/selenium.rb
+++ b/config/environments/selenium.rb
@@ -24,8 +24,6 @@ config.action_mailer.delivery_method = :test
# Unique cookies
config.action_controller.session = { :key => 'TracksSelenium' }
-config.gem 'cucumber-rails', :lib => false, :version => '>=0.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
config.gem 'database_cleaner', :lib => false, :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
-config.gem 'webrat', :lib => false, :version => '>=0.7.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
config.gem 'selenium-client', :lib => false unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium-client'))
config.gem 'mongrel' # required by webrat for selenium
\ No newline at end of file
diff --git a/config/environments/test.rb b/config/environments/test.rb
index b312cf72..b57e2069 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -40,6 +40,5 @@ config.gem "ZenTest", :lib => "zentest", :version => ">=4.0.0"
config.gem "hpricot"
config.gem "hoe"
config.gem 'webrat', :lib => false, :version => '>=0.7.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
-config.gem 'rspec', :lib => false, :version => '=2.2.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
-config.gem 'rspec-rails', :lib => false, :version => '<2.2.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
+config.gem 'rspec-rails', :lib => false, :version => '<2.1.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
config.gem "factory_girl", :lib => "factory_girl", :source => "http://gems.github.com"
diff --git a/features/project_edit.feature b/features/project_edit.feature
index cdb43ba5..bd94e04d 100644
--- a/features/project_edit.feature
+++ b/features/project_edit.feature
@@ -94,6 +94,9 @@ Feature: Edit a project
Scenario: Moving the todo out of the tickler will move todo to active container
Given this scenario is pending
+ Scenario: Making all todos inactive will show empty message
+ Given this scenario is pending # empty message is in separate container
+
# Ticket #1043
@selenium @wip
Scenario: I can move a todo out of the current project
diff --git a/lib/login_system.rb b/lib/login_system.rb
index 9a513f04..4d4be7ca 100644
--- a/lib/login_system.rb
+++ b/lib/login_system.rb
@@ -124,9 +124,8 @@ module LoginSystem
def get_current_user
if @user.nil? && session['user_id']
- @user = User.find(session['user_id'], :include => [:preference])
+ @user = User.find(session['user_id'])
end
- @prefs = @user.prefs unless @user.nil?
@user
end
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 9fb7682f..3aa5408d 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -361,6 +361,14 @@ var TodoItems = {
return false;
});
+ $(".item-container a.icon_defer_item").live('click', function(ev){
+ if ($(this).attr("x_defer_alert") == "true")
+ alert ($(this).attr("x_defer_date_after_due_date"));
+ else
+ put_with_ajax_and_block_element(this.href, $(this));
+ return false;
+ });
+
}
}
diff --git a/spec/views/notes/_notes.rhtml_spec.rb b/spec/views/notes/_notes.rhtml_spec.rb
index 4644163b..477e66b5 100644
--- a/spec/views/notes/_notes.rhtml_spec.rb
+++ b/spec/views/notes/_notes.rhtml_spec.rb
@@ -12,21 +12,21 @@ describe "/notes/_notes.rhtml" do
it "should render" do
pending "figure out how to mock or work with with UJS"
- render :partial => "/notes/notes", :locals => {:notes => @note}
+ render :partial => "/notes/notes", :object => @note
response.should have_tag("div.note_footer")
end
it "should auto-link URLs" do
pending "figure out how to mock or work with with UJS"
@note.stub!(:body).and_return("http://www.google.com/")
- render :partial => "/notes/notes", :locals => {:notes => @note}
+ render :partial => "/notes/notes", :object => @note
response.should have_tag("a[href=\"http://www.google.com/\"]")
end
it "should auto-link embedded URLs" do
pending "figure out how to mock or work with with UJS"
@note.stub!(:body).and_return("this is cool: http://www.google.com/")
- render :partial => "/notes/notes", :locals => {:notes => @note}
+ render :partial => "/notes/notes", :object => @note
response.should have_tag("a[href=\"http://www.google.com/\"]")
end
diff --git a/spec/views/todos/_toggle_notes.rhtml_spec.rb b/spec/views/todos/_toggle_notes.rhtml_spec.rb
index d768c1e4..9553e74f 100644
--- a/spec/views/todos/_toggle_notes.rhtml_spec.rb
+++ b/spec/views/todos/_toggle_notes.rhtml_spec.rb
@@ -9,25 +9,25 @@ describe "/todos/_toggle_notes.rhtml" do
end
it "should render" do
- render :partial => "/todos/toggle_notes", :locals => {:item => @item}
+ render :partial => "/todos/toggle_notes", :object => @item
response.should have_tag("div.todo_notes")
end
it "should auto-link URLs" do
@item.stub!(:notes).and_return("http://www.google.com/")
- render :partial => "/todos/toggle_notes", :locals => {:item => @item}
+ render :partial => "/todos/toggle_notes", :object => @item
response.should have_tag("a[href=\"http://www.google.com/\"]")
end
it "should auto-link embedded URLs" do
@item.stub!(:notes).and_return("this is cool: http://www.google.com/")
- render :partial => "/todos/toggle_notes", :locals => {:item => @item}
+ render :partial => "/todos/toggle_notes", :object => @item
response.should have_tag("a[href=\"http://www.google.com/\"]")
end
it "should parse Textile URLs correctly" do
@item.stub!(:notes).and_return("\"link\":http://www.google.com/")
- render :partial => "/todos/toggle_notes", :locals => {:item => @item}
+ render :partial => "/todos/toggle_notes", :object => @item
response.should have_tag("a[href=\"http://www.google.com/\"]")
end
end
diff --git a/test/functional/preferences_controller_test.rb b/test/functional/preferences_controller_test.rb
index e7a6cc2a..08bccc04 100644
--- a/test/functional/preferences_controller_test.rb
+++ b/test/functional/preferences_controller_test.rb
@@ -33,7 +33,6 @@ class PreferencesControllerTest < ActionController::TestCase
get :edit
assert_response :success
assert_equal assigns['page_title'], "TRACKS::Edit Preferences"
- assert_not_nil assigns['prefs']
assert_template 'preferences/edit'
end
diff --git a/test/functional/recurring_todos_controller_test.rb b/test/functional/recurring_todos_controller_test.rb
index ebe64ed0..506281a0 100644
--- a/test/functional/recurring_todos_controller_test.rb
+++ b/test/functional/recurring_todos_controller_test.rb
@@ -16,7 +16,6 @@ class RecurringTodosControllerTest < ActionController::TestCase
def test_destroy_recurring_todo
login_as(:admin_user)
xhr :post, :destroy, :id => 1, :_source_view => 'todo'
- assert_rjs :page, "recurring_todo_1", :remove
begin
rc = RecurringTodo.find(1)
rescue
diff --git a/test/functional/todos_controller_test.rb b/test/functional/todos_controller_test.rb
index d4f716e7..aeb075a1 100644
--- a/test/functional/todos_controller_test.rb
+++ b/test/functional/todos_controller_test.rb
@@ -61,16 +61,16 @@ class TodosControllerTest < ActionController::TestCase
def test_deferred_count_for_project_source_view
login_as(:admin_user)
xhr :post, :toggle_check, :id => 5, :_source_view => 'project'
- assert_equal 1, assigns['deferred_count']
+ assert_equal 1, assigns['remaining_deferred_or_pending_count']
xhr :post, :toggle_check, :id => 15, :_source_view => 'project'
- assert_equal 0, assigns['deferred_count']
+ assert_equal 0, assigns['remaining_deferred_or_pending_count']
end
def test_destroy_todo
login_as(:admin_user)
xhr :post, :destroy, :id => 1, :_source_view => 'todo'
- assert_rjs :page, "todo_1", :remove
- # #assert_rjs :replace_html, "badge-count", '9'
+ todo = Todo.find_by_id(1)
+ assert_nil todo
end
def test_create_todo
@@ -91,7 +91,9 @@ class TodosControllerTest < ActionController::TestCase
def test_fail_to_create_todo_via_xml
login_as(:admin_user)
# #try to create with no context, which is not valid
- put :create, :format => "xml", "request" => { "project_name"=>"Build a working time machine", "todo"=>{"notes"=>"", "description"=>"Call Warren Buffet to find out how much he makes per day", "due"=>"30/11/2006"}, "tag_list"=>"foo bar" }
+ put :create, :format => "xml", "request" => {
+ "project_name"=>"Build a working time machine",
+ "todo"=>{"notes"=>"", "description"=>"Call Warren Buffet to find out how much he makes per day", "due"=>"30/11/2006"}, "tag_list"=>"foo bar" }
assert_response 422
assert_xml_select "errors" do
assert_xml_select "error", "Context can't be blank"
@@ -124,9 +126,9 @@ class TodosControllerTest < ActionController::TestCase
def test_update_todo_to_deferred_is_reflected_in_badge_count
login_as(:admin_user)
get :index
- assert_equal 11, assigns['count']
+ assert_equal 10, assigns['count']
xhr :post, :update, :id => 1, :_source_view => 'todo', "context_name"=>"library", "project_name"=>"Make more money than Billy Gates", "todo"=>{"id"=>"1", "notes"=>"", "description"=>"Call Warren Buffet to find out how much he makes per day", "due"=>"30/11/2006", "show_from"=>"30/11/2030"}, "tag_list"=>"foo bar"
- assert_equal 10, assigns['down_count']
+ assert_equal 9, assigns['down_count']
end
def test_update_todo
@@ -311,7 +313,7 @@ class TodosControllerTest < ActionController::TestCase
def test_mobile_index_assigns_down_count
login_as(:admin_user)
get :index, { :format => "m" }
- assert_equal 11, assigns['down_count']
+ assert_equal 10, assigns['down_count']
end
def test_mobile_create_action_creates_a_new_todo