comparison test/functional/activities_controller_test.rb @ 1115:433d4f72a19b redmine-2.2

Update to Redmine SVN revision 11137 on 2.2-stable branch

            :member_roles,
            :members,
            :groups_users,
            :enabled_modules,
            :workflows,
-           :auth_sources,
            :journals, :journal_details
 
 
   def test_project_index
     get :index, :id => 1, :with_subprojects => 0

                :content => /#{3.day.ago.to_date.day}/,
                :sibling => { :tag => "dl",
                  :child => { :tag => "dt",
                    :attributes => { :class => /issue/ },
                    :child => { :tag => "a",
-                     :content => /#{Issue.find(1).subject}/,
+                     :content => /Can't print recipes/,
                    }
                  }
                }
   end
 
   def test_global_index
+    @request.session[:user_id] = 1
     get :index
     assert_response :success
     assert_template 'index'
     assert_not_nil assigns(:events_by_day)
 
+    i5 = Issue.find(5)
+    d5 = User.find(1).time_to_date(i5.created_on)
     assert_tag :tag => "h3",
-               :content => /#{5.day.ago.to_date.day}/,
+               :content => /#{d5.day}/,
                :sibling => { :tag => "dl",
                  :child => { :tag => "dt",
                    :attributes => { :class => /issue/ },
                    :child => { :tag => "a",
-                     :content => /#{Issue.find(5).subject}/,
+                     :content => /Subproject issue/,
                    }
                  }
                }
   end
 
   def test_user_index
+    @request.session[:user_id] = 1
     get :index, :user_id => 2
     assert_response :success
     assert_template 'index'
     assert_not_nil assigns(:events_by_day)
 
+    assert_select 'h2 a[href=/users/2]', :text => 'John Smith'
+
+    i1 = Issue.find(1)
+    d1 = User.find(1).time_to_date(i1.created_on)
+
     assert_tag :tag => "h3",
-               :content => /#{3.day.ago.to_date.day}/,
+               :content => /#{d1.day}/,
                :sibling => { :tag => "dl",
                  :child => { :tag => "dt",
                    :attributes => { :class => /issue/ },
                    :child => { :tag => "a",
-                     :content => /#{Issue.find(1).subject}/,
+                     :content => /Can't print recipes/,
                    }
                  }
                }
   end
 

     get :index, :user_id => 299
     assert_response 404
   end
 
   def test_index_atom_feed
-    get :index, :format => 'atom'
+    get :index, :format => 'atom', :with_subprojects => 0
     assert_response :success
-    assert_template 'common/feed.atom'
+    assert_template 'common/feed'
+
+    assert_tag :tag => 'link', :parent =>  {:tag => 'feed', :parent => nil },
+        :attributes => {:rel => 'self', :href => 'http://test.host/activity.atom?with_subprojects=0'}
+    assert_tag :tag => 'link', :parent =>  {:tag => 'feed', :parent => nil },
+        :attributes => {:rel => 'alternate', :href => 'http://test.host/activity?with_subprojects=0'}
+
+    assert_tag :tag => 'entry', :child => {
+      :tag => 'link',
+      :attributes => {:href => 'http://test.host/issues/11'}}
+  end
+
+  def test_index_atom_feed_with_explicit_selection
+    get :index, :format => 'atom', :with_subprojects => 0,
+      :show_changesets => 1,
+      :show_documents => 1,
+      :show_files => 1,
+      :show_issues => 1,
+      :show_messages => 1,
+      :show_news => 1,
+      :show_time_entries => 1,
+      :show_wiki_edits => 1
+
+    assert_response :success
+    assert_template 'common/feed'
+
+    assert_tag :tag => 'link', :parent =>  {:tag => 'feed', :parent => nil },
+        :attributes => {:rel => 'self', :href => 'http://test.host/activity.atom?show_changesets=1&show_documents=1&show_files=1&show_issues=1&show_messages=1&show_news=1&show_time_entries=1&show_wiki_edits=1&with_subprojects=0'}
+    assert_tag :tag => 'link', :parent => {:tag => 'feed', :parent => nil },
+        :attributes => {:rel => 'alternate', :href => 'http://test.host/activity?show_changesets=1&show_documents=1&show_files=1&show_issues=1&show_messages=1&show_news=1&show_time_entries=1&show_wiki_edits=1&with_subprojects=0'}
+
     assert_tag :tag => 'entry', :child => {
       :tag => 'link',
       :attributes => {:href => 'http://test.host/issues/11'}}
   end
 
   def test_index_atom_feed_with_one_item_type
     get :index, :format => 'atom', :show_issues => '1'
     assert_response :success
-    assert_template 'common/feed.atom'
+    assert_template 'common/feed'
     assert_tag :tag => 'title', :content => /Issues/
   end
+
+  def test_index_should_show_private_notes_with_permission_only
+    journal = Journal.create!(:journalized => Issue.find(2), :notes => 'Private notes with searchkeyword', :private_notes => true)
+    @request.session[:user_id] = 2
+
+    get :index
+    assert_response :success
+    assert_include journal, assigns(:events_by_day).values.flatten
+
+    Role.find(1).remove_permission! :view_private_notes
+    get :index
+    assert_response :success
+    assert_not_include journal, assigns(:events_by_day).values.flatten
+  end
 end