Merge remote-tracking branch 'origin/master'

Weblate
2 parents 2dadfc26 b9800000
Showing 29 changed files with 231 additions and 150 deletions Show diff stats
Gemfile
app/controllers/public/account_controller.rb
app/models/task.rb
app/views/task_mailer/generic_message.text.erb
app/views/task_mailer/task_activated.text.erb
app/views/task_mailer/task_cancelled.text.erb
app/views/task_mailer/task_created.text.erb
app/views/task_mailer/task_finished.text.erb
debian/control
debian/noosfero.links
lib/tasks/ci.rake
lib/tasks/plugins_tests.rake
plugins/comment_group/views/comment_group_plugin_profile/view_comments.rjs
plugins/community_block/test/functional/commmunity_block_plugin_profile_controller_test.rb
plugins/community_block/test/functional/commmunity_block_plugin_profile_design_controller_test.rb
plugins/community_block/views/community_block.html.erb
plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb
plugins/community_track/test/unit/community_track_plugin_test.rb
plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb
plugins/custom_forms/test/unit/custom_forms_plugin/admission_survey_test.rb
@@ -41,8 +41,9 @@ group :cucumber do
   gem 'selenium-webdriver',     '~> 2.39.0'
 end
-# include plugin gemfiles
-Dir.glob(File.join('config', 'plugins', '*')).each do |plugin|
-  plugin_gemfile = File.join(plugin, 'Gemfile')
-  eval File.read(plugin_gemfile) if File.exists?(plugin_gemfile)
+# include gemfiles from enabled plugins
+# plugins in baseplugins/ are not included on purpose. They should not have any
+# dependencies.
+Dir.glob('config/plugins/*/Gemfile').each do |gemfile|
+  eval File.read(gemfile)
 end
