Merge branch 'staging' into production

Victor Costa
2 parents 82eec1f1 e83b4b8c
Showing 31 changed files with 232 additions and 85 deletions Show diff stats
Gemfile
app/controllers/application_controller.rb
app/controllers/my_profile/memberships_controller.rb
app/controllers/public/account_controller.rb
app/models/community.rb
app/models/session.rb
app/models/suggest_article.rb
config/application.rb
features/edit_article.feature
features/forum.feature
features/media_panel_upload_files.feature
features/step_definitions/web_steps.rb
lib/acts_as_customizable.rb
lib/authenticated_system.rb
lib/feed_handler.rb
lib/noosfero/multi_tenancy.rb
plugins/comment_paragraph/controllers/profile/comment_paragraph_plugin_profile_controller.rb
plugins/comment_paragraph/lib/comment_paragraph_plugin/macros/allow_comment.rb
plugins/comment_paragraph/lib/ext/article.rb
plugins/comment_paragraph/public/comment_paragraph_macro.js
@@ -81,7 +81,7 @@ group :cucumber do
   gem 'cucumber'
   gem 'cucumber-rails',         '~> 1.4.2', :require => false
   gem 'database_cleaner',       '~> 1.3'
-  gem 'selenium-webdriver'
+  gem 'selenium-webdriver',     '>= 2.50'
 end
 # Requires custom dependencies
 require 'noosfero/multi_tenancy'
 class ApplicationController < ActionController::Base
-  #protect_from_forgery
+  protect_from_forgery
-  before_filter :setup_multitenancy
   before_filter :detect_stuff_by_domain
   before_filter :init_noosfero_plugins
   before_filter :allow_cross_domain_access
@@ -107,12 +106,7 @@ class ApplicationController &lt; ActionController::Base
   protected
   def verified_request?
-    true
-    #super || valid_authenticity_token?(session, request.headers['X-XSRF-TOKEN'])
-  end
-
-  def setup_multitenancy
-    Noosfero::MultiTenancy.setup!(request.host)
+    super || form_authenticity_token == request.headers['X-XSRF-TOKEN']
   end
   def boxes_editor?
@@ -137,12 +131,11 @@ class ApplicationController &lt; ActionController::Base
     @domain = Domain.find_by_name(request.host)
     if @domain.nil?
       @environment = Environment.default
-      if @environment.nil? && Rails.env.development?
-        # This should only happen in development ...
+      # Avoid crashes on test and development setups
+      if @environment.nil? && !Rails.env.production?
         @environment = Environment.new
         @environment.name = "Noosfero"
         @environment.is_default = true
-        @environment.save!
       end
     else
       @environment = @domain.environment
@@ -18,12 +18,14 @@ class MembershipsController &lt; MyProfileController
   def new_community
     @community = Community.new(params[:community])
+    custom_values = params[:profile_data][:custom_values] if (params[:profile_data] && params[:profile_data][:custom_values])
+    @community.custom_values = custom_values
     @community.environment = environment
     @back_to = params[:back_to] || url_for(:action => 'index')
     if request.post? && @community.valid?
       begin
         # Community was created
-        @community = Community.create_after_moderation(user, params[:community].merge({:environment => environment}))
+        @community = Community.create_after_moderation(user, params[:community].merge({:environment => environment, :custom_values => custom_values}))
         @community.reload
         redirect_to :action => 'welcome', :community_id => @community.id, :back_to => @back_to
       rescue ActiveRecord::RecordNotFound
@@ -6,7 +6,7 @@ class AccountController &lt; ApplicationController
   before_filter :redirect_if_logged_in, :only => [:login, :signup]
   before_filter :protect_from_bots, :only => :signup
-  #protect_from_forgery except: [:login]
+  protect_from_forgery except: [:login]
   helper CustomFieldsHelper
   # say something nice, you goof!  something sweet.
@@ -33,7 +33,7 @@ class Community &lt; Organization
     community = Community.new(attributes)
     community.environment = environment
     if community.environment.enabled?('admin_must_approve_new_communities')
-      CreateCommunity.create!(attributes.merge(:requestor => requestor, :environment => environment))
+      CreateCommunity.create!(attributes.merge(:requestor => requestor, :environment => environment).except(:custom_values))
     else
       community.save!
       community.add_admin(requestor)
 class Session < ActiveRecord::SessionStore::Session
-  def self.find_by_session_id(session_id)
-    where(session_id: session_id).first
+  # removed and redefined on super class
+  def self.find_by_session_id session_id
+    super
   end
   belongs_to :user
@@ -23,6 +23,10 @@ class SuggestArticle &lt; Task
     requestor ? "#{requestor.name}" : "#{name} (#{email})"
   end
+  def author_name
+    sender
+  end
+
   def article_object
     if @article_object.nil?
       @article_object = article_type.new(article.merge(target.present? ? {:profile => target} : {}).except(:type))
