Merge branch 'stable' into noosfero_0.47.0

Conflicts: app/controllers/public/content_viewer_controller.rb features/categories_block.feature po/eo/noosfero.po po/es/noosfero.po po/it/noosfero.po test/unit/block_test.rb

Merge branch 'stable' into noosfero_0.47.0
Conflicts: app/controllers/public/content_viewer_controller.rb features/categories_block.feature po/eo/noosfero.po po/es/noosfero.po po/it/noosfero.po test/unit/block_test.rb
Rodrigo Souto
2 parents 8711e17a e137c34d
Showing 29 changed files with 306 additions and 186 deletions Show diff stats
app/controllers/public/content_viewer_controller.rb
app/controllers/public/events_controller.rb
app/controllers/public/search_controller.rb
app/models/block.rb
app/models/event.rb
app/models/members_block.rb
app/views/events/_events.rhtml
app/views/shared/block.rhtml
features/balloon.feature
features/categories_block.feature
features/comment.feature
features/events.feature
features/short_filename.feature
lib/feed_handler.rb
lib/file_presenter.rb
lib/tasks/plugins_tests.rake
plugins/anti_spam/lib/anti_spam_plugin/wrapper.rb
plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb
plugins/recent_content/test/unit/recent_content_block_test.rb
po/eo/noosfero.po
@@ -50,7 +50,7 @@ class ContentViewerController &lt; ApplicationController
     end
     # At this point the page will be showed
-    @page.hit
+    @page.hit unless user_is_a_bot?
     @page = FilePresenter.for @page
@@ -174,4 +174,13 @@ class ContentViewerController &lt; ApplicationController
     allowed
   end
+  def user_is_a_bot?
+    user_agent= request.env["HTTP_USER_AGENT"]
+    user_agent.blank? ||
+    user_agent.match(/bot/) ||
+    user_agent.match(/spider/) ||
+    user_agent.match(/crawler/) ||
+    user_agent.match(/\(.*https?:\/\/.*\)/)
+  end
+
 end
@@ -7,11 +7,11 @@ class EventsController &lt; PublicController
     @date = build_date(params[:year], params[:month], params[:day])
     if !params[:year] && !params[:month] && !params[:day]