@@ -193,7 +193,7 @@ class AccountController &lt; ApplicationController
         else
           @change_password.errors[:base] << _('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]]
         end
-      rescue ActiveRecord::RecordInvald
+      rescue ActiveRecord::RecordInvalid
         @change_password.errors[:base] << _('Could not perform password recovery for the user.')
       end
     end
@@ -285,8 +285,9 @@ class Task &lt; ActiveRecord::Base
   # If
   def send_notification(action)
     if sends_email?
-      if self.requestor
-         TaskMailer.generic_message("task_#{action}", self)
+      if self.requestor && !self.requestor.notification_emails.empty?
+        message = TaskMailer.generic_message("task_#{action}", self)
+        message.deliver if message
       end
     end
   end
@@ -0,0 +1,9 @@
+<%= _('Dear %s,') % @requestor %>
+
+<%= word_wrap(@message) %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
@@ -1 +0,0 @@
-task_cancelled.text.erb
 \ No newline at end of file
@@ -1,9 +0,0 @@
-<%= _('Dear %s,') % @requestor %>
-
-<%= word_wrap(@message) %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
@@ -1 +0,0 @@
-task_cancelled.text.erb
 \ No newline at end of file
@@ -1 +0,0 @@
-task_cancelled.text.erb
 \ No newline at end of file
@@ -51,6 +51,7 @@ Depends:
  ruby-hpricot,
  ruby-nokogiri,
  ruby-acts-as-taggable-on,
+ ruby-progressbar,
  ruby-prototype-rails,
  ruby-rails-autolink,
  memcached,
@@ -15,4 +15,4 @@ var/lib/noosfero-data/public/thumbnails             usr/share/noosfero/public/th
 usr/share/noosfero/public/designs/themes/noosfero   usr/share/noosfero/public/designs/themes/default
 usr/share/noosfero/public/designs/icons/tango       usr/share/noosfero/public/designs/icons/default
 usr/share/noosfero/script/noosfero-plugins          usr/sbin/noosfero-plugins
-usr/share/noosfero/Gemfile.lock                     /dev/null
+/dev/null                                           usr/share/noosfero/Gemfile.lock
@@ -10,6 +10,15 @@ namespace :ci do
       File.exist?(f)
     end
+    changed_plugin_files = changed_files.select do |f|
+      f.split(File::SEPARATOR).first == 'plugins'
+    end
+    changed_plugins = changed_plugin_files.map do |f|
+      f.split(File::SEPARATOR)[1]
+    end.uniq
+
+    changed_files -= changed_plugin_files
+
     # explicitly changed tests
     tests = changed_files.select { |f| f =~ /test\/.*_test\.rb$/ }
     features = changed_files.select { |f| f =~ /\.feature$/ }
@@ -27,6 +36,13 @@ namespace :ci do
     sh 'testrb', '-Itest', *tests unless tests.empty?
     sh 'cucumber', *features unless features.empty?
     sh 'cucumber', '-p', 'selenium', *features unless features.empty?
+
+    changed_plugins.each do |plugin|
+      task = "test:noosfero_plugins:#{plugin}"
+      puts "Running #{task}"
+      Rake::Task[task].execute
+    end
+
   end
 end
@@ -104,7 +104,7 @@ def run_test(name, files)
 end
 def run_testrb(files)
-  sh 'testrb', '-Itest', *files
+  sh 'testrb', '-I.:test', *files
 end
 def run_cucumber(profile, files)
@@ -8,5 +8,5 @@ page.replace_html &quot;comment-count-#{@group_id}&quot;, @comments_count
 if @no_more_pages
   page.replace_html "comments_list_group_#{@group_id}_more", ""
 else
-  page.replace_html "comments_list_group_#{@group_id}_more", link_to_remote(_('More'), :url => { :profile => profile.identifier, :controller => 'comment_group_plugin_profile', :action => 'view_comments', :group_id => @group_id, :article_id => @article_id, :group_comment_page => @group_comment_page + 1}, :loaded => visual_effect(:highlight, "comments_list_group_#{@group_id}"), :method => :post, :complete => "loadCompleted(#{@group_id})")
+  page.replace_html "comments_list_group_#{@group_id}_more", link_to_remote(_('More'), :url => { :profile => profile.identifier, :controller => 'comment_group_plugin_profile', :action => 'view_comments', :group_id => @group_id, :article_id => @article_id, :group_comment_page => @group_comment_page + 1}, :method => :get)
 end
@@ -0,0 +1,83 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class ProfileController
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+  def rescue_action(e)
+    raise e
+  end
+end
+
+class ProfileControllerTest < ActionController::TestCase
+
+  def setup
+    @user = create_user('testinguser').person
+    login_as(@user.identifier)
+
+    @community = fast_create(Community, :environment_id => Environment.default)
+    @community.add_member @user
+    @community.add_admin @user
+
+    @environment = @community.environment
+    @environment.enabled_plugins = ['CommunityBlock']
+    @environment.save!
+
+    CommunityBlock.delete_all
+    @box1 = create(Box, :owner => @community)
+    @community.boxes = [@box1]
+
+    @block = CommunityBlock.new
+    @block.box = @box1
+    @block.save!
+
+    @community.blocks<<@block
+    @community.save!
+  end
+
+  should 'display community-block' do
+    get :index, :profile => @community.identifier
+    assert_tag :div, :attributes => {:class => 'community-block-logo'}
+    assert_tag :div, :attributes => {:class => 'community-block-info'}
+    assert_tag :div, :attributes => {:class => 'community-block-title'}
+    assert_tag :div, :attributes => {:class => 'community-block-description'}
+  end
+
+  should 'display *leave* button when the user is logged in and is a member of the community' do
+    get :index, :profile => @community.identifier
+    assert_tag :span, :attributes => {:class => 'community-block-button icon-remove'}
+  end
+
+  should 'display *send email to administrators* button when the user is logged in and is a member of the community' do
+    get :index, :profile => @community.identifier
+    assert_match /\{&quot;Send an e-mail&quot;:\{&quot;href&quot;:&quot;\/contact\/#{@community.identifier}\/new&quot;\}\}/, @response.body
+  end
+
+  should 'display *report* button when the user is logged in and is a member of the community' do
+    get :index, :profile => @community.identifier
+    assert_match /\{&quot;Report abuse&quot;:\{&quot;href&quot;:&quot;\/profile\/#{@community.identifier}\/report_abuse&quot;\}\}/, @response.body
+  end
+
+  should 'display *join* button when the user is logged in and is not a member of the community' do
+    @community.remove_member @user
+    get :index, :profile => @community.identifier
+    assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
+  end
+
+  should 'display *control panel* link option when the user is logged in and is community admin' do
+    get :index, :profile => @community.identifier
+    assert_match /\{&quot;Control panel&quot;:\{&quot;href&quot;:&quot;\/myprofile\/#{@community.identifier}&quot;\}\}/, @response.body
+  end
+
+  should 'display *join* button when the user is not logged in' do
+    logout
+    get :index, :profile => @community.identifier
+    assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
+  end
+
+  should 'not display *arrow* button when the user is not logged in' do
+    logout
+    get :index, :profile => @community.identifier
+    assert_no_tag :span, :attributes => {:class => 'community-block-button icon-arrow'}
+  end
+
+end
@@ -1,87 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-# Re-raise errors caught by the controller.
-class ProfileController
-  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def rescue_action(e)
-    raise e
-  end
-end
-
-class ProfileControllerTest < ActionController::TestCase
-
-  def setup
-    @controller = ProfileController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
-    @user = create_user('testinguser').person
-    login_as(@user.identifier)
-
-    @community = fast_create(Community, :environment_id => Environment.default)
-    @community.add_member @user
-    @community.add_admin @user
-
-    @environment = @community.environment
-    @environment.enabled_plugins = ['CommunityBlock']
-    @environment.save!
-
-    CommunityBlock.delete_all
-    @box1 = create(Box, :owner => @community)
-    @community.boxes = [@box1]
-
-    @block = CommunityBlock.new
-    @block.box = @box1
-    @block.save!
-
-    @community.blocks<<@block
-    @community.save!
-  end
-
-  should 'display community-block' do
-    get :index, :profile => @community.identifier
-    assert_tag :div, :attributes => {:class => 'community-block-logo'}
-    assert_tag :div, :attributes => {:class => 'community-block-info'}
-    assert_tag :div, :attributes => {:class => 'community-block-title'}
-    assert_tag :div, :attributes => {:class => 'community-block-description'}
-  end
-
-  should 'display *leave* button when the user is logged in and is a member of the community' do
-    get :index, :profile => @community.identifier
-    assert_tag :span, :attributes => {:class => 'community-block-button icon-remove'}
-  end
-
-  should 'display *send email to administrators* button when the user is logged in and is a member of the community' do
-    get :index, :profile => @community.identifier
-    assert_match /\{&quot;Send an e-mail&quot;:\{&quot;href&quot;:&quot;\/contact\/#{@community.identifier}\/new&quot;\}\}/, @response.body
-  end
-
-  should 'display *report* button when the user is logged in and is a member of the community' do
-    get :index, :profile => @community.identifier
-    assert_match /\{&quot;Report abuse&quot;:\{&quot;href&quot;:&quot;\/profile\/#{@community.identifier}\/report_abuse&quot;\}\}/, @response.body
-  end
-
-  should 'display *join* button when the user is logged in and is not a member of the community' do
-    @community.remove_member @user
-    get :index, :profile => @community.identifier
-    assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
-  end
-
-  should 'display *control panel* link option when the user is logged in and is community admin' do
-    get :index, :profile => @community.identifier
-    assert_match /\{&quot;Control panel&quot;:\{&quot;href&quot;:&quot;\/myprofile\/#{@community.identifier}&quot;\}\}/, @response.body
-  end
-
-  should 'display *join* button when the user is not logged in' do
-    logout
-    get :index, :profile => @community.identifier
-    assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
-  end
-
-  should 'not display *arrow* button when the user is not logged in' do
-    logout
-    get :index, :profile => @community.identifier
-    assert_no_tag :span, :attributes => {:class => 'community-block-button icon-arrow'}
-  end
-
-end
@@ -23,7 +23,7 @@
       <%= link_to(
             content_tag('span','',:class => 'community-block-button icon-arrow'),
             '#',
-            :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false;",
+            :onclick => "toggleSubmenu(this,'',#{CGI::escapeHTML(links.to_json)}); return false;",
             :class => 'simplemenu-trigger') %>
       <% end %>
@@ -32,11 +32,11 @@
         <% if profile.members.include?(user) || profile.already_request_membership?(user) %>
             <%= link_to(
                   content_tag('span', '', :class => 'community-block-button icon-remove'),
-                  profile.leave_url) %>
+                  profile.leave_url, :class => 'join-community') %>
         <% else %>
             <%= link_to(
                   content_tag('span', '', :class => 'community-block-button icon-add'),
-                  profile.join_url) %>
+                  profile.join_url, :class => 'join-community') %>
         <% end %>
       <% else %>
         <%= link_to(
@@ -101,9 +101,6 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'render tracks in track list block' do
     @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
@@ -6,10 +6,13 @@ class CommunityTrackPluginTest &lt; ActiveSupport::TestCase
     @plugin = CommunityTrackPlugin.new
     @profile = fast_create(Community)
     @params = {}
-    @plugin.stubs(:context).returns(self)
+    @context = mock
+    @context.stubs(:profile).returns(@profile)
+    @context.stubs(:params).returns(@params)
+    @plugin.stubs(:context).returns(@context)
   end
-  attr_reader :profile, :params
+  attr_reader :profile, :params, :context
   should 'has name' do
     assert CommunityTrackPlugin.plugin_name
@@ -28,37 +31,37 @@ class CommunityTrackPluginTest &lt; ActiveSupport::TestCase
   end
   should 'do not return Track as a content type if profile is not a community' do
-    @profile = Organization.new
+    context.stubs(:profile).returns(Organization.new)
     assert_not_includes @plugin.content_types, CommunityTrackPlugin::Track
   end
   should 'do not return Track as a content type if there is a parent' do
-    parent = fast_create(Blog, :profile_id => @profile.id)
-    @params[:parent_id] = parent.id
+    parent = fast_create(Blog, :profile_id => profile.id)
+    params[:parent_id] = parent.id
     assert_not_includes @plugin.content_types, CommunityTrackPlugin::Track
   end
   should 'return Step as a content type if parent is a Track' do
-    parent = fast_create(CommunityTrackPlugin::Track, :profile_id => @profile.id)
-    @params[:parent_id] = parent.id
+    parent = fast_create(CommunityTrackPlugin::Track, :profile_id => profile.id)
+    params[:parent_id] = parent.id
     assert_includes @plugin.content_types, CommunityTrackPlugin::Step
   end
   should 'do not return Step as a content type if parent is not a Track' do
-    parent = fast_create(Blog, :profile_id => @profile.id)
-    @params[:parent_id] = parent.id
+    parent = fast_create(Blog, :profile_id => profile.id)
+    params[:parent_id] = parent.id
     assert_not_includes @plugin.content_types, CommunityTrackPlugin::Step
   end
   should 'return Track and Step as a content type if context has no params' do
-    parent = fast_create(Blog, :profile_id => @profile.id)
-    expects(:respond_to?).with(:params).returns(false)
+    parent = fast_create(Blog, :profile_id => profile.id)
+    context.expects(:respond_to?).with(:params).returns(false)
     assert_equivalent [CommunityTrackPlugin::Step, CommunityTrackPlugin::Track], @plugin.content_types
   end
   should 'return Track and Step as a content type if params is nil' do
-    parent = fast_create(Blog, :profile_id => @profile.id)
-    @params = nil
+    parent = fast_create(Blog, :profile_id => profile.id)
+    context.stubs(:params).returns(nil)
     assert_equivalent [CommunityTrackPlugin::Step, CommunityTrackPlugin::Track], @plugin.content_types
   end
@@ -226,7 +226,7 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
   end
   should 'list pending submissions for a form' do
-    person = fast_create(Person)
+    person = create_user('john').person
     form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software', :for_admission => true)
     task = CustomFormsPlugin::AdmissionSurvey.create!(:form_id => form.id, :target => person, :requestor => profile)
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + &#39;/../../../../../test/test_helper&#39;
 class CustomFormsPlugin::AdmissionSurveyTest < ActiveSupport::TestCase
   should 'add member to community on perform' do
     profile = fast_create(Community)
-    person = fast_create(Person)
+    person = create_user('john').person
     form = CustomFormsPlugin::Form.create!(:name => 'Simple Form', :profile => profile)
     task = CustomFormsPlugin::AdmissionSurvey.create!(:form_id => form.id, :target => person, :requestor => profile)
@@ -244,7 +244,7 @@ class CustomFormsPlugin::FormTest &lt; ActiveSupport::TestCase
   should 'cancel survey tasks after removing a form' do
     profile = fast_create(Profile)
-    person = fast_create(Person)
+    person = create_user('john').person
     form1 = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => profile)
     form2 = CustomFormsPlugin::Form.create!(:name => 'Operation System', :profile => profile)
@@ -13,7 +13,7 @@ class CustomFormsPlugin::MembershipSurveyTest &lt; ActiveSupport::TestCase
   should 'create submission with answers on perform' do
     profile = fast_create(Profile)
-    person = fast_create(Person)
+    person = create_user('john').person
     form = CustomFormsPlugin::Form.create!(:name => 'Simple Form', :profile => profile)
     field = CustomFormsPlugin::Field.create!(:name => 'Name', :form => form)
     task = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form.id, :submission => {field.id.to_s => 'Jack'}, :target => person, :requestor => profile)
@@ -31,7 +31,7 @@ class CustomFormsPlugin::MembershipSurveyTest &lt; ActiveSupport::TestCase
   should 'have a scope that retrieves all tasks requested by profile' do
     profile = fast_create(Profile)
-    person = fast_create(Person)
+    person = create_user('john').person
     form = CustomFormsPlugin::Form.create!(:name => 'Simple Form', :profile => profile)
     task1 = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form.id, :target => person, :requestor => profile)
     task2 = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form.id, :target => person, :requestor => fast_create(Profile))
@@ -5,7 +5,7 @@ class RoleAssignmentsTest &lt; ActiveSupport::TestCase
     environment = Environment.default
     environment.enable_plugin(CustomFormsPlugin)
     organization = fast_create(Organization)
-    person = fast_create(Person)
+    person = create_user('john').person
     f1 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 1', :on_membership => true)
     f2 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 2', :on_membership => true)
     f3 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 3', :on_membership => false)
@@ -19,7 +19,7 @@ class RoleAssignmentsTest &lt; ActiveSupport::TestCase
     environment = Environment.default
     environment.enable_plugin(CustomFormsPlugin)
     organization = fast_create(Organization)
-    person = fast_create(Person)
+    person = create_user('john').person
     form = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form', :on_membership => true, :access => 'associated')
     assert_difference 'CustomFormsPlugin::MembershipSurvey.count', 1 do
@@ -31,7 +31,7 @@ class RoleAssignmentsTest &lt; ActiveSupport::TestCase
     environment = Environment.default
     environment.enable_plugin(CustomFormsPlugin)
     organization = fast_create(Organization)
-    person = fast_create(Person)
+    person = create_user('john').person
     form1 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 1', :on_membership => true)
     organization.add_member(person)
@@ -59,7 +59,7 @@ class RoleAssignmentsTest &lt; ActiveSupport::TestCase
     environment = Environment.default
     environment.enable_plugin(CustomFormsPlugin)
     organization = fast_create(Organization)
-    person = fast_create(Person)
+    person = create_user('john').person
     f1 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 1', :for_admission => true)
     f2 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 2', :for_admission => true)
     f3 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 3', :for_admission => false)
@@ -13,17 +13,27 @@ class RemoteUserPlugin &lt; Noosfero::Plugin
       begin
         remote_user = request.headers["HTTP_REMOTE_USER"]
+        user_data = request.env['HTTP_REMOTE_USER_DATA']
-        if remote_user.nil?
+        if remote_user.blank?
           if logged_in?
             self.current_user.forget_me
             reset_session
           end
         else
+          if user_data.blank?
+            remote_user_email = remote_user + '@remote.user'
+            remote_user_name = remote_user
+          else
+            user_data = JSON.parse(user_data)
+            remote_user_email = user_data['email']
+            remote_user_name = user_data['name']
+          end
+
           if !logged_in?
             self.current_user = User.find_by_login(remote_user)
             unless self.current_user
-              self.current_user = User.create!(:login => remote_user, :email => (remote_user + '@remote.user'), :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user))
+              self.current_user = User.create!(:login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user))
               self.current_user.activate
             end
             self.current_user.save!
@@ -34,7 +44,7 @@ class RemoteUserPlugin &lt; Noosfero::Plugin
               self.current_user = User.find_by_login(remote_user)
               unless self.current_user
-                self.current_user = User.create!(:login => remote_user, :email => (remote_user + '@remote.user'), :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user))
+                self.current_user = User.create!(:login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user))
                 self.current_user.activate
               end
               self.current_user.save!
@@ -42,26 +42,64 @@ class AccountControllerTest &lt; ActionController::TestCase
     assert_equal user2.id, session[:user]
   end
-  should 'create a new user if the remote user does not exist' do
+  should 'create a new user with remote_user_data if the remote user does not exist' do
     User.destroy_all
     assert_equal 0, User.count
     @request.env["HTTP_REMOTE_USER"] = "testuser"
+    @request.env["CONTENT_TYPE"] = "application/json"
+    @request.env["HTTP_REMOTE_USER_DATA"] = '{"email":"testuser@domain.com", "name":"Test User"}'
     get :index
     assert_equal 1, User.count
     assert_equal "testuser", User.last.login
     assert_equal true, User.last.activated?
     assert_equal User.last.id, session[:user]
+    assert_equal "Test User", User.last.name
+    assert_equal "testuser@domain.com", User.last.email
   end
-  should 'create a new user even if there is a logged user but the remote user is different' do
+  should 'create a new user with remote_user_data even if there is a logged user but the remote user is different' do
     user = create_user('testuser', :email => 'testuser@example.com', :password => 'test', :password_confirmation => 'test')
     user.activate
     login_as user.login
+    @request.env["HTTP_REMOTE_USER"] = 'another_user'
+    @request.env["CONTENT_TYPE"] = "application/json"
+    @request.env["HTTP_REMOTE_USER_DATA"] = '{"email":"another_user@domain.com", "name":"Another User"}'
+    get :index
+
+    assert_equal 2, User.count
+    assert_equal "another_user", User.last.login
+    assert_equal true, User.last.activated?
+    assert_equal User.last.id, session[:user]
+    assert_equal "Another User", User.last.name
+    assert_equal "another_user@domain.com", User.last.email
+  end
+
+  should 'create a new user without remote_user_data if the remote user does not exist' do
+    User.destroy_all
+
+    assert_equal 0, User.count
+
+    @request.env["HTTP_REMOTE_USER"] = "testuser"
+    get :index
+
+    assert_equal 1, User.count
+    assert_equal "testuser", User.last.login
+    assert_equal true, User.last.activated?
+    assert_equal User.last.id, session[:user]
+    assert_equal "testuser", User.last.name
+    assert_equal "testuser@remote.user", User.last.email
+  end
+
+  should 'create a new user without remote_user_data even if there is a logged user but the remote user is different' do
+    user = create_user('testuser', :email => 'testuser@example.com', :password => 'test', :password_confirmation => 'test')
+    user.activate
+
+    login_as user.login
     @request.env["HTTP_REMOTE_USER"] = 'another_user'
     get :index
@@ -70,5 +108,23 @@ class AccountControllerTest &lt; ActionController::TestCase
     assert_equal "another_user", User.last.login
     assert_equal true, User.last.activated?
     assert_equal User.last.id, session[:user]
+    assert_equal "another_user", User.last.name
+    assert_equal "another_user@remote.user", User.last.email
+  end
+
+  should 'logout if there is a current logged user but not a remote user' do
+    user1 = create_user('testuser', :email => 'testuser@example.com', :password => 'test', :password_confirmation => 'test')
+    user1.activate
+
+    login_as user1.login
+
+    get :index
+
+    assert session[:user].blank?
+    
+    @request.env["HTTP_REMOTE_USER"] = ""
+    get :index
+
+    assert session[:user].blank?
   end
 end
@@ -8,7 +8,6 @@ Dir[tasks_dir].each do |file|
   load file
 end
-begin
-  Rake::Task['solr:download'].invoke
-rescue Exception => exception
-end
+puts 'To download solr:'
+puts '$ cd plugins/solr'
+puts '$ rake solr:download'
@@ -50,6 +50,7 @@ class SpaminatorPlugin::SpaminatorTest &lt; ActiveSupport::TestCase
   end
   should 'process only people from the environment and that are not abusers' do
+    Person.delete_all
     p1 = fast_create(Person)
     p2 = fast_create(Person)
     p3 = fast_create(Person, :environment_id => fast_create(Environment))
@@ -98,9 +98,12 @@ _enable(){
       dependencies_ok=true
       dependencies_file="$source/dependencies.rb"
       if [ -e $source/Gemfile ]; then
-        if ! (cd $source && bundle --local); then
+        gemfile=$(mktemp --tmpdir=.)
+        cat Gemfile $source/Gemfile > $gemfile
+        if ! RUBYOPT='' BUNDLE_GEMFILE="$gemfile" bundle --local --quiet; then
           dependencies_ok=false
         fi
+        rm -f $gemfile $gemfile.lock
       fi
       if ! run $dependencies_file; then
         dependencies_ok=false
@@ -18,7 +18,7 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     task.expects(:target_notification_description).returns('the task')
     requestor = mock()
-    requestor.expects(:notification_emails).returns(['requestor@example.com'])
+    requestor.expects(:notification_emails).returns(['requestor@example.com']).at_least_once
     requestor.expects(:name).returns('my name')
     environment = mock()
@@ -41,7 +41,7 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     task.expects(:target_notification_description).returns('the task')
     requestor = mock()
-    requestor.expects(:notification_emails).returns(['requestor@example.com'])
+    requestor.expects(:notification_emails).returns(['requestor@example.com']).at_least_once
     requestor.expects(:name).returns('my name')
     environment = mock()
@@ -65,7 +65,7 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     task.expects(:target_notification_description).returns('the task')
     requestor = mock()
-    requestor.expects(:notification_emails).returns(['requestor@example.com'])
+    requestor.expects(:notification_emails).returns(['requestor@example.com']).at_least_once
     requestor.expects(:name).returns('my name')
     environment = mock()
	@@ -193,7 +193,7 @@ class AccountController < ApplicationController		@@ -193,7 +193,7 @@ class AccountController < ApplicationController
193	else	193	else
194	@change_password.errors[:base] << _('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]]	194	@change_password.errors[:base] << _('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]]
195	end	195	end
196	- rescue ActiveRecord::RecordInvald	196	+ rescue ActiveRecord::RecordInvalid
197	@change_password.errors[:base] << _('Could not perform password recovery for the user.')	197	@change_password.errors[:base] << _('Could not perform password recovery for the user.')
198	end	198	end
199	end	199	end
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+<%= _('Dear %s,') % @requestor %>
	2	+
	3	+<%= word_wrap(@message) %>
	4	+
	5	+<%= _('Greetings,') %>
	6	+
	7	+--
	8	+<%= _('%s team.') % @environment %>
	9	+<%= @url %>
	@@ -1 +0,0 @@		@@ -1 +0,0 @@
1	-task_cancelled.text.erb
2	\ No newline at end of file	0	\ No newline at end of file
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-<%= _('Dear %s,') % @requestor %>
2	-
3	-<%= word_wrap(@message) %>
4	-
5	-<%= _('Greetings,') %>
6	-
7	---
8	-<%= _('%s team.') % @environment %>
9	-<%= @url %>
	@@ -15,4 +15,4 @@ var/lib/noosfero-data/public/thumbnails usr/share/noosfero/public/th		@@ -15,4 +15,4 @@ var/lib/noosfero-data/public/thumbnails usr/share/noosfero/public/th
15	usr/share/noosfero/public/designs/themes/noosfero usr/share/noosfero/public/designs/themes/default	15	usr/share/noosfero/public/designs/themes/noosfero usr/share/noosfero/public/designs/themes/default
16	usr/share/noosfero/public/designs/icons/tango usr/share/noosfero/public/designs/icons/default	16	usr/share/noosfero/public/designs/icons/tango usr/share/noosfero/public/designs/icons/default
17	usr/share/noosfero/script/noosfero-plugins usr/sbin/noosfero-plugins	17	usr/share/noosfero/script/noosfero-plugins usr/sbin/noosfero-plugins
18	-usr/share/noosfero/Gemfile.lock /dev/null	18	+/dev/null usr/share/noosfero/Gemfile.lock
	@@ -10,6 +10,15 @@ namespace :ci do		@@ -10,6 +10,15 @@ namespace :ci do
10	File.exist?(f)	10	File.exist?(f)
11	end	11	end
12		12
		13	+ changed_plugin_files = changed_files.select do \|f\|
		14	+ f.split(File::SEPARATOR).first == 'plugins'
		15	+ end
		16	+ changed_plugins = changed_plugin_files.map do \|f\|
		17	+ f.split(File::SEPARATOR)[1]
		18	+ end.uniq
		19	+
		20	+ changed_files -= changed_plugin_files
		21	+
13	# explicitly changed tests	22	# explicitly changed tests
14	tests = changed_files.select { \|f\| f =~ /test\/.*_test\.rb$/ }	23	tests = changed_files.select { \|f\| f =~ /test\/.*_test\.rb$/ }
15	features = changed_files.select { \|f\| f =~ /\.feature$/ }	24	features = changed_files.select { \|f\| f =~ /\.feature$/ }
	@@ -27,6 +36,13 @@ namespace :ci do		@@ -27,6 +36,13 @@ namespace :ci do
27	sh 'testrb', '-Itest', *tests unless tests.empty?	36	sh 'testrb', '-Itest', *tests unless tests.empty?
28	sh 'cucumber', *features unless features.empty?	37	sh 'cucumber', *features unless features.empty?
29	sh 'cucumber', '-p', 'selenium', *features unless features.empty?	38	sh 'cucumber', '-p', 'selenium', *features unless features.empty?
		39	+
		40	+ changed_plugins.each do \|plugin\|
		41	+ task = "test:noosfero_plugins:#{plugin}"
		42	+ puts "Running #{task}"
		43	+ Rake::Task[task].execute
		44	+ end
		45	+
30	end	46	end
31		47
32	end	48	end
	@@ -104,7 +104,7 @@ def run_test(name, files)		@@ -104,7 +104,7 @@ def run_test(name, files)
104	end	104	end
105		105
106	def run_testrb(files)	106	def run_testrb(files)
107	- sh 'testrb', '-Itest', *files	107	+ sh 'testrb', '-I.:test', *files
108	end	108	end
109		109
110	def run_cucumber(profile, files)	110	def run_cucumber(profile, files)
	@@ -8,5 +8,5 @@ page.replace_html "comment-count-#{@group_id}", @comments_count		@@ -8,5 +8,5 @@ page.replace_html "comment-count-#{@group_id}", @comments_count
8	if @no_more_pages	8	if @no_more_pages
9	page.replace_html "comments_list_group_#{@group_id}_more", ""	9	page.replace_html "comments_list_group_#{@group_id}_more", ""
10	else	10	else
11	- page.replace_html "comments_list_group_#{@group_id}_more", link_to_remote(_('More'), :url => { :profile => profile.identifier, :controller => 'comment_group_plugin_profile', :action => 'view_comments', :group_id => @group_id, :article_id => @article_id, :group_comment_page => @group_comment_page + 1}, :loaded => visual_effect(:highlight, "comments_list_group_#{@group_id}"), :method => :post, :complete => "loadCompleted(#{@group_id})")	11	+ page.replace_html "comments_list_group_#{@group_id}_more", link_to_remote(_('More'), :url => { :profile => profile.identifier, :controller => 'comment_group_plugin_profile', :action => 'view_comments', :group_id => @group_id, :article_id => @article_id, :group_comment_page => @group_comment_page + 1}, :method => :get)
12	end	12	end
@@ -0,0 +1,83 @@		@@ -0,0 +1,83 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+# Re-raise errors caught by the controller.
	4	+class ProfileController
	5	+ append_view_path File.join(File.dirname(__FILE__) + '/../../views')
	6	+ def rescue_action(e)
	7	+ raise e
	8	+ end
	9	+end
	10	+
	11	+class ProfileControllerTest < ActionController::TestCase
	12	+
	13	+ def setup
	14	+ @user = create_user('testinguser').person
	15	+ login_as(@user.identifier)
	16	+
	17	+ @community = fast_create(Community, :environment_id => Environment.default)
	18	+ @community.add_member @user
	19	+ @community.add_admin @user
	20	+
	21	+ @environment = @community.environment
	22	+ @environment.enabled_plugins = ['CommunityBlock']
	23	+ @environment.save!
	24	+
	25	+ CommunityBlock.delete_all
	26	+ @box1 = create(Box, :owner => @community)
	27	+ @community.boxes = [@box1]
	28	+
	29	+ @block = CommunityBlock.new
	30	+ @block.box = @box1
	31	+ @block.save!
	32	+
	33	+ @community.blocks<<@block
	34	+ @community.save!
	35	+ end
	36	+
	37	+ should 'display community-block' do
	38	+ get :index, :profile => @community.identifier
	39	+ assert_tag :div, :attributes => {:class => 'community-block-logo'}
	40	+ assert_tag :div, :attributes => {:class => 'community-block-info'}
	41	+ assert_tag :div, :attributes => {:class => 'community-block-title'}
	42	+ assert_tag :div, :attributes => {:class => 'community-block-description'}
	43	+ end
	44	+
	45	+ should 'display leave button when the user is logged in and is a member of the community' do
	46	+ get :index, :profile => @community.identifier
	47	+ assert_tag :span, :attributes => {:class => 'community-block-button icon-remove'}
	48	+ end
	49	+
	50	+ should 'display send email to administrators button when the user is logged in and is a member of the community' do
	51	+ get :index, :profile => @community.identifier
	52	+ assert_match /\{"Send an e-mail":\{"href":"\/contact\/#{@community.identifier}\/new"\}\}/, @response.body
	53	+ end
	54	+
	55	+ should 'display report button when the user is logged in and is a member of the community' do
	56	+ get :index, :profile => @community.identifier
	57	+ assert_match /\{"Report abuse":\{"href":"\/profile\/#{@community.identifier}\/report_abuse"\}\}/, @response.body
	58	+ end
	59	+
	60	+ should 'display join button when the user is logged in and is not a member of the community' do
	61	+ @community.remove_member @user
	62	+ get :index, :profile => @community.identifier
	63	+ assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
	64	+ end
	65	+
	66	+ should 'display control panel link option when the user is logged in and is community admin' do
	67	+ get :index, :profile => @community.identifier
	68	+ assert_match /\{"Control panel":\{"href":"\/myprofile\/#{@community.identifier}"\}\}/, @response.body
	69	+ end
	70	+
	71	+ should 'display join button when the user is not logged in' do
	72	+ logout
	73	+ get :index, :profile => @community.identifier
	74	+ assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
	75	+ end
	76	+
	77	+ should 'not display arrow button when the user is not logged in' do
	78	+ logout
	79	+ get :index, :profile => @community.identifier
	80	+ assert_no_tag :span, :attributes => {:class => 'community-block-button icon-arrow'}
	81	+ end
	82	+
	83	+end
	@@ -1,87 +0,0 @@	@@ -1,87 +0,0 @@
1	-require File.dirname(__FILE__) + '/../test_helper'
2	-
3	-# Re-raise errors caught by the controller.
4	-class ProfileController
5	- append_view_path File.join(File.dirname(__FILE__) + '/../../views')
6	- def rescue_action(e)
7	- raise e
8	- end
9	-end
10	-
11	-class ProfileControllerTest < ActionController::TestCase
12	-
13	- def setup
14	- @controller = ProfileController.new
15	- @request = ActionController::TestRequest.new
16	- @response = ActionController::TestResponse.new
17	-
18	- @user = create_user('testinguser').person
19	- login_as(@user.identifier)
20	-
21	- @community = fast_create(Community, :environment_id => Environment.default)
22	- @community.add_member @user
23	- @community.add_admin @user
24	-
25	- @environment = @community.environment
26	- @environment.enabled_plugins = ['CommunityBlock']
27	- @environment.save!
28	-
29	- CommunityBlock.delete_all
30	- @box1 = create(Box, :owner => @community)
31	- @community.boxes = [@box1]
32	-
33	- @block = CommunityBlock.new
34	- @block.box = @box1
35	- @block.save!
36	-
37	- @community.blocks<<@block
38	- @community.save!
39	- end
40	-
41	- should 'display community-block' do
42	- get :index, :profile => @community.identifier
43	- assert_tag :div, :attributes => {:class => 'community-block-logo'}
44	- assert_tag :div, :attributes => {:class => 'community-block-info'}
45	- assert_tag :div, :attributes => {:class => 'community-block-title'}
46	- assert_tag :div, :attributes => {:class => 'community-block-description'}
47	- end
48	-
49	- should 'display leave button when the user is logged in and is a member of the community' do
50	- get :index, :profile => @community.identifier
51	- assert_tag :span, :attributes => {:class => 'community-block-button icon-remove'}
52	- end
53	-
54	- should 'display send email to administrators button when the user is logged in and is a member of the community' do
55	- get :index, :profile => @community.identifier
56	- assert_match /\{"Send an e-mail":\{"href":"\/contact\/#{@community.identifier}\/new"\}\}/, @response.body
57	- end
58	-
59	- should 'display report button when the user is logged in and is a member of the community' do
60	- get :index, :profile => @community.identifier
61	- assert_match /\{"Report abuse":\{"href":"\/profile\/#{@community.identifier}\/report_abuse"\}\}/, @response.body
62	- end
63	-
64	- should 'display join button when the user is logged in and is not a member of the community' do
65	- @community.remove_member @user
66	- get :index, :profile => @community.identifier
67	- assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
68	- end
69	-
70	- should 'display control panel link option when the user is logged in and is community admin' do
71	- get :index, :profile => @community.identifier
72	- assert_match /\{"Control panel":\{"href":"\/myprofile\/#{@community.identifier}"\}\}/, @response.body
73	- end
74	-
75	- should 'display join button when the user is not logged in' do
76	- logout
77	- get :index, :profile => @community.identifier
78	- assert_tag :span, :attributes => {:class => 'community-block-button icon-add'}
79	- end
80	-
81	- should 'not display arrow button when the user is not logged in' do
82	- logout
83	- get :index, :profile => @community.identifier
84	- assert_no_tag :span, :attributes => {:class => 'community-block-button icon-arrow'}
85	- end
86	-
87	-end