@@ -41,7 +45,6 @@ class SuggestArticle &lt; Task
       return type if type < Article
     end
     TinyMceArticle
-    (article[:type] || 'TinyMceArticle').constantize
   end
   def perform
@@ -15,6 +15,9 @@ module Noosfero
     require 'noosfero/plugin'
+    require 'noosfero/multi_tenancy'
+    config.middleware.use Noosfero::MultiTenancy::Middleware
+
     # Adds custom attributes to the Set of allowed html attributes for the #sanitize helper
     config.action_view.sanitized_allowed_attributes = 'align', 'border', 'alt', 'vspace', 'hspace', 'width', 'heigth', 'value', 'type', 'data', 'style', 'target', 'codebase', 'archive', 'classid', 'code', 'flashvars', 'scrolling', 'frameborder', 'controls', 'autoplay', 'colspan', 'rowspan', 'usemap', 'shape', 'coords'
@@ -90,7 +90,7 @@ Feature: edit article
     And I fill in "Title" with "My Folder"
     And I choose "article_published_false"
     And I uncheck "article_show_to_followers"
-    Then I should see "Fill in the search field to add the exception users to see this content"
+    Then I should see "Allow only community members entered below to view this content"
   @selenium
   Scenario: allowed user should see the content of a folder
@@ -79,7 +79,7 @@ Feature: forum
        | joaosilva | Forum One |
     And I go to /joaosilva/forum-one
     When I follow "Configure forum"
-    And I fill in "Description" with "My description"
+    And I fill in tinyMCE "article_body" with "My description"
     And I check "Has terms of use:"
     And I press "Save"
     Then I should see "Forum One"
@@ -95,7 +95,7 @@ Feature: forum
        | mariasilva | Maria Silva |
     And I go to /joaosilva/forum-one
     When I follow "Configure forum"
-    And I fill in "Description" with "My description"
+    And I fill in tinyMCE "article_body" with "My description"
     And I check "Has terms of use:"
     And I press "Save"
     When I follow "New discussion topic"
@@ -118,7 +118,7 @@ Feature: forum
        | mariasilva | Maria Silva |
     And I go to /joaosilva/forum-one
     When I follow "Configure forum"
-    And I fill in "Description" with "My description"
+    And I fill in tinyMCE "article_body" with "My description"
     And I check "Has terms of use:"
     And I press "Save"
     When I follow "Logout"
@@ -135,7 +135,7 @@ Feature: forum
        | joaosilva | Forum One |
     And I go to /joaosilva/forum-one
     When I follow "Configure forum"
-    And I fill in "Description" with "My description"
+    And I fill in tinyMCE "article_body" with "My description"
     And I check "Has terms of use:"
     And I press "Save"
     When I follow "Logout"
@@ -94,20 +94,17 @@ Feature: uploads items on media panel
   @selenium
   Scenario: select type when create new folder
-    When I follow "Show/Hide"
-      And I follow "New folder"
-      And I choose "Folder" within "#new-folder-dialog"
-      And I fill in "Name" with "Main new folder" within "#new-folder-dialog"
-      And I press "Create"
+    Given I follow "Show/Hide"
+    And I follow "New folder"
+    And I choose "Folder" within "#new-folder-dialog"
+    And I fill in "Name" with "Main new folder" within "#new-folder-dialog"
+    When I press "Create"
     Then I should see "joaosilva/Gallery/Main new folder" within "#parent_id"
-    When I follow "New folder"
-      And I choose "Gallery" within "#new-folder-dialog"
-      And I fill in "Name" with "Gallery new folder" within "#new-folder-dialog"
-      And I press "Create"
-      And I go to joaosilva's cms
-      And I follow "Gallery"
-    Then I should see "Folder" within "tr[title='Main new folder'] td.article-mime"
-      And I should see "Gallery" within "tr[title='Gallery new folder'] td.article-mime"
+    Given I follow "New folder"
+    And I choose "Gallery" within "#new-folder-dialog"
+    And I fill in "Name" with "Gallery new folder" within "#new-folder-dialog"
+    When I press "Create"
+    Then I should see "joaosilva/Gallery/Gallery new folder" within "#parent_id"
   @selenium
   Scenario: hide and show upload list