-      @events = profile.events.next_events_from_month(@date)
+      @events = profile.events.next_events_from_month(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     if params[:year] || params[:month]
-      @events = profile.events.by_month(@date)
+      @events = profile.events.by_month(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     events_in_range = profile.events.by_range((@date - 1.month).at_beginning_of_month .. (@date + 1.month).at_end_of_month)
@@ -29,4 +29,7 @@ class EventsController &lt; PublicController
   include EventsHelper
+  def per_page
+    20
+  end
 end
@@ -99,14 +99,14 @@ class SearchController &lt; PublicController
     @events = []
     if params[:day] || !params[:year] && !params[:month]
       @events = @category ?
-        environment.events.by_day(@date).in_category(Category.find(@category_id)) :
-        environment.events.by_day(@date)
+        environment.events.by_day(@date).in_category(Category.find(@category_id)).paginate(:per_page => per_page, :page => params[:page]) :
+        environment.events.by_day(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     if params[:year] || params[:month]
       @events = @category ?
-        environment.events.by_month(@date).in_category(Category.find(@category_id)) :
-        environment.events.by_month(@date)
+        environment.events.by_month(@date).in_category(Category.find(@category_id)).paginate(:per_page => per_page, :page => params[:page]) :
+        environment.events.by_month(@date).paginate(:per_page => per_page, :page => params[:page])
     end
     @scope = date_range && params[:action] == 'events' ? environment.events.by_range(date_range) : environment.events
@@ -139,7 +139,7 @@ class SearchController &lt; PublicController
   def events_by_day
     @date = build_date(params[:year], params[:month], params[:day])
-    @events = environment.events.by_day(@date)
+    @events = environment.events.by_day(@date).paginate(:per_page => per_page, :page => params[:page])
     render :partial => 'events/events'
   end
@@ -224,4 +224,8 @@ class SearchController &lt; PublicController
     @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
   end
+  def per_page
+    20
+  end
+
 end
@@ -141,7 +141,7 @@ class Block &lt; ActiveRecord::Base
   end
   alias :active_record_cache_key :cache_key
-  def cache_key(language='en')
+  def cache_key(language='en', user=nil)
     active_record_cache_key+'-'+language
   end
@@ -38,15 +38,12 @@ class Event &lt; Article
   named_scope :next_events_from_month, lambda { |date|
     date_temp = date.strftime("%Y-%m-%d")
     { :conditions => ["start_date >= ?","#{date_temp}"],
-      :limit => 10,
       :order => 'start_date ASC'
     }
   }
   named_scope :by_month, lambda { |date|
-    date_temp = date.strftime("%Y-%m")
     { :conditions => ["EXTRACT(YEAR FROM start_date) = ? AND EXTRACT(MONTH FROM start_date) = ?",date.year,date.month],
-      :limit => 10,
       :order => 'start_date ASC'
     }
   }
@@ -36,4 +36,15 @@ class MembersBlock &lt; ProfileListBlock
     }
   end
+  def cache_key(language='en', user=nil)
+    logged = ''
+    if user
+      logged += '-logged-in'
+      if user.is_member_of? self.owner
+        logged += '-member'
+      end
+    end
+    super + logged
+  end
+
 end
-<%= list_events(@date, @events) %>
 \ No newline at end of file
+<%= list_events(@date, @events) %>
+
+<%= pagination_links @events, :param_name => 'page' %>
 <% if block.cacheable? && use_cache %>
-  <% cache_timeout(block.cache_key(language), block.timeout) do %>
+  <% cache_timeout(block.cache_key(language, user), block.timeout) do %>
     <%= display_block_content(block, user, main_content) %>
   <% end %>
 <% else %>
@@ -8,6 +8,7 @@ Feature: balloon
     And the following communities
       | identifier | name      |
       | sample     | Sample    |
+    And I am logged in as "joaosilva"
   @selenium
   Scenario: I should not see trigger if not enabled
@@ -24,6 +24,8 @@ Feature: categories_block
       | owner       | type          |
       | environment | CategoriesBlock |
     And I am logged in as admin
+    And I go to /admin/environment_design
+    And display ".button-bar"
   # Note that this @ignore-hidden-elements only works for seeing hidden
   # elements. It actually doesn't work for following hidden link or pressing
@@ -31,9 +33,7 @@ Feature: categories_block
   # the link.
   @selenium @ignore-hidden-elements
   Scenario: List just product categories
-    Given I go to /admin/environment_design
-    And display ".categories-block .button-bar"
-    And I follow "Edit" within ".categories-block"
+    Given I follow "Edit" within ".categories-block"
     And I check "Product"
     When I press "Save"
     Then I should see "Food"
@@ -42,11 +42,9 @@ Feature: categories_block
     And "Steak" should not be visible within "span#category-name"
     And "Fiction" should not be visible within "span#category-name"
-  @selenium @ignore-hidden-elements
+  @selenium
   Scenario: Show submenu if it exists
-    Given I go to /admin/environment_design
-    And display ".categories-block .button-bar"
-    And I follow "Edit" within ".categories-block"
+    Given I follow "Edit" within ".categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Food"
@@ -61,11 +59,9 @@ Feature: categories_block
     And I should see "Steak"
     And I should not see "Fiction"
-  @selenium @ignore-hidden-elements
+  @selenium
   Scenario: Show only one submenu per time
-    Given I go to /admin/environment_design
-    And display ".categories-block .button-bar"
-    And I follow "Edit" within ".categories-block"
+    Given I follow "Edit" within ".categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Book"
@@ -73,20 +69,16 @@ Feature: categories_block
     When I follow "block_2_category_2"
     Then I should see "Literature"
-  @selenium @ignore-hidden-elements
+  @selenium
   Scenario: List just general categories
-    Given I go to /admin/environment_design
-    And display ".categories-block .button-bar"
-    And I follow "Edit" within ".categories-block"
+    Given I follow "Edit" within ".categories-block"
     And I check "Generic category"
     When I press "Save"
     Then I should see "Wood"
-  @selenium @ignore-hidden-elements
+  @selenium
   Scenario: List just regions
-    Given I go to /admin/environment_design
-    And display ".categories-block .button-bar"
-    And I follow "Edit" within ".categories-block"
+    Given I follow "Edit" within ".categories-block"
     And I check "Region"
     When I press "Save"
     Then I should see "Bahia"
@@ -39,7 +39,7 @@ Feature: comment
     When I press "Post comment"
     Then I should see "Hey ho, let's go"
-  @selenium
+  @selenium-fixme
   Scenario: redirect to right place after comment a picture
     Given the following files
       | owner   | file      | mime      |
@@ -244,3 +244,38 @@ Feature: events
     Given I am on /profile/josesilva/events/2009/10
     When I follow "Oktoberfest"
     Then I should see "Oktoberfest"
+
+  Scenario: list events paginated for a specific profile for the month
+    Given I am logged in as admin
+    And the following users
+      | login      |
+      | josemanuel |
+    And I am logged in as "josemanuel"
+    And the following events
+      | owner      | name              | start_date |
+      | josemanuel | Event 5           | 2009-10-12 |
+      | josemanuel | Event 3           | 2009-10-15 |
+      | josemanuel | Test Event        | 2009-10-15 |
+      | josemanuel | Oktoberfest       | 2009-10-19 |
+      | josemanuel | WikiSym           | 2009-10-21 |
+      | josemanuel | Free Software     | 2009-10-22 |
+      | josemanuel | Rachel Birthday   | 2009-10-23 |
+      | josemanuel | Manuel Birthday   | 2009-10-24 |
+      | josemanuel | Michelle Birthday | 2009-10-25 |
+      | josemanuel | Lecture Allien 10 | 2009-10-26 |
+      | josemanuel | Lecture Allien 11 | 2009-10-26 |
+      | josemanuel | Lecture Allien 12 | 2009-10-26 |
+      | josemanuel | Lecture Allien 13 | 2009-10-26 |
+      | josemanuel | Lecture Allien 14 | 2009-10-26 |
+      | josemanuel | Lecture Allien 15 | 2009-10-26 |
+      | josemanuel | Lecture Allien 16 | 2009-10-26 |
+      | josemanuel | Lecture Allien 17 | 2009-10-26 |
+      | josemanuel | Lecture Allien 18 | 2009-10-26 |
+      | josemanuel | Lecture Allien 19 | 2009-10-26 |
+      | josemanuel | Lecture Allien 20 | 2009-10-26 |
+      | josemanuel | Party On          | 2009-10-27 |
+
+    When I am on /profile/josemanuel/events/2009/10
+    Then I should not see "Party On" within "#agenda-items"
+    When I follow "Next"
+    Then I should see "Party On" within "#agenda-items"
@@ -1,21 +0,0 @@
-Feature: sitemap
-  As a noosfero user
-  I want to list articles
-
-  Background:
-    Given I am on the homepage
-    And the following users
-      | login | name |
-      | joaosilva | Joao Silva |
-    And the following files
-      | owner   | file      | mime      |
-      | joaosilva | AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.txt | text/plain |
-
-  Scenario: view a folder page
-    When I am on /profile/joaosilva/sitemap
-    Then I should see "AGENDA_CULTURA_-_FESTA_DE_VAQUEIRO(...).txt"
-
-  Scenario: view the CMS
-    Given I am logged in as "joaosilva"
-    When I am on /myprofile/joaosilva/cms
-    Then I should see "AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_(...).txt"
@@ -51,7 +51,6 @@ class FeedHandler
   end
   def process(container)
-    RAILS_DEFAULT_LOGGER.info("Processing %s with id = %d" % [container.class.name, container.id])
     begin
       container.class.transaction do
         if container.update_errors > FeedHandler.max_errors && container.fetched_at < (Time.now - FeedHandler.disabled_period)
@@ -50,6 +50,10 @@ class FilePresenter
     nil
   end
+  def download?(view=nil)
+    false
+  end
+
   def short_description
     file_type = if content_type.present?
       content_type.sub(/^application\//, '').sub(/^x-/, '').sub(/^image\//, '')
@@ -25,51 +25,87 @@ def plugin_disabled_warning(plugin)
   puts "E: you should enable #{plugin} plugin before running it's tests!"
 end
-def run_tests(name, files_glob)
-  files = Dir.glob(files_glob)
-  if files.empty?
-    puts "I: no tests to run (#{name})"
+def task2ext(task)
+  (task == :selenium || task == :cucumber) ? :feature : :rb
+end
+
+def task2profile(task, plugin)
+  if task == :cucumber
+    return plugin
+  elsif task == :selenium
+    return "#{plugin}_selenium"
   else
-    sh 'testrb', '-Itest', *files
+    return 'default'
   end
 end
-def run_cucumber(name, profile, files_glob)
-  files = Dir.glob(files_glob)
-  if files.empty?
-    puts "I: no tests to run #{name}"
+def filename2plugin(filename)
+  filename.split('/')[1]
+end
+
+def task2folder(task)
+  result = case task.to_sym
+  when :units
+    :unit
+  when :functionals
+    :functional
+  when :integration
+    :integration
+  when :cucumber
+    :features
+  when :selenium
+    :features
+  end
+
+  return result
+end
+
+def run_test(name, files)
+  files = Array(files)
+  plugin = filename2plugin(files.first)
+  if name == :cucumber || name == :selenium
+    run_cucumber task2_profile(name, plugin), files
   else
-    sh 'xvfb-run', 'ruby', '-S', 'cucumber', '--profile', profile.to_s, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *files
+    run_testrb files
   end
 end
-def plugin_test_task(name, plugin, files_glob)
-  desc "Run #{name} tests for #{plugin_name(plugin)}"
-  task name => 'db:test:plugins:prepare' do |t|
-    if plugin_enabled?(plugin)
-      run_tests t.name, files_glob
-    else
-      plugin_disabled_warning(plugin)
+def run_testrb(files)
+  sh 'testrb', '-Itest', *files
+end
+
+def run_cucumber(profile, files)
+  sh 'xvfb-run', 'ruby', '-S', 'cucumber', '--profile', profile.to_s, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *files
+end
+
+def custom_run(name, files, run=:individually)
+  case run
+  when :all
+    run_test name, files
+  when :individually
+    files.each do |file|
+      run_test name, file
     end
+  when :by_plugin
   end
 end
-def plugin_cucumber_task(name, plugin, files_glob)
-  desc "Run #{name} tests for #{plugin_name(plugin)}"
-  task name => 'db:test:plugins:prepare' do |t|
-    if plugin_enabled?(plugin)
-      run_cucumber t.name, plugin, files_glob
-    else
-      plugin_disabled_warning(plugin)
-    end
+def run_tests(name, plugins, run=:individually)
+  plugins = Array(plugins)
+  glob =  "plugins/{#{plugins.join(',')}}/test/#{task2folder(name)}/**/*.#{task2ext(name)}"
+  files = Dir.glob(glob)
+  if files.empty?
+    puts "I: no tests to run #{name}"
+  else
+    custom_run(name, files, run)
   end
 end
-def plugin_selenium_task(name, plugin, files_glob)
+def plugin_test_task(name, plugin, run=:individually)
   desc "Run #{name} tests for #{plugin_name(plugin)}"
   task name => 'db:test:plugins:prepare' do |t|
     if plugin_enabled?(plugin)
-      run_cucumber t.name, "#{plugin}_selenium", files_glob
+      run_tests(name, plugin, run)
     else
       plugin_disabled_warning(plugin)
     end
@@ -98,28 +134,28 @@ namespace :test do
   namespace :noosfero_plugins do
     all_plugins.each do |plugin|
       namespace plugin do
-        plugin_test_task :units, plugin, "plugins/#{plugin}/test/unit/**/*.rb"
-        plugin_test_task :functionals, plugin, "plugins/#{plugin}/test/functional/**/*.rb"
-        plugin_test_task :integration, plugin, "plugins/#{plugin}/test/integration/**/*.rb"
-        plugin_cucumber_task :cucumber, plugin, "plugins/#{plugin}/features/**/*.feature"
-        plugin_selenium_task :selenium, plugin, "plugins/#{plugin}/features/**/*.feature"
+        plugin_test_task :units, plugin
+        plugin_test_task :functionals, plugin
+        plugin_test_task :integration, plugin
+        plugin_test_task :cucumber, plugin
+        plugin_test_task :selenium, plugin
       end
       test_sequence_task(plugin, plugin, "#{plugin}:units", "#{plugin}:functionals", "#{plugin}:integration", "#{plugin}:cucumber", "#{plugin}:selenium")
     end
-    { :units => :unit , :functionals => :functional , :integration => :integration }.each do |taskname,folder|
+    [:units, :functionals, :integration].each do |taskname|
       task taskname => 'db:test:plugins:prepare' do |t|
-        run_tests t.name, "plugins/{#{enabled_plugins.join(',')}}/test/#{folder}/**/*.rb"
+        run_tests taskname, enabled_plugins
       end
     end
     task :cucumber => 'db:test:plugins:prepare' do |t|
-      run_cucumber t.name, :default, "plugins/{#{enabled_plugins.join(',')}}/test/features/**/*.features"
+      run_tests :cucumber, enabled_plugins
     end
     task :selenium => 'db:test:plugins:prepare' do |t|
-      run_cucumber t.name, :selenium, "plugins/{#{enabled_plugins.join(',')}}/test/features/**/*.features"
+      run_tests :selenium, enabled_plugins
     end
     task :temp_enable_all_plugins do
@@ -2,9 +2,10 @@ class AntiSpamPlugin::Wrapper &lt; SimpleDelegator
   include Rakismet::Model
   @@wrappers = []
+  cattr_accessor :wrappers
   def self.wrap(object)
-    wrapper = @@wrappers.find { |wrapper| wrapper.wraps?(object) }
+    wrapper = wrappers.find { |wrapper| wrapper.wraps?(object) }
     wrapper ? wrapper.new(object) : object
   end
@@ -13,6 +14,10 @@ class AntiSpamPlugin::Wrapper &lt; SimpleDelegator
   end
   def self.inherited(child)
-    @@wrappers << child
+    wrappers << child
   end
 end
+
+Dir.glob(File.join(AntiSpamPlugin.root_path, 'lib', 'anti_spam_plugin', '*_wrapper.rb')) do |file|
+  load(file)
+end
@@ -10,7 +10,7 @@ end
 class ContentViewerControllerTest < ActionController::TestCase
   def setup
-    @profile = fast_create(Community)
+    @profile = Community.create!(:name => 'Sample community', :identifier => 'sample-community')
     @track = create_track('track', @profile)
     @step = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today, :tool_type => TinyMceArticle.name)
@@ -87,43 +87,35 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   end
   should 'render a div with block id for track list block' do
-    box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
-    @block = CommunityTrackPlugin::TrackListBlock.create!(:box => box)
-    @profile.boxes << box
+    @block = CommunityTrackPlugin::TrackListBlock.create!(:box => @profile.boxes.last)
     get :view_page, @step.url
     assert_tag :tag => 'div', :attributes => { :class => 'track_list', :id => "track_list_#{@block.id}" }
   end
   should 'render a div with block id for track card list block' do
-    box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
-    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
-    @profile.boxes << box
+    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.last)
     get :view_page, @step.url
     assert_tag :tag => 'div', :attributes => { :class => 'track_list', :id => "track_list_#{@block.id}" }
   end
   should 'render tracks in track list block' do
-    box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
-    @block = CommunityTrackPlugin::TrackListBlock.create!(:box => box)
-    @profile.boxes << box
+    @block = CommunityTrackPlugin::TrackListBlock.create!(:box => @profile.boxes.last)
     get :view_page, @step.url
+    file = File.open('result.html', 'w+')
+    file.write(@response.body)
+    file.close
     assert_tag :tag => 'div', :attributes => { :class => "item category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'steps' }, :descendant => { :tag => 'span', :attributes => { :class => "step #{@block.status_class(@step)}" } } }
   end
   should 'render tracks in track card list block' do
-    box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
-    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
-    @profile.boxes << box
+    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.last)
     get :view_page, @step.url
     assert_tag :tag => 'div', :attributes => { :class => "item_card category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'track_content' } }
     assert_tag :tag => 'div', :attributes => { :class => "item_card category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'track_stats' } }
   end
   should 'render link to display more tracks in track list block' do
-    box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
-    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
-    @profile.boxes << box
-
+    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.last)
     (@block.limit+1).times { |i| create_track("track#{i}", @profile) }
     get :view_page, @step.url
@@ -131,9 +123,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   end
   should 'render link to show all tracks in track list block' do
-    box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
-    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
-    @profile.boxes << box
+    @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.last)
     @block.more_another_page = true
     @block.save!
@@ -61,9 +61,9 @@ class RecentContentBlockTest &lt; ActiveSupport::TestCase
     root = fast_create(Blog, :name => 'test-blog', :profile_id => profile.id)
-    a1 = fast_create(TextileArticle, :name => 'article #1', :profile_id => profile.id, :parent_id => root.id)
-    a2 = fast_create(TextileArticle, :name => 'article #2', :profile_id => profile.id, :parent_id => root.id)
-    a3 = fast_create(TextileArticle, :name => 'article #3', :profile_id => profile.id, :parent_id => root.id)
+    a1 = fast_create(TextileArticle, :name => 'article #1', :profile_id => profile.id, :parent_id => root.id, :created_at => Time.now - 2.days)
+    a2 = fast_create(TextileArticle, :name => 'article #2', :profile_id => profile.id, :parent_id => root.id, :created_at => Time.now - 1.days)
+    a3 = fast_create(TextileArticle, :name => 'article #3', :profile_id => profile.id, :parent_id => root.id, :created_at => Time.now)
     block = RecentContentBlock.new
     block.stubs(:holder).returns(profile)
@@ -109,7 +109,7 @@ msgstr &quot;&quot;
 #: app/views/blocks/profile_info_actions/_join_leave_community.rhtml:25
 #: app/views/profile/_private_profile.rhtml:10
 msgid "Join"
-msgstr ""
+msgstr "Eniri"
 #: app/helpers/application_helper.rb:556
 #: app/views/blocks/profile_info_actions/_join_leave_community.rhtml:4
@@ -290,7 +290,7 @@ msgstr &quot;&quot;
 #: app/helpers/application_helper.rb:1088
 msgid "See all"
-msgstr ""
+msgstr "Vidi ĉiujn"
 #: app/helpers/application_helper.rb:1091
 msgid "<span>Manage</span> %s"
@@ -688,11 +688,11 @@ msgstr &quot;&quot;
 #: app/helpers/forum_helper.rb:14 app/helpers/blog_helper.rb:23
 msgid "&laquo; Newer posts"
-msgstr ""
+msgstr "&laquo; Pli freŝaj afiŝoj"
 #: app/helpers/forum_helper.rb:15 app/helpers/blog_helper.rb:24
 msgid "Older posts &raquo;"
-msgstr ""
+msgstr "Malpli freŝaj afiŝoj &raquo"
 #: app/helpers/forum_helper.rb:18
 msgid "Discussion topic"
@@ -774,63 +774,63 @@ msgstr &quot;&quot;
 #: app/helpers/dates_helper.rb:7 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:4
 msgid "January"
-msgstr ""
+msgstr "Januaro"
 #: app/helpers/dates_helper.rb:8 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:5
 msgid "February"
-msgstr ""
+msgstr "Februaro"
 #: app/helpers/dates_helper.rb:9 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:6
 msgid "March"
-msgstr ""
+msgstr "Marto"
 #: app/helpers/dates_helper.rb:10 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:7
 msgid "April"
-msgstr ""
+msgstr "Aprilo"
 #: app/helpers/dates_helper.rb:11 app/helpers/forms_helper.rb:172
 #: app/helpers/forms_helper.rb:173
 #: plugins/display_content/lib/display_content_block.rb:8
 msgid "May"
-msgstr ""
+msgstr "Majo"
 #: app/helpers/dates_helper.rb:12 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:9
 msgid "June"
-msgstr ""
+msgstr "Junio"
 #: app/helpers/dates_helper.rb:13 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:10
 msgid "July"
-msgstr ""
+msgstr "Julio"
 #: app/helpers/dates_helper.rb:14 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:11
 msgid "August"
-msgstr ""
+msgstr "Aŭgusto"
 #: app/helpers/dates_helper.rb:15 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:12
 msgid "September"
-msgstr ""
+msgstr "Septembro"
 #: app/helpers/dates_helper.rb:16 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:13
 msgid "October"
-msgstr ""
+msgstr "Oktobro"
 #: app/helpers/dates_helper.rb:17 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:14
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 #: app/helpers/dates_helper.rb:18 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:15
 msgid "December"
-msgstr ""
+msgstr "Decembro"
 #: app/helpers/dates_helper.rb:28
 #: plugins/display_content/lib/display_content_block.rb:156
@@ -845,7 +845,7 @@ msgstr &quot;&quot;
 #: app/helpers/dates_helper.rb:31
 #: plugins/display_content/lib/display_content_block.rb:159
 msgid "%{month_name} %{day}, %{year}"
-msgstr ""
+msgstr "La %{day}-a de %{month_name} %{year}"
 #: app/helpers/dates_helper.rb:31
 #: plugins/display_content/lib/display_content_block.rb:159
@@ -8278,7 +8278,7 @@ msgstr &quot;&quot;
 #: app/views/account/index_anonymous.rhtml:10
 msgid "Sign up."
-msgstr ""
+msgstr "Aliĝi"
 #: app/views/account/index_anonymous.rhtml:11
 msgid ""
@@ -291,7 +291,6 @@ msgid &quot;Next&quot;
 msgstr "Siguiente"
 #: app/helpers/application_helper.rb:1088
-#, fuzzy
 msgid "See all"
 msgstr "Ver todos"
@@ -700,11 +699,11 @@ msgstr &quot;Configurar foro&quot;
 #: app/helpers/forum_helper.rb:14 app/helpers/blog_helper.rb:23
 msgid "&laquo; Newer posts"
-msgstr "&laquo; Entradas recientes"
+msgstr "&laquo; Noticias más nuevas"
 #: app/helpers/forum_helper.rb:15 app/helpers/blog_helper.rb:24
 msgid "Older posts &raquo;"
-msgstr "Entradas antiguas &raquo;"
+msgstr "Noticias más viejas &raquo;"
 #: app/helpers/forum_helper.rb:18
 msgid "Discussion topic"
@@ -852,15 +851,13 @@ msgstr &quot;%{day} de %{month} %{year}&quot;
 #: app/helpers/dates_helper.rb:28 app/helpers/dates_helper.rb:40
 #: plugins/display_content/lib/display_content_block.rb:156
-#, fuzzy
 msgid "%{month}/%{day}"
-msgstr "%{day} de %{month} %{year}"
+msgstr "%{day}/%{month}"
 #: app/helpers/dates_helper.rb:31
 #: plugins/display_content/lib/display_content_block.rb:159
-#, fuzzy
 msgid "%{month_name} %{day}, %{year}"
-msgstr "%{day} de %{month} %{year}"
+msgstr "%{day} de %{month} de %{year}"
 # LAs cadenas de este tipo NO se traducen
 #: app/helpers/dates_helper.rb:31
@@ -888,21 +885,19 @@ msgstr &quot;%{month} %{year}&quot;
 #: app/helpers/dates_helper.rb:53
 msgid "%{day} %{month} %{year}, %{hour}:%{minutes}"
-msgstr "%{day} %{month} %{year}, %{hour}:%{minutes}"
+msgstr "%{day} de %{month} de %{year}, %{hour}:%{minutes}"
 #: app/helpers/dates_helper.rb:65
-#, fuzzy
 msgid "from %{month} %{day1} to %{day2}, %{year}"
-msgstr "%{day} de %{month} %{year}"
+msgstr "de %{day1} para %{day2} de %{month} de %{year}"
 #: app/helpers/dates_helper.rb:72
-#, fuzzy
 msgid "from %{date1} to %{date2}, %{year}"
-msgstr "Por %{author} el %{date}"
+msgstr "de %{date1} para %{date2} de %{year}"
 #: app/helpers/dates_helper.rb:79
 msgid "from %{date1} to %{date2}"
-msgstr "Por %{author} el %{date}"
+msgstr "de %{date1} para %{date2}"
 #: app/helpers/dates_helper.rb:89 app/helpers/forms_helper.rb:163
 msgid "Sun"
@@ -111,7 +111,7 @@ msgstr &quot;&quot;
 #: app/views/blocks/profile_info_actions/_join_leave_community.rhtml:25
 #: app/views/profile/_private_profile.rhtml:10
 msgid "Join"
-msgstr ""
+msgstr "Accedere"
 #: app/helpers/application_helper.rb:556
 #: app/views/blocks/profile_info_actions/_join_leave_community.rhtml:4
@@ -763,63 +763,63 @@ msgstr &quot;&quot;
 #: app/helpers/dates_helper.rb:7 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:4
 msgid "January"
-msgstr ""
+msgstr "gennaio"
 #: app/helpers/dates_helper.rb:8 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:5
 msgid "February"
-msgstr ""
+msgstr "febbraio"
 #: app/helpers/dates_helper.rb:9 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:6
 msgid "March"
-msgstr ""
+msgstr "marzo"
 #: app/helpers/dates_helper.rb:10 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:7
 msgid "April"
-msgstr ""
+msgstr "aprile"
 #: app/helpers/dates_helper.rb:11 app/helpers/forms_helper.rb:172
 #: app/helpers/forms_helper.rb:173
 #: plugins/display_content/lib/display_content_block.rb:8
 msgid "May"
-msgstr ""
+msgstr "maggio"
 #: app/helpers/dates_helper.rb:12 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:9
 msgid "June"
-msgstr ""
+msgstr "giugno"
 #: app/helpers/dates_helper.rb:13 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:10
 msgid "July"
-msgstr ""
+msgstr "luglio"
 #: app/helpers/dates_helper.rb:14 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:11
 msgid "August"
-msgstr ""
+msgstr "agosto"
 #: app/helpers/dates_helper.rb:15 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:12
 msgid "September"
-msgstr ""
+msgstr "settembre"
 #: app/helpers/dates_helper.rb:16 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:13
 msgid "October"
-msgstr ""
+msgstr "ottobre"
 #: app/helpers/dates_helper.rb:17 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:14
 msgid "November"
-msgstr ""
+msgstr "novembre"
 #: app/helpers/dates_helper.rb:18 app/helpers/forms_helper.rb:172
 #: plugins/display_content/lib/display_content_block.rb:15
 msgid "December"
-msgstr ""
+msgstr "dicembre"
 #: app/helpers/dates_helper.rb:28
 #: plugins/display_content/lib/display_content_block.rb:156
@@ -834,7 +834,7 @@ msgstr &quot;&quot;
 #: app/helpers/dates_helper.rb:31
 #: plugins/display_content/lib/display_content_block.rb:159
 msgid "%{month_name} %{day}, %{year}"
-msgstr ""
+msgstr "%{day} %{month_name} %{year}"
 #: app/helpers/dates_helper.rb:31
 #: plugins/display_content/lib/display_content_block.rb:159
@@ -8246,7 +8246,7 @@ msgstr &quot;&quot;
 #: app/views/account/index_anonymous.rhtml:10
 msgid "Sign up."
-msgstr ""
+msgstr "Registro"
 #: app/views/account/index_anonymous.rhtml:11
 msgid ""
@@ -3561,9 +3561,10 @@ div#article-parent {
 }
 #agenda .agenda-calendar {
   width: 50%;
