Merge branch 'master' of git://github.com/bsag/tracks

test/functional/backend_controller_test.rb

@@ -5,7 +5,7 @@ require 'backend_controller'
 class BackendController; def rescue_action(e) raise e end; end
 
 class BackendControllerTest < Test::Rails::TestCase
-  fixtures :users, :projects, :contexts, :todos, :notes
+  fixtures :users, :projects, :contexts, :todos, :recurring_todos, :notes
   
   def setup
     @controller = BackendController.new

test/functional/feedlist_controller_test.rb

@@ -5,7 +5,7 @@ require 'feedlist_controller'
 class FeedlistController; def rescue_action(e) raise e end; end
 
 class FeedlistControllerTest < Test::Rails::TestCase
-  fixtures :users, :preferences, :projects, :contexts, :todos, :notes
+  fixtures :users, :preferences, :projects, :contexts, :todos, :recurring_todos, :notes
   
   def setup
     assert_equal "test", ENV['RAILS_ENV']

test/functional/integrations_controller_test.rb

@@ -5,7 +5,7 @@ require 'integrations_controller'
 class IntegrationsController; def rescue_action(e) raise e end; end
 
 class IntegrationsControllerTest < Test::Unit::TestCase
-  fixtures :users, :preferences, :projects, :contexts, :todos, :tags, :taggings
+  fixtures :users, :preferences, :projects, :contexts, :todos, :recurring_todos, :tags, :taggings
 
   def setup
     @controller = IntegrationsController.new

test/functional/projects_controller_test.rb

@@ -6,7 +6,7 @@ require 'projects_controller'
 class ProjectsController; def rescue_action(e) raise e end; end
 
 class ProjectsControllerTest < TodoContainerControllerTestBase
-  fixtures :users, :todos, :preferences, :projects, :contexts
+  fixtures :users, :todos, :preferences, :projects, :contexts, :recurring_todos
   
   def setup
     perform_setup(Project, ProjectsController)

test/functional/stats_controller_test.rb

@@ -5,7 +5,7 @@ require 'stats_controller'
 class StatsController; def rescue_action(e) raise e end; end
 
 class StatsControllerTest < Test::Unit::TestCase
-  fixtures :users, :preferences, :projects, :contexts, :todos, :tags, :taggings
+  fixtures :users, :preferences, :projects, :contexts, :todos, :recurring_todos, :recurring_todos, :tags, :taggings
   
   def setup
     @controller = StatsController.new
@@ -99,10 +99,7 @@ class StatsControllerTest < Test::Unit::TestCase
     assert_response :success
 
     # clear taggings table and render again
-    taggings = Tagging.find(:all)
-    taggings.each do |t|
-      t.delete
-    end
+    Tagging.delete_all
     get :index
     assert_response :success
 

test/functional/todos_controller_test.rb

@@ -94,7 +94,7 @@ class TodosControllerTest < Test::Rails::TestCase
     assert_difference Todo, :count do
       xml = "<todo><description>Call Warren Buffet to find out how much he makes per day</description><project_id>#{projects(:timemachine).id}</project_id><context_id>#{contexts(:agenda).id}</context_id><show-from type=\"datetime\">#{1.week.from_now.xmlschema}</show-from></todo>"
 
-      #p parse_xml_body(xml)
+      # p parse_xml_body(xml)
       post :create, parse_xml_body(xml).update(:format => "xml")
       assert_response :created
     end
@@ -505,4 +505,20 @@ class TodosControllerTest < Test::Rails::TestCase
     assert next_todo.due > @todo.due
   end
 
+  def test_removing_hidden_project_activates_todo
+    login_as(:admin_user)
+
+    # get a project and hide it, todos in the project should be hidden
+    p = projects(:timemachine)
+    p.hide!
+    assert p.reload().hidden?
+    todo = p.todos.first
+    assert_equal "project_hidden", todo.state
+
+    # clear project from todo: the todo should be unhidden
+    xhr :post, :update, :id => 5, :_source_view => 'todo', "project_name"=>"None", "todo"=>{}
+    todo.reload()
+    assert_equal "active", todo.state
+  end
+
 end

test/integration/feed_smoke_test.rb

@@ -9,7 +9,7 @@ class ContextsController; def rescue_action(e) raise e end; end
 class TodosController; def rescue_action(e) raise e end; end
 
 class FeedSmokeTest < ActionController::IntegrationTest
-  fixtures :users, :preferences, :projects, :contexts, :todos, :notes
+  fixtures :users, :preferences, :projects, :contexts, :todos, :recurring_todos, :notes
 
   def setup
     assert_test_environment_ok

test/integration/stories_test.rb

@@ -1,7 +1,7 @@
 require "#{File.dirname(__FILE__)}/../test_helper"
 
 class StoriesTest < ActionController::IntegrationTest
-  fixtures :users, :preferences, :projects, :contexts, :todos, :notes
+  fixtures :users, :preferences, :projects, :contexts, :todos, :recurring_todos, :notes
   
   def setup
     assert_test_environment_ok

test/unit/context_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class ContextTest < Test::Rails::TestCase
-  fixtures :contexts, :todos, :users, :preferences
+  fixtures :contexts, :todos, :recurring_todos, :users, :preferences
 
   def setup
     @agenda = contexts(:agenda)

test/unit/project_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class ProjectTest < Test::Rails::TestCase
-  fixtures :projects, :contexts, :todos, :users, :preferences
+  fixtures :projects, :contexts, :todos, :recurring_todos, :users, :preferences
   
   def setup
     @timemachine = projects(:timemachine)

test/unit/todo_test.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 require 'date'
 
 class TodoTest < Test::Rails::TestCase
-  fixtures :todos, :users, :contexts, :preferences, :tags, :taggings
+  fixtures :todos, :recurring_todos, :users, :contexts, :preferences, :tags, :taggings
 
   def setup
     @not_completed1 = Todo.find(1).reload

test/unit/user_test.rb

@@ -17,7 +17,7 @@ class SimpleLdapAuthenticator
 end
 
 class UserTest < Test::Rails::TestCase
-  fixtures :users, :preferences, :projects, :contexts, :todos
+  fixtures :users, :preferences, :projects, :contexts, :todos, :recurring_todos
 
   def setup
     assert_equal "test", ENV['RAILS_ENV']