@@ -39,7 +39,37 @@ end
 When /^(?:|I )follow "([^"]*)"(?: within "([^"]*)")?$/ do |link, selector|
   with_scope(selector) do
-    click_link(link, :match => :prefer_exact)
+    begin
+      click_link(link, :match => :prefer_exact)
+    rescue Selenium::WebDriver::Error::UnknownError => selenium_error
+      if selenium_error.message.start_with? 'Element is not clickable at point'
+        link = find_link(link)
+        href = link[:href]
+        onclick = link[:onClick]
+
+        warn "#{selenium_error.message}\n\n"\
+             "Trying to overcome this by:\n"
+
+        onclick_return = true
+
+        unless onclick.nil?
+          warn "\t* Running onClick JS:\n"\
+               "\t\t'#{onclick}'\n"
+          onclick_return = page.execute_script onclick
+        end
+
+        if onclick_return
+          warn "\t* Redirecting you to the link's href:\n"\
+               "\t\t'#{href}'\n"
+
+          visit href
+        end
+
+        warn "\nGood luck and be careful that this may produce hidden links to work on tests!\n"
+      else
+        raise selenium_error
+      end
+    end
   end
 end
@@ -107,6 +137,7 @@ When /^(?:|I )attach the file &quot;([^&quot;]*)&quot; to &quot;([^&quot;]*)&quot;(?: within &quot;([^&quot;]*)&quot;)?$/ do 
   with_scope(selector) do
     attach_file(field, path)
   end
+  sleep 1
 end
 Then /^(?:|I )should see JSON:$/ do |expected_json|
@@ -260,6 +291,21 @@ Then /^display &quot;([^\&quot;]*)&quot;$/ do |element|
   evaluate_script("jQuery('#{element}').show() && false;")
 end
+Then /^I fill in tinyMCE "(.*?)" with "(.*?)"$/ do |field, content|
+  n = 0
+  begin
+    execute_script("tinymce.editors['#{field}'].setContent('#{content}')")
+  rescue Selenium::WebDriver::Error::JavascriptError
+    n += 1
+    if n < 5
+      sleep 1
+      retry
+    else
+      raise
+    end
+  end
+end
+
 Then /^there should be a div with class "([^"]*)"$/ do |klass|
   should have_selector("div.#{klass}")
 end
@@ -90,7 +90,7 @@ module Customizable
       custom_values.each_pair do |key, value|
         custom_field = environment.custom_fields.detect{|cf|cf.name==key}
         next if custom_field.blank?
-        custom_field_value = self.custom_field_values.detect{|cv| cv.custom_field.name==key}
+        custom_field_value = self.custom_field_values(true).detect{|cv| cv.custom_field.name==key}
         if custom_field_value.nil?
           custom_field_value = CustomFieldValue.new
@@ -23,17 +23,6 @@ module AuthenticatedSystem
     def current_user
       @current_user ||= begin
         id = session[:user]
-
-        session_id = cookies[:_noosfero_session]
-        if id.blank? && session_id.present?
-          Session.connection.clear_query_cache
-          session_obj = Session.where(session_id: session_id).first
-          if session_obj.present?
-            session = session_obj.data
-            id = session_obj.user_id
-          end
-        end
-
         user = User.where(id: id).first if id
         user.session = session if user
         User.current = user
@@ -60,7 +60,7 @@ class FeedHandler
   def process(container)
     begin
       container.class.transaction do
-        if container.update_errors > FeedHandler.max_errors && container.fetched_at < (Time.now - FeedHandler.disabled_period)
+        if failed_too_many_times(container) && enough_time_since_last_failure(container)
           container.enabled = true
           container.update_errors = 0
           container.save
@@ -110,4 +110,12 @@ class FeedHandler
     url =~ URI.regexp('http') || url =~ URI.regexp('https')
   end
+  def failed_too_many_times(container)
+    container.update_errors > FeedHandler.max_errors
+  end
+
+  def enough_time_since_last_failure(container)
+    container.fetched_at.nil? || container.fetched_at < (Time.now - FeedHandler.disabled_period)
+  end
+
 end
@@ -22,6 +22,18 @@ module Noosfero
       end
     end
+    class Middleware
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        request = Rack::Request.new(env)
+        Noosfero::MultiTenancy.setup!(request.host)
+        @app.call(env)
+      end
+    end
+
     private
     def self.load_map
 require 'csv'
-class CommentParagraphPluginProfileController < ProfileController
+class CommentParagraphPluginProfileController < CommentController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
   def view_comments
@@ -12,6 +12,16 @@ class CommentParagraphPluginProfileController &lt; ProfileController
     render :partial => 'comment/comment.html.erb', :collection => @comments
   end
+  def comment_form
+    @page = profile.articles.find(params[:article_id])
+    render :partial => 'comment/comment_form', :locals => {
+      :comment => Comment.new,
+      :display_link => true,
+      :cancel_triggers_hide => true,
+      :paragraph_uuid => params[:paragraph_uuid]
+    }
+  end
+
   include CommentParagraphPlugin::CommentsReport
   def export_comments
@@ -10,7 +10,8 @@ class CommentParagraphPlugin::AllowComment &lt; Noosfero::Plugin::Macro
   def parse(params, inner_html, source)
     paragraph_uuid = params[:paragraph_uuid]
     article = source