+  display: inline-block;
 }
 #agenda td, #agenda th {
-  padding: 15px;
+  padding: 10px;
   padding-right: 0px;
 }
 #agenda .agenda-calendar .previous-month td, #agenda .agenda-calendar .previous-month th, #agenda .agenda-calendar .next-month td, #agenda .agenda-calendar .next-month th {
@@ -3621,26 +3622,25 @@ div#article-parent {
   vertical-align: middle;
 }
 #agenda .agenda-calendar .current-month caption {
-  margin-bottom: 10px;
+  margin: 10px 0px;
 }
 #agenda #events-of-the-day {
-  position: absolute;
-  left: 50%;
   width: 45%;
-  top: 0px;
   height: 100%;
   padding-left: 20px;
+  display: inline-block;
+  vertical-align: top;
 }
 #agenda #events-of-the-day #agenda-items {
   display: block;
   overflow: auto;
   overflow-x: hidden;
-  height: 80%;
+  height: 250px;
   background: white;
   border: none;
 }
 #agenda-toolbar {
-  float: right;
+  text-align: right;
   font-variant: normal;
   font-weight: normal;
 }
@@ -3663,6 +3663,9 @@ h1#agenda-title {
   display: block;
   margin-top: 10px;
 }
+#agenda .pagination {
+  margin-top: 15px;
+}
 /* ==> public/stylesheets/controller_favorite_enterprises.css <== */
 /* ==> @import url(manage_contacts_list.css); <== */
