Activity refactoring.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1701 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/functional/projects_controller_test.rb

@@ -153,10 +153,6 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'activity'
     assert_not_nil assigns(:events_by_day)
-    assert_not_nil assigns(:events)
-
-    # subproject issue not included by default
-    assert !assigns(:events).include?(Issue.find(5))
     
     assert_tag :tag => "h3", 
                :content => /#{2.days.ago.to_date.day}/,
@@ -168,7 +164,9 @@ class ProjectsControllerTest < Test::Unit::TestCase
                    }
                  }
                }
-               
+  end
+  
+  def test_previous_project_activity
     get :activity, :id => 1, :from => 3.days.ago.to_date
     assert_response :success
     assert_template 'activity'
@@ -186,53 +184,24 @@ class ProjectsControllerTest < Test::Unit::TestCase
                }
   end
   
-  def test_activity_with_subprojects
-    get :activity, :id => 1, :with_subprojects => 1
-    assert_response :success
-    assert_template 'activity'
-    assert_not_nil assigns(:events)
-    
-    assert assigns(:events).include?(Issue.find(1))
-    assert !assigns(:events).include?(Issue.find(4))
-    # subproject issue
-    assert assigns(:events).include?(Issue.find(5))
-  end
-  
-  def test_global_activity_anonymous
+  def test_global_activity
     get :activity
     assert_response :success
     assert_template 'activity'
-    assert_not_nil assigns(:events)
+    assert_not_nil assigns(:events_by_day)
     
-    assert assigns(:events).include?(Issue.find(1))
-    # Issue of a private project
-    assert !assigns(:events).include?(Issue.find(4))
+    assert_tag :tag => "h3", 
+               :content => /#{5.day.ago.to_date.day}/,
+               :sibling => { :tag => "dl",
+                 :child => { :tag => "dt",
+                   :attributes => { :class => /issue/ },
+                   :child => { :tag => "a",
+                     :content => /#{Issue.find(5).subject}/,
+                   }
+                 }
+               }
   end
   
-  def test_global_activity_logged_user
-    @request.session[:user_id] = 2 # manager
-    get :activity
-    assert_response :success
-    assert_template 'activity'
-    assert_not_nil assigns(:events)
-    
-    assert assigns(:events).include?(Issue.find(1))
-    # Issue of a private project the user belongs to
-    assert assigns(:events).include?(Issue.find(4))
-  end
-
-  
-  def test_global_activity_with_all_types
-    get :activity, :show_issues => 1, :show_news => 1, :show_files => 1, :show_documents => 1, :show_changesets => 1, :show_wiki_pages => 1, :show_messages => 1
-    assert_response :success
-    assert_template 'activity'
-    assert_not_nil assigns(:events)
-    
-    assert assigns(:events).include?(Issue.find(1))
-    assert !assigns(:events).include?(Issue.find(4))
-    assert assigns(:events).include?(Message.find(5))
-  end
-
   def test_calendar
     get :calendar, :id => 1
     assert_response :success

test/unit/activity_test.rb

@@ -0,0 +1,71 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ActivityTest < Test::Unit::TestCase
+  fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details,
+           :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages
+
+  def setup
+    @project = Project.find(1)
+  end
+  
+  def test_activity_without_subprojects
+    events = find_events(User.anonymous, :project => @project)
+    assert_not_nil events
+    
+    assert events.include?(Issue.find(1))
+    assert !events.include?(Issue.find(4))
+    # subproject issue
+    assert !events.include?(Issue.find(5))
+  end
+
+  def test_activity_with_subprojects
+    events = find_events(User.anonymous, :project => @project, :with_subprojects => 1)
+    assert_not_nil events
+    
+    assert events.include?(Issue.find(1))
+    # subproject issue
+    assert events.include?(Issue.find(5))
+  end
+  
+  def test_global_activity_anonymous
+    events = find_events(User.anonymous)
+    assert_not_nil events
+    
+    assert events.include?(Issue.find(1))
+    assert events.include?(Message.find(5))
+    # Issue of a private project
+    assert !events.include?(Issue.find(4))
+  end
+  
+  def test_global_activity_logged_user
+    events = find_events(User.find(2)) # manager
+    assert_not_nil events
+    
+    assert events.include?(Issue.find(1))
+    # Issue of a private project the user belongs to
+    assert events.include?(Issue.find(4))
+  end
+  
+  private
+  
+  def find_events(user, options={})
+    Redmine::Activity::Fetcher.new(user, options).events(Date.today - 30, Date.today + 1)
+  end
+end