-    count = article.paragraph_comments.without_spam.in_paragraph(paragraph_uuid).count
+    @paragraph_comments_counts ||= article.paragraph_comments.without_spam.group(:paragraph_uuid).reorder(:paragraph_uuid).count
+    count = @paragraph_comments_counts.fetch(paragraph_uuid, 0)
     proc {
       if controller.kind_of?(ContentViewerController) && article.comment_paragraph_plugin_activated?
@@ -36,7 +36,7 @@ class Article
     if body && (body_changed? || setting_changed?(:comment_paragraph_plugin_activate))
       updated = body_changed? ? body_change[1] : body
       doc =  Nokogiri::HTML(updated)
-      doc.css('li, body > div, body > span, body > p').each do |paragraph|
+      (doc.css('li') + doc.css('body > div, body > span, body > p')).each do |paragraph|
         next if paragraph.css('[data-macro="comment_paragraph_plugin/allow_comment"]').present? || paragraph.content.blank?
         commentable = Nokogiri::XML::Node.new("span", doc)
@@ -80,6 +80,12 @@ jQuery(document).ready(function($) {
         container.find('.display-comment-form').show();
       }
     });
+    var formDiv = container.find('.side-comment .post_comment_box');
+    if(formDiv.find('.page-comment-form').length==0) {
+      $.ajax(formDiv.data('comment_paragraph_form_url')).done(function(data) {
+        formDiv.append(data);
+      });
+    }
   });
@@ -10,6 +10,9 @@ class CommentParagraphPluginProfileControllerTest &lt; ActionController::TestCase
     @profile = create_user('testuser').person
     @article = profile.articles.build(:name => 'test')
     @article.save!
+    @environment = Environment.default
+    @environment.enabled_plugins = ['CommentParagraphPlugin']
+    @environment.save!
   end
   attr_reader :article, :profile
@@ -39,6 +42,14 @@ class CommentParagraphPluginProfileControllerTest &lt; ActionController::TestCase
     assert_match /d comment/, @response.body
   end
+  should 'load the comment form for a paragraph' do
+    login_as('testuser')
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :paragraph_uuid => 0)
+    xhr :get, :comment_form, :profile => @profile.identifier, :article_id => article.id, :paragraph_uuid => 0
+    assert_select ".page-comment-form"
+    assert_select "#comment_paragraph_uuid[value=?]", '0'
+  end
+
   should 'export comments as CSV' do
     comment1 = fast_create(Comment, :created_at => Time.now - 1.days, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'a comment', :paragraph_uuid => nil)
     comment2 = fast_create(Comment, :created_at => Time.now - 2.days, :source_id => article, :author_id => profile, :title => 'b comment', :body => 'b comment', :paragraph_uuid => nil)
@@ -46,4 +46,13 @@ class AllowCommentTest &lt; ActiveSupport::TestCase
     assert_equal 'inner', instance_eval(&content)
   end
+  should 'preload comment counts when parsing content' do
+    3.times { fast_create(Comment, :paragraph_uuid => '2', :source_id => article.id) }
+    content = macro.parse({:paragraph_uuid => comment.paragraph_uuid}, article.body, article)
+    paragraph_comments_counts = macro.instance_variable_get(:@paragraph_comments_counts)
+    assert_equivalent ['1', '2'], paragraph_comments_counts.keys
+    assert_equal 1, paragraph_comments_counts['1']
+    assert_equal 3, paragraph_comments_counts['2']
+  end
+
 end
@@ -11,14 +11,14 @@
   </div>
   <% load_comments_url = url_for({:profile => profile_identifier, :controller => 'comment_paragraph_plugin_profile', :action => 'view_comments', :paragraph_uuid => paragraph_uuid, :article_id => article_id}) %>
+  <% load_comment_form_url = url_for({:profile => profile_identifier, :controller => 'comment_paragraph_plugin_profile', :action => 'comment_form', :paragraph_uuid => paragraph_uuid, :article_id => article_id}) %>
   <div class="side-comment" data-comment_paragraph_url="<%= load_comments_url %>">
     <div class="article-comments-list">
       <div class="loading"></div>
     </div>
     <div class ="article-comments-list-more"></div>
-    <div class='post_comment_box closed'>
-      <%= render :partial => 'comment/comment_form', :locals => {:comment => Comment.new, :display_link => true, :cancel_triggers_hide => true, :paragraph_uuid => paragraph_uuid}%>
+    <div class='post_comment_box closed' data-comment_paragraph_form_url="<%= load_comment_form_url %>">
     </div>
   </div>
 </div>