@@ -72,9 +72,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     get :view_page, :profile => 'someone', :page => [ '500.html' ]
     assert_response :success
-    assert_match /^text\/html/, @response.headers['Content-Type']
-    assert @response.headers['Content-Disposition'].present?
-    assert_match /attachment/, @response.headers['Content-Disposition']
+    assert_match /#{html.public_filename}/, @response.body
   end
   should 'produce a download-link when article is not text/html' do
@@ -577,14 +575,6 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_template 'view_page'
   end
-  should 'download data for image when not view' do
-    file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => profile)
-    get :view_page, :profile => profile.identifier, :page => file.explode_path
-
-    assert_response :success
-    assert_template nil
-  end
-
   should "display 'Upload files' when create children of image gallery" do
     login_as(profile.identifier)
     f = Gallery.create!(:name => 'gallery', :profile => profile)
@@ -1355,8 +1345,23 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'display link to download of non-recognized file types on its page' do
     file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'bin/unknown'), :profile => profile)
-    get :view_page, file.url.merge(:view=>:true)
-    assert_match /this is a sample text file/, @response.body
+    get :view_page, file.url
+    assert_match /#{file.public_filename}/, @response.body
+  end
+
+  should 'not count hit from bots' do
+    article = fast_create(Article, :profile_id => profile.id)
+    assert_no_difference article, :hits do
+      @request.env['HTTP_USER_AGENT'] = 'bot'
+      get 'view_page', :profile => profile.identifier, :page => article.path.split('/')
+      @request.env['HTTP_USER_AGENT'] = 'spider'
+      get 'view_page', :profile => profile.identifier, :page => article.path.split('/')
+      @request.env['HTTP_USER_AGENT'] = 'crawler'
+      get 'view_page', :profile => profile.identifier, :page => article.path.split('/')
+      @request.env['HTTP_USER_AGENT'] = '(http://some-crawler.com)'
+      get 'view_page', :profile => profile.identifier, :page => article.path.split('/')
+      article.reload
+    end
   end
   should 'add meta tags with article info' do
