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

Merge pull request #4 from u2ix/master

Browse source 
Fixed some tests for 'starred todos'
This commit is contained in:
Reinier Balt 2011-08-07 01:09:26 -07:00
commit 75a9bbe7f4
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/todos_controller.rb
View file

@ -83,7 +83,7 @@ class TodosController < ApplicationController
@todo.context_id = context.id
end
@todo.starred= params[:new_todo_starred].include? "true"
@todo.starred= (params[:new_todo_starred]||"").include? "true"
@todo.add_predecessor_list(predecessor_list)

4
app/models/todo.rb
View file

@ -248,12 +248,12 @@ class Todo < ActiveRecord::Base
end
def toggle_star!
starred=!starred?
self.starred= !starred?
end
def starred=(starred)
if starred
_add_tags(STARRED_TAG_NAME)
_add_tags STARRED_TAG_NAME unless starred?
else
_remove_tags STARRED_TAG_NAME
end

2
app/views/recurring_todos/toggle_star.js.erb
View file

@ -1,5 +1,5 @@
<%- if @saved -%>
$('div#recurring_todo_<%= @recurring_todo.id %> a.star_item img').toggleClass('starred_todo').toggleClass('unstarred_todo');
$('div#recurring_todo_<%= @recurring_todo.id %> a.star_item img').toggleClass('starred');
<%- else -%>
TracksPages.page_notify('error', '<%= t('todos.error_starring_recurring', :description => @recurring_todo.description) %>', 8);
<%- end -%>

2
test/views/todos_helper_test.rb
View file

@ -63,7 +63,7 @@ class TodosHelperTest < ActiveSupport::HelperTestCase
def test_remote_star_icon_unstarred
@todo = flexmock(:id => 1, :to_param => 1, :description => 'Get gas', :starred? => false)
# added dot (.) to regexp because somehouw the extra dot is added in the tests while its not in the rendered html
assert_remote_star_icon_helper_matches %r{<a href="/todos/1/toggle_star" class="icon star_item" title="star the action 'Get gas'"><img alt="Blank" class="unstarred_todo" src="/images/blank.png[.?0-9]*" title="Star action" /></a>}
assert_remote_star_icon_helper_matches %r{<a href="/todos/1/toggle_star" class="icon star_item" title="star the action 'Get gas'"><img alt="Blank" class="todo_star" src="/images/blank.png[.?0-9]*" title="Star action" /></a>}
assert_behavior_registered
end