@@ -568,12 +568,6 @@ function userDataCallback(data) {
     // logged in
     jQuery('head').append('<meta content="authenticity_token" name="csrf-param" />');
     jQuery('head').append('<meta content="'+jQuery.cookie("_noosfero_.XSRF-TOKEN")+'" name="csrf-token" />');
-    jQuery.ajaxSetup({
-      cache: false,
-      headers: {
-        'X-XSRF-TOKEN': jQuery.cookie("_noosfero_.XSRF-TOKEN")
-      }
-    });
   }
   if (data.notice) {
     display_notice(data.notice);
@@ -108,6 +108,15 @@ class AccountControllerTest &lt; ActionController::TestCase
     end
   end
+  def test_shoud_save_with_custom_field_on_signup
+    assert_difference 'User.count' do
+      assert_difference 'CustomFieldValue.count' do
+        CustomField.create!(:name => "zombies", :format=>"String", :default_value => "awrrr", :customized_type=>"Profile", :active => true, :required => true, :signup => true, :environment => Environment.default)
+        new_user({},{"profile_data"=> {"custom_values"=>{"zombies"=>{"value"=>"BRAINSSS"}}}})
+      end
+    end
+  end
+
   def test_should_logout
     login_as :johndoe
     get :logout
@@ -478,30 +478,6 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     assert_response :forbidden
   end
-  if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-
-    should 'change postgresql schema' do
-      uses_host 'schema1.com'
-      Noosfero::MultiTenancy.expects(:on?).returns(true)
-      Noosfero::MultiTenancy.expects(:mapping).returns({ 'schema1.com' => 'schema1' }).at_least_once
-      exception = assert_raise(ActiveRecord::StatementInvalid) { get :index }
-
-      # we have switched to a new database schema; depending on the PostgreSQL
-      # version, we will receive either an error message because the schema
-      # does not exist, or an error saying that whatever table we need can't be
-      # found.
-      assert_match /(SET search_path TO schema1|PG::UndefinedTable)/, exception.message
-    end
-
-    should 'not change postgresql schema if multitenancy is off' do
-      uses_host 'schema1.com'
-      Noosfero::MultiTenancy.stubs(:on?).returns(false)
-      Noosfero::MultiTenancy.stubs(:mapping).returns({ 'schema1.com' => 'schema1' })
-      assert_nothing_raised(ActiveRecord::StatementInvalid) { get :index }
-    end
-
-  end
-
   should 'register search_term occurrence on find_by_contents' do
     controller = ApplicationController.new
     controller.stubs(:environment).returns(Environment.default)
@@ -36,6 +36,17 @@ class MembershipsControllerTest &lt; ActionController::TestCase
     end
   end
+  should 'be able to create a new community with custom field' do
+    assert_difference 'Community.count' do
+      assert_difference 'CustomFieldValue.count' do
+        CustomField.create!(:name => "zombies", :format=>"String", :default_value => "awrrr", :customized_type=>"Community", :active => true, :required => true, :signup => true, :environment => Environment.default)
+        post :new_community, :profile => profile.identifier, :community => { :name => 'My shiny new community', :description => 'This is a community devoted to anything interesting we find in the internet '}, "profile_data"=>{"custom_values"=>{"zombies"=>{"value"=>"BRAINSSS"}}}
+        assert_response :redirect
+        assert Community.find_by_identifier('my-shiny-new-community').members.include?(profile), "Creator user should be added as member of the community just created"
+      end
+    end
+  end
+
   should 'link to new community creation in index' do
     get :index, :profile => profile.identifier
     assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/memberships/new_community" }
@@ -360,6 +360,19 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_select "#tasks_#{t.id}_task_name"
   end
+  should "not crash when article suggestion task fails" do
+    TinyMceArticle.destroy_all
+    c = fast_create(Community)
+    c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
+    @controller.stubs(:profile).returns(c)
+    t = SuggestArticle.create!(:article => {:name => 'test name', :abstract => 'test abstract', :body => 'test body'}, :name => 'some name', :email => 'test@localhost.com', :target => c)
+
+    SuggestArticle.any_instance.stubs(:perform).raises('erro')
+    assert_nothing_raised do
+      post :close, :tasks => {t.id => { :task => {}, :decision => "finish"}}
+    end
+  end
+
   should "append hidden tag with type value from article suggestion" do
     Task.destroy_all
     c = fast_create(Community)
@@ -0,0 +1,40 @@
+require_relative "../test_helper"
+
+class MultiTenancyTest < ActionDispatch::IntegrationTest
+
+  should 'change postgresql schema' do
+    host! 'schema1.com'
+    Noosfero::MultiTenancy.expects(:on?).at_least_once.returns(true)
+    Noosfero::MultiTenancy.expects(:mapping).returns({ 'schema1.com' => 'schema1' }).at_least_once
+    exception = assert_raise(ActiveRecord::StatementInvalid) { get '/' }
+
+    # we have switched to a new database schema; depending on the PostgreSQL
+    # version, we will receive either an error message because the schema
+    # does not exist, or an error saying that whatever table we need can't be
+    # found.
+    assert_match /(SET search_path TO schema1|PG::UndefinedTable)/, exception.message
+  end
+
+  should 'not change postgresql schema if multitenancy is off' do
+    host! 'schema1.com'
+    Noosfero::MultiTenancy.stubs(:on?).returns(false)
+    Noosfero::MultiTenancy.stubs(:mapping).returns({ 'schema1.com' => 'schema1' })
+    assert_nothing_raised(ActiveRecord::StatementInvalid) { get '/' }
+  end
+
+  should 'find session from the correct database schema' do
+    Noosfero::MultiTenancy.expects(:on?).at_least_once.returns(true)
+    Noosfero::MultiTenancy.expects(:mapping).returns({ 'schema2.com' => 'public', 'schema1.com' => 'schema1' }).at_least_once
+
+    user = create_user
+    session_obj = create(Session, user_id: user.id, session_id: 'some_id', data: {})
+    person_identifier = user.person.identifier
+    
+    Noosfero::MultiTenancy.setup!('schema1.com')
+    host! 'schema2.com'
+    cookies[:_noosfero_session] = session_obj.session_id
+    assert_nothing_raised { get "/myprofile/#{person_identifier}" }
+    assert_equal 'public', ActiveRecord::Base.connection.schema_search_path
+  end
+
+end
@@ -133,6 +133,14 @@ class FeedHandlerTest &lt; ActiveSupport::TestCase
       assert container.enabled, 'must reenable container after <disabled_period> (%s)' % container_class
     end
+
+    should "handle a feed that was never fetched successfully (#{container_class})" do
+      container = create(container_class)
+      container.update_errors = FeedHandler.max_errors + 1
+      container.fetched_at = nil
+      handler.expects(:actually_process_container).with(container)
+      handler.process(container)
+    end
   end
   should 'not crash even when finish fetch fails' do
@@ -242,4 +242,9 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
     t.article_type == TinyMceArticle
   end
+  should 'fallback to tinymce when type parameter is blank' do
+    t = SuggestArticle.new
+    t.article = {:name => 'name', :body => 'body', :type => ''}
+    t.article_type == TinyMceArticle
+  end
 end
	@@ -81,7 +81,7 @@ group :cucumber do		@@ -81,7 +81,7 @@ group :cucumber do
81	gem 'cucumber'	81	gem 'cucumber'
82	gem 'cucumber-rails', '~> 1.4.2', :require => false	82	gem 'cucumber-rails', '~> 1.4.2', :require => false
83	gem 'database_cleaner', '~> 1.3'	83	gem 'database_cleaner', '~> 1.3'
84	- gem 'selenium-webdriver'	84	+ gem 'selenium-webdriver', '>= 2.50'
85	end	85	end
86		86
87	# Requires custom dependencies	87	# Requires custom dependencies
	@@ -6,7 +6,7 @@ class AccountController < ApplicationController		@@ -6,7 +6,7 @@ class AccountController < ApplicationController
6	before_filter :redirect_if_logged_in, :only => [:login, :signup]	6	before_filter :redirect_if_logged_in, :only => [:login, :signup]
7	before_filter :protect_from_bots, :only => :signup	7	before_filter :protect_from_bots, :only => :signup
8		8
9	- #protect_from_forgery except: [:login]	9	+ protect_from_forgery except: [:login]
10		10
11	helper CustomFieldsHelper	11	helper CustomFieldsHelper
12	# say something nice, you goof! something sweet.	12	# say something nice, you goof! something sweet.
	@@ -33,7 +33,7 @@ class Community < Organization		@@ -33,7 +33,7 @@ class Community < Organization
33	community = Community.new(attributes)	33	community = Community.new(attributes)
34	community.environment = environment	34	community.environment = environment
35	if community.environment.enabled?('admin_must_approve_new_communities')	35	if community.environment.enabled?('admin_must_approve_new_communities')
36	- CreateCommunity.create!(attributes.merge(:requestor => requestor, :environment => environment))	36	+ CreateCommunity.create!(attributes.merge(:requestor => requestor, :environment => environment).except(:custom_values))
37	else	37	else
38	community.save!	38	community.save!
39	community.add_admin(requestor)	39	community.add_admin(requestor)
1	class Session < ActiveRecord::SessionStore::Session	1	class Session < ActiveRecord::SessionStore::Session
2		2
3	- def self.find_by_session_id(session_id)
4	- where(session_id: session_id).first	3	+ # removed and redefined on super class
		4	+ def self.find_by_session_id session_id
		5	+ super
5	end	6	end
6		7
7	belongs_to :user	8	belongs_to :user
	@@ -15,6 +15,9 @@ module Noosfero		@@ -15,6 +15,9 @@ module Noosfero
15		15
16	require 'noosfero/plugin'	16	require 'noosfero/plugin'
17		17
		18	+ require 'noosfero/multi_tenancy'
		19	+ config.middleware.use Noosfero::MultiTenancy::Middleware
		20	+
18	# Adds custom attributes to the Set of allowed html attributes for the #sanitize helper	21	# Adds custom attributes to the Set of allowed html attributes for the #sanitize helper
19	config.action_view.sanitized_allowed_attributes = 'align', 'border', 'alt', 'vspace', 'hspace', 'width', 'heigth', 'value', 'type', 'data', 'style', 'target', 'codebase', 'archive', 'classid', 'code', 'flashvars', 'scrolling', 'frameborder', 'controls', 'autoplay', 'colspan', 'rowspan', 'usemap', 'shape', 'coords'	22	config.action_view.sanitized_allowed_attributes = 'align', 'border', 'alt', 'vspace', 'hspace', 'width', 'heigth', 'value', 'type', 'data', 'style', 'target', 'codebase', 'archive', 'classid', 'code', 'flashvars', 'scrolling', 'frameborder', 'controls', 'autoplay', 'colspan', 'rowspan', 'usemap', 'shape', 'coords'
20		23
	@@ -90,7 +90,7 @@ Feature: edit article		@@ -90,7 +90,7 @@ Feature: edit article
90	And I fill in "Title" with "My Folder"	90	And I fill in "Title" with "My Folder"
91	And I choose "article_published_false"	91	And I choose "article_published_false"
92	And I uncheck "article_show_to_followers"	92	And I uncheck "article_show_to_followers"
93	- Then I should see "Fill in the search field to add the exception users to see this content"	93	+ Then I should see "Allow only community members entered below to view this content"
94		94
95	@selenium	95	@selenium
96	Scenario: allowed user should see the content of a folder	96	Scenario: allowed user should see the content of a folder
	@@ -79,7 +79,7 @@ Feature: forum		@@ -79,7 +79,7 @@ Feature: forum
79	\| joaosilva \| Forum One \|	79	\| joaosilva \| Forum One \|
80	And I go to /joaosilva/forum-one	80	And I go to /joaosilva/forum-one
81	When I follow "Configure forum"	81	When I follow "Configure forum"
82	- And I fill in "Description" with "My description"	82	+ And I fill in tinyMCE "article_body" with "My description"
83	And I check "Has terms of use:"	83	And I check "Has terms of use:"
84	And I press "Save"	84	And I press "Save"
85	Then I should see "Forum One"	85	Then I should see "Forum One"
	@@ -95,7 +95,7 @@ Feature: forum		@@ -95,7 +95,7 @@ Feature: forum
95	\| mariasilva \| Maria Silva \|	95	\| mariasilva \| Maria Silva \|
96	And I go to /joaosilva/forum-one	96	And I go to /joaosilva/forum-one
97	When I follow "Configure forum"	97	When I follow "Configure forum"
98	- And I fill in "Description" with "My description"	98	+ And I fill in tinyMCE "article_body" with "My description"
99	And I check "Has terms of use:"	99	And I check "Has terms of use:"
100	And I press "Save"	100	And I press "Save"
101	When I follow "New discussion topic"	101	When I follow "New discussion topic"
	@@ -118,7 +118,7 @@ Feature: forum		@@ -118,7 +118,7 @@ Feature: forum
118	\| mariasilva \| Maria Silva \|	118	\| mariasilva \| Maria Silva \|
119	And I go to /joaosilva/forum-one	119	And I go to /joaosilva/forum-one
120	When I follow "Configure forum"	120	When I follow "Configure forum"
121	- And I fill in "Description" with "My description"	121	+ And I fill in tinyMCE "article_body" with "My description"
122	And I check "Has terms of use:"	122	And I check "Has terms of use:"
123	And I press "Save"	123	And I press "Save"
124	When I follow "Logout"	124	When I follow "Logout"
	@@ -135,7 +135,7 @@ Feature: forum		@@ -135,7 +135,7 @@ Feature: forum
135	\| joaosilva \| Forum One \|	135	\| joaosilva \| Forum One \|
136	And I go to /joaosilva/forum-one	136	And I go to /joaosilva/forum-one
137	When I follow "Configure forum"	137	When I follow "Configure forum"
138	- And I fill in "Description" with "My description"	138	+ And I fill in tinyMCE "article_body" with "My description"
139	And I check "Has terms of use:"	139	And I check "Has terms of use:"
140	And I press "Save"	140	And I press "Save"
141	When I follow "Logout"	141	When I follow "Logout"
	@@ -39,7 +39,37 @@ end		@@ -39,7 +39,37 @@ end
39		39
40	When /^(?:\|I )follow "([^"])"(?: within "([^"])")?$/ do \|link, selector\|	40	When /^(?:\|I )follow "([^"])"(?: within "([^"])")?$/ do \|link, selector\|
41	with_scope(selector) do	41	with_scope(selector) do
42	- click_link(link, :match => :prefer_exact)	42	+ begin
		43	+ click_link(link, :match => :prefer_exact)
		44	+ rescue Selenium::WebDriver::Error::UnknownError => selenium_error
		45	+ if selenium_error.message.start_with? 'Element is not clickable at point'
		46	+ link = find_link(link)
		47	+ href = link[:href]
		48	+ onclick = link[:onClick]
		49	+
		50	+ warn "#{selenium_error.message}\n\n"\
		51	+ "Trying to overcome this by:\n"
		52	+
		53	+ onclick_return = true
		54	+
		55	+ unless onclick.nil?
		56	+ warn "\t* Running onClick JS:\n"\
		57	+ "\t\t'#{onclick}'\n"
		58	+ onclick_return = page.execute_script onclick
		59	+ end
		60	+
		61	+ if onclick_return
		62	+ warn "\t* Redirecting you to the link's href:\n"\
		63	+ "\t\t'#{href}'\n"
		64	+
		65	+ visit href
		66	+ end
		67	+
		68	+ warn "\nGood luck and be careful that this may produce hidden links to work on tests!\n"
		69	+ else
		70	+ raise selenium_error
		71	+ end
		72	+ end
43	end	73	end
44	end	74	end
45		75
	@@ -107,6 +137,7 @@ When /^(?:\|I )attach the file "([^"])" to "([^"])"(?: within "([^"]*)")?$/ do		@@ -107,6 +137,7 @@ When /^(?:\|I )attach the file "([^"])" to "([^"])"(?: within "([^"]*)")?$/ do
107	with_scope(selector) do	137	with_scope(selector) do
108	attach_file(field, path)	138	attach_file(field, path)
109	end	139	end
		140	+ sleep 1
110	end	141	end
111		142
112	Then /^(?:\|I )should see JSON:$/ do \|expected_json\|	143	Then /^(?:\|I )should see JSON:$/ do \|expected_json\|
	@@ -260,6 +291,21 @@ Then /^display "([^\"]*)"$/ do \|element\|		@@ -260,6 +291,21 @@ Then /^display "([^\"]*)"$/ do \|element\|
260	evaluate_script("jQuery('#{element}').show() && false;")	291	evaluate_script("jQuery('#{element}').show() && false;")
261	end	292	end
262		293
		294	+Then /^I fill in tinyMCE "(.?)" with "(.?)"$/ do \|field, content\|
		295	+ n = 0
		296	+ begin
		297	+ execute_script("tinymce.editors['#{field}'].setContent('#{content}')")
		298	+ rescue Selenium::WebDriver::Error::JavascriptError
		299	+ n += 1
		300	+ if n < 5
		301	+ sleep 1
		302	+ retry
		303	+ else
		304	+ raise
		305	+ end
		306	+ end
		307	+end
		308	+
263	Then /^there should be a div with class "([^"]*)"$/ do \|klass\|	309	Then /^there should be a div with class "([^"]*)"$/ do \|klass\|
264	should have_selector("div.#{klass}")	310	should have_selector("div.#{klass}")
265	end	311	end
	@@ -90,7 +90,7 @@ module Customizable		@@ -90,7 +90,7 @@ module Customizable
90	custom_values.each_pair do \|key, value\|	90	custom_values.each_pair do \|key, value\|
91	custom_field = environment.custom_fields.detect{\|cf\|cf.name==key}	91	custom_field = environment.custom_fields.detect{\|cf\|cf.name==key}
92	next if custom_field.blank?	92	next if custom_field.blank?
93	- custom_field_value = self.custom_field_values.detect{\|cv\| cv.custom_field.name==key}	93	+ custom_field_value = self.custom_field_values(true).detect{\|cv\| cv.custom_field.name==key}
94		94
95	if custom_field_value.nil?	95	if custom_field_value.nil?
96	custom_field_value = CustomFieldValue.new	96	custom_field_value = CustomFieldValue.new
	@@ -23,17 +23,6 @@ module AuthenticatedSystem		@@ -23,17 +23,6 @@ module AuthenticatedSystem
23	def current_user	23	def current_user
24	@current_user \|\|= begin	24	@current_user \|\|= begin
25	id = session[:user]	25	id = session[:user]
26	-
27	- session_id = cookies[:_noosfero_session]
28	- if id.blank? && session_id.present?
29	- Session.connection.clear_query_cache
30	- session_obj = Session.where(session_id: session_id).first
31	- if session_obj.present?
32	- session = session_obj.data
33	- id = session_obj.user_id
34	- end
35	- end
36	-
37	user = User.where(id: id).first if id	26	user = User.where(id: id).first if id
38	user.session = session if user	27	user.session = session if user
39	User.current = user	28	User.current = user