@@ -38,4 +38,12 @@ class EventsControllerTest &lt; ActionController::TestCase
     assert_tag :tag =>'a', :attributes => {:href => "/profile/#{profile.identifier}/events/#{next_month.year}/#{next_month.month}"}, :content => next_month_name
   end
+  should 'see the events paginated' do
+    30.times do |i|
+      profile.events << Event.new(:name => "Lesson #{i}", :start_date => Date.today)
+    end
+    get :events, :profile => profile.identifier
+    assert_equal 20, assigns(:events).count
+  end
+
 end
@@ -370,6 +370,15 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_equal [ 'upcoming event 1' ], assigns(:searches)[:events][:results].map(&:name)
   end
+  should 'see the events paginated' do
+    person = create_user('testuser').person
+    30.times do |i|
+      create_event(person, :name => "Event #{i}",	:start_date => Date.today)
+    end
+    get :events
+    assert_equal 20, assigns(:events).count
+  end
+
   %w[ people enterprises articles events communities products ].each do |asset|
     should "render asset-specific template when searching for #{asset}" do
       get "#{asset}"
@@ -222,4 +222,11 @@ class BlockTest &lt; ActiveSupport::TestCase
     assert block.visible?(2)
     assert !block.visible?(3)
   end
+
+  should 'accept user as parameter on cache_key without change its value' do
+    person = fast_create(Person)
+    block = Block.new
+    assert_equal block.cache_key('en'), block.cache_key('en', person)
+  end
+
 end
@@ -35,4 +35,28 @@ class MembersBlockTest &lt; ActiveSupport::TestCase
     assert_same list, block.profiles
   end
+  should 'use logged-in to compose cache key' do
+    person = fast_create(Person)
+    community = fast_create(Community)
+    block = MembersBlock.create
+    block.expects(:owner).returns(community)
+
+    assert_match(/-logged-in/,block.cache_key('en', person))
+  end
+
+  should 'use logged-in and member to compose cache key for members' do
+    person = fast_create(Person)
+    community = fast_create(Community)
+    community.add_member person
+    block = MembersBlock.create
+    block.expects(:owner).returns(community)
+
+    assert_match(/-logged-in-member/,block.cache_key('en', person))
+  end
+
+  should 'not change block cache key if user is nil' do
+    block = MembersBlock.new
+    assert_equal block.cache_key('en'), block.cache_key('en', nil)
+  end
+
 end
@@ -20,12 +20,14 @@ class TagsHelperTest &lt; ActiveSupport::TestCase
   should 'order tags alphabetically with special characters' do
     result = tag_cloud(
-      { 'aula'=>9, 'área'=>2, 'area'=>2, 'avião'=>2, 'armário'=>2,
-        'A'=>1, 'Á'=>1, 'AB'=>1, 'ÁA'=>1 },
+      { 'area'=>9, 'área'=>2, 'base'=>2, 'báse' => 3,
+        'A'=>1, 'Á'=>1, 'zebra'=>1, 'zebrá'=>1 },
       :id,
       { :host=>'noosfero.org', :controller=>'test', :action=>'tag' }
     )
-    assert_equal %w(A Á ÁA AB area área armário aula avião).join("\n"), result
+    result = result.split("\n")
+    assert_order ['Á', 'área', 'báse', 'zebrá'], result
+    assert_order ['A', 'area', 'base', 'zebra'], result
   end
 end
	@@ -141,7 +141,7 @@ class Block < ActiveRecord::Base		@@ -141,7 +141,7 @@ class Block < ActiveRecord::Base
141	end	141	end
142		142
143	alias :active_record_cache_key :cache_key	143	alias :active_record_cache_key :cache_key
144	- def cache_key(language='en')	144	+ def cache_key(language='en', user=nil)
145	active_record_cache_key+'-'+language	145	active_record_cache_key+'-'+language
146	end	146	end
147		147
	@@ -36,4 +36,15 @@ class MembersBlock < ProfileListBlock		@@ -36,4 +36,15 @@ class MembersBlock < ProfileListBlock
36	}	36	}
37	end	37	end
38		38
		39	+ def cache_key(language='en', user=nil)
		40	+ logged = ''
		41	+ if user
		42	+ logged += '-logged-in'
		43	+ if user.is_member_of? self.owner
		44	+ logged += '-member'
		45	+ end
		46	+ end
		47	+ super + logged
		48	+ end
		49	+
39	end	50	end
1	-<%= list_events(@date, @events) %>
2	\ No newline at end of file	1	\ No newline at end of file
		2	+<%= list_events(@date, @events) %>
		3	+
		4	+<%= pagination_links @events, :param_name => 'page' %>
1	<% if block.cacheable? && use_cache %>	1	<% if block.cacheable? && use_cache %>
2	- <% cache_timeout(block.cache_key(language), block.timeout) do %>	2	+ <% cache_timeout(block.cache_key(language, user), block.timeout) do %>
3	<%= display_block_content(block, user, main_content) %>	3	<%= display_block_content(block, user, main_content) %>
4	<% end %>	4	<% end %>
5	<% else %>	5	<% else %>
	@@ -8,6 +8,7 @@ Feature: balloon		@@ -8,6 +8,7 @@ Feature: balloon
8	And the following communities	8	And the following communities
9	\| identifier \| name \|	9	\| identifier \| name \|
10	\| sample \| Sample \|	10	\| sample \| Sample \|
		11	+ And I am logged in as "joaosilva"
11		12
12	@selenium	13	@selenium
13	Scenario: I should not see trigger if not enabled	14	Scenario: I should not see trigger if not enabled
	@@ -39,7 +39,7 @@ Feature: comment		@@ -39,7 +39,7 @@ Feature: comment
39	When I press "Post comment"	39	When I press "Post comment"
40	Then I should see "Hey ho, let's go"	40	Then I should see "Hey ho, let's go"
41		41
42	- @selenium	42	+ @selenium-fixme
43	Scenario: redirect to right place after comment a picture	43	Scenario: redirect to right place after comment a picture
44	Given the following files	44	Given the following files
45	\| owner \| file \| mime \|	45	\| owner \| file \| mime \|
	@@ -244,3 +244,38 @@ Feature: events		@@ -244,3 +244,38 @@ Feature: events
244	Given I am on /profile/josesilva/events/2009/10	244	Given I am on /profile/josesilva/events/2009/10
245	When I follow "Oktoberfest"	245	When I follow "Oktoberfest"
246	Then I should see "Oktoberfest"	246	Then I should see "Oktoberfest"
		247	+
		248	+ Scenario: list events paginated for a specific profile for the month
		249	+ Given I am logged in as admin
		250	+ And the following users
		251	+ \| login \|
		252	+ \| josemanuel \|
		253	+ And I am logged in as "josemanuel"
		254	+ And the following events
		255	+ \| owner \| name \| start_date \|
		256	+ \| josemanuel \| Event 5 \| 2009-10-12 \|
		257	+ \| josemanuel \| Event 3 \| 2009-10-15 \|
		258	+ \| josemanuel \| Test Event \| 2009-10-15 \|
		259	+ \| josemanuel \| Oktoberfest \| 2009-10-19 \|
		260	+ \| josemanuel \| WikiSym \| 2009-10-21 \|
		261	+ \| josemanuel \| Free Software \| 2009-10-22 \|
		262	+ \| josemanuel \| Rachel Birthday \| 2009-10-23 \|
		263	+ \| josemanuel \| Manuel Birthday \| 2009-10-24 \|
		264	+ \| josemanuel \| Michelle Birthday \| 2009-10-25 \|
		265	+ \| josemanuel \| Lecture Allien 10 \| 2009-10-26 \|
		266	+ \| josemanuel \| Lecture Allien 11 \| 2009-10-26 \|
		267	+ \| josemanuel \| Lecture Allien 12 \| 2009-10-26 \|
		268	+ \| josemanuel \| Lecture Allien 13 \| 2009-10-26 \|
		269	+ \| josemanuel \| Lecture Allien 14 \| 2009-10-26 \|
		270	+ \| josemanuel \| Lecture Allien 15 \| 2009-10-26 \|
		271	+ \| josemanuel \| Lecture Allien 16 \| 2009-10-26 \|
		272	+ \| josemanuel \| Lecture Allien 17 \| 2009-10-26 \|
		273	+ \| josemanuel \| Lecture Allien 18 \| 2009-10-26 \|
		274	+ \| josemanuel \| Lecture Allien 19 \| 2009-10-26 \|
		275	+ \| josemanuel \| Lecture Allien 20 \| 2009-10-26 \|
		276	+ \| josemanuel \| Party On \| 2009-10-27 \|
		277	+
		278	+ When I am on /profile/josemanuel/events/2009/10
		279	+ Then I should not see "Party On" within "#agenda-items"
		280	+ When I follow "Next"
		281	+ Then I should see "Party On" within "#agenda-items"
	@@ -1,21 +0,0 @@	@@ -1,21 +0,0 @@
1	-Feature: sitemap
2	- As a noosfero user
3	- I want to list articles
4	-
5	- Background:
6	- Given I am on the homepage
7	- And the following users
8	- \| login \| name \|
9	- \| joaosilva \| Joao Silva \|
10	- And the following files
11	- \| owner \| file \| mime \|
12	- \| joaosilva \| AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.txt \| text/plain \|
13	-
14	- Scenario: view a folder page
15	- When I am on /profile/joaosilva/sitemap
16	- Then I should see "AGENDA_CULTURA_-_FESTA_DE_VAQUEIRO(...).txt"
17	-
18	- Scenario: view the CMS
19	- Given I am logged in as "joaosilva"
20	- When I am on /myprofile/joaosilva/cms
21	- Then I should see "AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_(...).txt"
	@@ -51,7 +51,6 @@ class FeedHandler		@@ -51,7 +51,6 @@ class FeedHandler
51	end	51	end
52		52
53	def process(container)	53	def process(container)
54	- RAILS_DEFAULT_LOGGER.info("Processing %s with id = %d" % [container.class.name, container.id])
55	begin	54	begin
56	container.class.transaction do	55	container.class.transaction do
57	if container.update_errors > FeedHandler.max_errors && container.fetched_at < (Time.now - FeedHandler.disabled_period)	56	if container.update_errors > FeedHandler.max_errors && container.fetched_at < (Time.now - FeedHandler.disabled_period)
	@@ -10,7 +10,7 @@ end		@@ -10,7 +10,7 @@ end
10	class ContentViewerControllerTest < ActionController::TestCase	10	class ContentViewerControllerTest < ActionController::TestCase
11		11
12	def setup	12	def setup
13	- @profile = fast_create(Community)	13	+ @profile = Community.create!(:name => 'Sample community', :identifier => 'sample-community')
14	@track = create_track('track', @profile)	14	@track = create_track('track', @profile)
15	@step = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today, :tool_type => TinyMceArticle.name)	15	@step = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today, :tool_type => TinyMceArticle.name)
16		16
	@@ -87,43 +87,35 @@ class ContentViewerControllerTest < ActionController::TestCase		@@ -87,43 +87,35 @@ class ContentViewerControllerTest < ActionController::TestCase
87	end	87	end
88		88
89	should 'render a div with block id for track list block' do	89	should 'render a div with block id for track list block' do
90	- box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
91	- @block = CommunityTrackPlugin::TrackListBlock.create!(:box => box)
92	- @profile.boxes << box	90	+ @block = CommunityTrackPlugin::TrackListBlock.create!(:box => @profile.boxes.last)
93	get :view_page, @step.url	91	get :view_page, @step.url
94	assert_tag :tag => 'div', :attributes => { :class => 'track_list', :id => "track_list_#{@block.id}" }	92	assert_tag :tag => 'div', :attributes => { :class => 'track_list', :id => "track_list_#{@block.id}" }
95	end	93	end
96		94
97	should 'render a div with block id for track card list block' do	95	should 'render a div with block id for track card list block' do
98	- box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
99	- @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
100	- @profile.boxes << box	96	+ @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.last)
101	get :view_page, @step.url	97	get :view_page, @step.url
102	assert_tag :tag => 'div', :attributes => { :class => 'track_list', :id => "track_list_#{@block.id}" }	98	assert_tag :tag => 'div', :attributes => { :class => 'track_list', :id => "track_list_#{@block.id}" }
103	end	99	end
104		100
105	should 'render tracks in track list block' do	101	should 'render tracks in track list block' do
106	- box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
107	- @block = CommunityTrackPlugin::TrackListBlock.create!(:box => box)
108	- @profile.boxes << box	102	+ @block = CommunityTrackPlugin::TrackListBlock.create!(:box => @profile.boxes.last)
109	get :view_page, @step.url	103	get :view_page, @step.url
		104	+ file = File.open('result.html', 'w+')
		105	+ file.write(@response.body)
		106	+ file.close
110	assert_tag :tag => 'div', :attributes => { :class => "item category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'steps' }, :descendant => { :tag => 'span', :attributes => { :class => "step #{@block.status_class(@step)}" } } }	107	assert_tag :tag => 'div', :attributes => { :class => "item category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'steps' }, :descendant => { :tag => 'span', :attributes => { :class => "step #{@block.status_class(@step)}" } } }
111	end	108	end
112		109
113	should 'render tracks in track card list block' do	110	should 'render tracks in track card list block' do
114	- box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
115	- @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
116	- @profile.boxes << box	111	+ @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.last)
117	get :view_page, @step.url	112	get :view_page, @step.url
118	assert_tag :tag => 'div', :attributes => { :class => "item_card category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'track_content' } }	113	assert_tag :tag => 'div', :attributes => { :class => "item_card category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'track_content' } }
119	assert_tag :tag => 'div', :attributes => { :class => "item_card category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'track_stats' } }	114	assert_tag :tag => 'div', :attributes => { :class => "item_card category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'track_stats' } }
120	end	115	end
121		116
122	should 'render link to display more tracks in track list block' do	117	should 'render link to display more tracks in track list block' do
123	- box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
124	- @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
125	- @profile.boxes << box
126	-	118	+ @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.last)
127	(@block.limit+1).times { \|i\| create_track("track#{i}", @profile) }	119	(@block.limit+1).times { \|i\| create_track("track#{i}", @profile) }
128		120
129	get :view_page, @step.url	121	get :view_page, @step.url
	@@ -131,9 +123,7 @@ class ContentViewerControllerTest < ActionController::TestCase		@@ -131,9 +123,7 @@ class ContentViewerControllerTest < ActionController::TestCase
131	end	123	end
132		124
133	should 'render link to show all tracks in track list block' do	125	should 'render link to show all tracks in track list block' do
134	- box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
135	- @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
136	- @profile.boxes << box	126	+ @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => @profile.boxes.last)
137	@block.more_another_page = true	127	@block.more_another_page = true
138	@block.save!	128	@block.save!
139		129