Merge commit 'refs/merge-requests/167' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/167

Merge commit 'refs/merge-requests/167' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/167
Daniela Feitosa
2 parents 011db1bb ed2a58fd
Showing 21 changed files with 225 additions and 126 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/public/account_controller.rb
app/helpers/article_helper.rb
app/models/article.rb
app/models/environment.rb
app/models/user.rb
app/views/cms/_tiny_mce_article.rhtml
app/views/content_viewer/_article_toolbar.rhtml
app/views/profile_editor/index.rhtml
features/delete_profile.feature
lib/noosfero/i18n.rb
lib/tasks/gettext.rake
script/quick-start-debian
test/factories.rb
test/fixtures/roles.yml
test/functional/account_controller_test.rb
test/functional/cms_controller_test.rb
test/functional/profile_editor_controller_test.rb
test/unit/article_test.rb
test/unit/cms_helper_test.rb
@@ -15,42 +15,21 @@ class CmsController &lt; MyProfileController
   end
   before_filter :login_required, :except => [:suggest_an_article]
+
   protect_if :except => [:suggest_an_article, :set_home_page, :edit, :destroy, :publish] do |c, user, profile|
     user && (user.has_permission?('post_content', profile) || user.has_permission?('publish_content', profile))
   end
-  protect_if :only => [:edit, :destroy, :publish] do |c, user, profile|
+  protect_if :only => [:destroy, :publish] do |c, user, profile|
     profile.articles.find(c.params[:id]).allow_post_content?(user)
   end
-  def boxes_holder
-    profile
-  end
-
-  include CmsHelper
-
-  def available_article_types
-    articles = [
-      TinyMceArticle,
-      TextileArticle,
-      Event
-    ]
-    articles += special_article_types if params && params[:cms]
-    parent_id = params ? params[:parent_id] : nil
-    if profile.enterprise?
-      articles << EnterpriseHomepage
-    end
-    if @parent && @parent.blog?
-      articles -= Article.folder_types.map(&:constantize)
-    end
-    if user.is_admin?(profile.environment)
-      articles << RawHTMLArticle
-    end
-    articles
+  protect_if :only => :edit do |c,user,profile|
+    profile.articles.find(c.params[:id]).allow_edit?(user)
   end
-  def special_article_types
-    [Folder, Blog, UploadedFile, Forum, Gallery, RssFeed] + @plugins.dispatch(:content_types)
+  def boxes_holder
+    profile
   end
   def view
@@ -303,6 +282,33 @@ class CmsController &lt; MyProfileController
   protected
+  include CmsHelper
+
+  def available_article_types
+    articles = [
+      TinyMceArticle,
+      TextileArticle,
+      Event
+    ]
+    articles += special_article_types if params && params[:cms]
+    parent_id = params ? params[:parent_id] : nil
+    if profile.enterprise?
+      articles << EnterpriseHomepage
+    end
+    if @parent && @parent.blog?
+      articles -= Article.folder_types.map(&:constantize)
+    end
+    if user.is_admin?(profile.environment)
+      articles << RawHTMLArticle
+    end
+    articles
+  end
+
+  def special_article_types
+    [Folder, Blog, UploadedFile, Forum, Gallery, RssFeed] + @plugins.dispatch(:content_types)
+  end
+
+
   def record_coming
     if request.post?
       @back_to = params[:back_to]
@@ -78,7 +78,12 @@ class AccountController &lt; ApplicationController
           invitation.update_attributes!({:friend => @user.person})
           invitation.finish
         end
-        @register_pending = true
+        if @user.activated?
+          self.current_user = @user
+          redirect_to '/'
+        else
+          @register_pending = true
+        end
       end
     rescue ActiveRecord::RecordInvalid
       @person.valid?
@@ -8,19 +8,32 @@ module ArticleHelper
         'div',
         check_box(:article, :published) +
         content_tag('label', _('This article must be published (visible to other people)'), :for => 'article_published')
-      ) + (article.parent && article.parent.forum? && controller.action_name == 'new' ?
+      ) +
+
+      (article.profile.has_members? ?
+      content_tag(
+        'div',
+        check_box(:article, :allow_members_to_edit) +
+        content_tag('label', _('Allow all members to edit this article'), :for => 'article_allow_members_to_edit')
+      ) :
+      '') +
+
+      (article.parent && article.parent.forum? && controller.action_name == 'new' ?
       hidden_field_tag('article[accept_comments]', 1) :
       content_tag(
         'div',
         check_box(:article, :accept_comments) +
         content_tag('label', (article.parent && article.parent.forum? ? _('This topic is opened for replies') : _('I want to receive comments about this article')), :for => 'article_accept_comments')
       )) +
+
       content_tag(
         'div',
         check_box(:article, :notify_comments) +
         content_tag('label', _('I want to receive a notification of each comment written by e-mail'), :for => 'article_notify_comments') +
         observe_field(:article_accept_comments, :function => "$('article_notify_comments').disabled = ! $('article_accept_comments').checked") 
-      ) + (article.can_display_hits? ?
+      ) +
+
+      (article.can_display_hits? ?
       content_tag(
         'div',
         check_box(:article, :display_hits) +
@@ -26,6 +26,7 @@ class Article &lt; ActiveRecord::Base
   settings_items :display_hits, :type => :boolean, :default => true
   settings_items :author_name, :type => :string, :default => ""
+  settings_items :allow_members_to_edit, :type => :boolean, :default => false
   belongs_to :reference_article, :class_name => "Article", :foreign_key => 'reference_article_id'
@@ -408,6 +409,17 @@ class Article &lt; ActiveRecord::Base
     user && user.has_permission?('view_private_content', profile)
   end
+  alias :allow_delete?  :allow_post_content?
+  alias :allow_spread?  :allow_post_content?
+
+  def allow_create?(user)
+    allow_post_content?(user) || allow_publish_content?(user)
+  end
+
+  def allow_edit?(user)
+    allow_post_content?(user) || user && allow_members_to_edit && user.is_member_of?(profile)
+  end
+
   def comments_updated
     ferret_update
   end
@@ -94,7 +94,6 @@ class Environment &lt; ActiveRecord::Base
       'disable_asset_events' => _('Disable search for events'),
       'disable_products_for_enterprises' => __('Disable products for enterprises'),
       'disable_categories' => _('Disable categories'),
-      'disable_cms' => _('Disable CMS'),
       'disable_header_and_footer' => _('Disable header/footer editing by users'),
       'disable_gender_icon' => _('Disable gender icon'),
       'disable_categories_menu' => _('Disable the categories menu'),
@@ -122,6 +121,7 @@ class Environment &lt; ActiveRecord::Base
       'xmpp_chat' => _('XMPP/Jabber based chat'),
       'show_zoom_button_on_article_images' => _('Show a zoom link on all article images'),
       'captcha_for_logged_users' => _('Ask captcha when a logged user comments too'),
+      'skip_new_user_email_confirmation' => _('Skip e-mail confirmation for new users')
     }
   end
@@ -35,6 +35,9 @@ class User &lt; ActiveRecord::Base
     user.person.name ||= user.login
     user.person.visible = false unless user.activated?
     user.person.save!
+    if user.environment && user.environment.enabled?('skip_new_user_email_confirmation')
+      user.activate
+    end
   end
   after_create :deliver_activation_code
   after_create :delay_activation_check
@@ -3,13 +3,7 @@
 <%= render :file => 'shared/tiny_mce' %>
 <div>
-  <% if profile.enterprise? && environment.enabled?('disable_cms') && !@article.name.blank? %>
-    <div>
-      <%= _('Title') %>: <%= @article.name %>
-    </div>
-  <% else %>
-    <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64')) %>
-  <% end %>
+  <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64')) %>
   <%= render :partial => 'translatable' %>
   <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true} %>
-<div<%= " class='logged-in'" if user %>>
+<div<%= user && " class='logged-in'" %>>
   <div id="article-actions">
-    <% if @page.allow_post_content?(user) || @page.allow_publish_content?(user) %>
-      <% if @page.allow_post_content?(user) %>
-        <%= link_to content_tag( 'span', label_for_edit_article(@page) ),
-            profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }),
-            :class => 'button with-text icon-edit' %>
-        <% if !(profile.kind_of?(Enterprise) && environment.enabled?('disable_cms')) %>
-          <% if @page != profile.home_page && !@page.has_posts? %>
-            <%= link_to content_tag( 'span', _('Delete') ),
-              profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}),
-              :method => :post,
-              :class => 'button with-text icon-delete',
-              :confirm => delete_article_message(@page) %>
-          <% end %>
-          <% if !environment.enabled?('disable_cms') && !@page.folder? %>
-            <% if profile.kind_of?(Person) %>
-              <%= link_to content_tag( 'span', _('Spread this') ),
-                  profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }),
-                  :class => 'button with-text icon-spread' %>
-            <% elsif profile.kind_of?(Community) && environment.portal_community %>
-              <%= link_to content_tag( 'span', _('Spread this') ),
-                  profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }),
-                  :class => 'button with-text icon-spread' %>
-            <% end %>
-          <% end %>
-        <% end %>
-      <% end %>
-      <% if !(profile.kind_of?(Enterprise) && environment.enabled?('disable_cms')) %>
-        <% if !@page.gallery? %>
-          <%= link_to _('Add translation'),
-              profile.admin_url.merge(:controller => 'cms', :action => 'new',
-                                      :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)),
-                                      :type => @page.type, :article => { :translation_of_id => @page.native_translation.id }),
-              :class => 'button with-text icon-locale' if @page.translatable? && !@page.native_translation.language.blank? %>
-          <%= lightbox_remote_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) %>
-        <% end %>
-      <% end %>
-      <% if @page.accept_uploads? %>
-        <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
+
+    <% if @page.allow_edit?(user) %>
+      <%= link_to content_tag( 'span', label_for_edit_article(@page) ),
+          profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }),
+          :class => 'button with-text icon-edit' %>
+    <% end %>
+
+    <% if @page != profile.home_page && !@page.has_posts?  && @page.allow_delete?(user) %>
+      <%= link_to content_tag( 'span', _('Delete') ),
+        profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}),
+        :method => :post,
+        :class => 'button with-text icon-delete',
+        :confirm => delete_article_message(@page) %>
+    <% end %>
+
+    <% if !@page.folder? && @page.allow_spread?(user) %>
+      <% if profile.kind_of?(Person) %>
+        <%= link_to content_tag( 'span', _('Spread this') ),
+            profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }),
+            :class => 'button with-text icon-spread' %>
+      <% elsif profile.kind_of?(Community) && environment.portal_community %>
+        <%= link_to content_tag( 'span', _('Spread this') ),
+            profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }),
+            :class => 'button with-text icon-spread' %>
       <% end %>
+    <% end %>
+
+    <% if !@page.gallery? && @page.allow_create?(user) %>
+      <%= link_to _('Add translation'),
+          profile.admin_url.merge(:controller => 'cms', :action => 'new',
+                                  :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)),
+                                  :type => @page.type, :article => { :translation_of_id => @page.native_translation.id }),
+          :class => @page.translatable? && !@page.native_translation.language.blank? && 'button with-text icon-locale' %>
+      <%= lightbox_remote_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) %>
+    <% end %>
+
+    <% if @page.accept_uploads? && @page.allow_create?(user) %>
+      <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
+    <% end %>
-    <% elsif profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) %>
+    <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) %>
       <%= link_to content_tag( 'span', _('Suggest an article') ), profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}), :id => 'suggest-article-link', :class => 'button with-text icon-new' %>
     <% end %>
@@ -26,7 +26,7 @@
   <%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
-  <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') if !environment.enabled?('disable_cms') || profile.community? %>
+  <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') %>
   <% unless profile.enterprise? %>
     <%= case profile.blogs.count
@@ -98,13 +98,6 @@ Feature: delete profile
     And I go to /myprofile/sample-enterprise/profile_editor/destroy_profile
     Then I should see "Access denied"
-  Scenario: community regular member cannot see link to delete profile
-    Given "Joao Silva" is a member of "Sample Community"
-    And I am logged in as "joaosilva"
-    And I am on Sample Community's control panel
-    When I follow "Community Info and settings"
-    Then I should not see "Delete profile"
-
   Scenario: environment admin deletes profile
     Given I am logged in as admin
     And I am on Joao Silva's control panel
@@ -12,7 +12,6 @@ repos = []
 if File.exists?(locale_dir)
   repos << FastGettext::TranslationRepository.build('noosfero', :type => 'mo', :path => locale_dir)
   repos << FastGettext::TranslationRepository.build('iso_3166', :type => 'mo', :path => locale_dir)
-  repos << FastGettext::TranslationRepository.build('rails',    :type => 'mo', :path => locale_dir)
 end
 FastGettext.add_text_domain 'noosferofull', :type => :chain, :chain => repos
@@ -26,7 +26,7 @@ task :symlinkmo do
     lang = File.basename(dir)
     orig_lang = langmap[lang] || lang
     mkdir_p("#{Rails.root}/locale/#{lang}/LC_MESSAGES")
-    ['iso_3166', 'rails'].each do |domain|
+    ['iso_3166'].each do |domain|
       origin = "/usr/share/locale/#{orig_lang}/LC_MESSAGES/#{domain}.mo"
       target = "#{Rails.root}/locale/#{lang}/LC_MESSAGES/#{domain}.mo"
       if !File.symlink?(target)
@@ -22,7 +22,7 @@ run sudo apt-get -y install $runtime_dependencies
 # needed for development
 run sudo apt-get -y install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev
-run gem install bundler
+gem which bundler >/dev/null 2>&1 || run gem install bundler
 run bundle install
 # create the database with sample data
@@ -34,7 +34,10 @@ run rake db:test:prepare
 # compile translations
 run rake noosfero:translations:compile
-# start server
+# create needed directory
+mkdir -p tmp/pids
+
+# you can now start the server
 say "I: Congratulations, you are ready to run Noosfero."
-say "I: To execute Noosfero server, run \`/script/server-say "I: To execute Noosfero server, run \`/script/server and browse to http://localhost:3000"
+say "I: To execute Noosfero in development mode, run \`/script/development+say "I: To execute Noosfero in development mode, run \`/script/development and browse to http://localhost:3000"
 say "I: To execute Noosfero tests, run \`rake\`."
@@ -71,7 +71,8 @@ module Noosfero::Factory
   # testing that passes through the actual user creation process.
   #
   # Be aware that this is slow, though.
-  def create_user_full(name, options = {}, person_options = {})
+  def create_user_full(name = nil, options = {}, person_options = {})
+    name ||= 'user' + factory_num_seq.to_s
     data = {
       :login => name,
       :email => name + '@noosfero.org',
@@ -90,7 +91,8 @@ module Noosfero::Factory
   # This method knows way too much about the model. But since creating an
   # actual user is really expensive, for tests we need a fast alternative.
-  def create_user(name, options = {}, person_options = {})
+  def create_user(name = nil, options = {}, person_options = {})
+    name ||= 'user' + factory_num_seq.to_s
     environment_id = options.delete(:environment_id) || (options.delete(:environment) || Environment.default).id
     password = options.delete(:password)
@@ -58,9 +58,7 @@ profile_member:
   name: 'Profile Member'
   system: true
   permissions:
-   - edit_profile
-   - post_content
-   - manage_products
+   - invite_members
 profile_moderator:
   id: 7
   environment_id: 1
@@ -737,6 +737,16 @@ class AccountControllerTest &lt; ActionController::TestCase
     end
   end
+  should 'login after signup when no e-mail confirmation is required' do
+    e = Environment.default
+    e.enable('skip_new_user_email_confirmation')
+    e.save!
+
+    new_user
+    assert_response :redirect
+    assert_not_nil assigns(:current_user)
+  end
+
   protected
     def new_user(options = {}, extra_options ={})
       data = {:profile_data => person_data}
@@ -15,7 +15,6 @@ class CmsControllerTest &lt; ActionController::TestCase
     @profile = create_user_with_permission('testinguser', 'post_content')
     login_as :testinguser
-    @controller.stubs(:user).returns(@profile)
   end
   attr_reader :profile
@@ -601,12 +600,14 @@ class CmsControllerTest &lt; ActionController::TestCase
   should 'not make enterprise homepage available to person' do
     @controller.stubs(:profile).returns(profile)
-    assert_not_includes @controller.available_article_types, EnterpriseHomepage
+    @controller.stubs(:user).returns(profile)
+    assert_not_includes available_article_types, EnterpriseHomepage
   end
   should 'make enterprise homepage available to enterprises' do
     @controller.stubs(:profile).returns(fast_create(Enterprise, :name => 'test_ent', :identifier => 'test_ent'))
-    assert_includes @controller.available_article_types, EnterpriseHomepage
+    @controller.stubs(:user).returns(profile)
+    assert_includes available_article_types, EnterpriseHomepage
   end
   should 'update categories' do
@@ -838,18 +839,20 @@ class CmsControllerTest &lt; ActionController::TestCase
   should 'not offer folder to blog articles' do
     @controller.stubs(:profile).returns(fast_create(Enterprise, :name => 'test_ent', :identifier => 'test_ent'))
+    @controller.stubs(:user).returns(profile)
     blog = Blog.create!(:name => 'Blog for test', :profile => profile)
     @controller.stubs(:params).returns({ :parent_id => blog.id })
-    assert_not_includes @controller.available_article_types, Folder
+    assert_not_includes available_article_types, Folder
   end
   should 'not offer rssfeed to blog articles' do
     @controller.stubs(:profile).returns(fast_create(Enterprise, :name => 'test_ent', :identifier => 'test_ent'))
+    @controller.stubs(:user).returns(profile)
     blog = Blog.create!(:name => 'Blog for test', :profile => profile)
     @controller.stubs(:params).returns({ :parent_id => blog.id })
-    assert_not_includes @controller.available_article_types, RssFeed
+    assert_not_includes available_article_types, RssFeed
   end
   should 'update blog posts_per_page setting' do
@@ -1140,6 +1143,21 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_template 'edit'
   end
+  should 'allow community members to edit articles that allow it' do
+    community = fast_create(Community)
+    admin = create_user('community-admin').person
+    member = create_user.person
+
+    community.add_admin(admin)
+    community.add_member(member)
+
+    article = community.articles.create!(:name => 'test_article', :allow_members_to_edit => true)
+
+    login_as member.identifier
+    get :edit, :profile => community.identifier, :id => article.id
+    assert_response :success
+  end
+
   should 'create thumbnails for images with delayed_job' do
     post :upload_files, :profile => profile.identifier, :uploaded_files => [fixture_file_upload('/files/rails.png', 'image/png'), fixture_file_upload('/files/test.txt', 'text/plain')]
     file_1 = profile.articles.find_by_path('rails.png')
@@ -1203,18 +1221,20 @@ class CmsControllerTest &lt; ActionController::TestCase
   should 'not offer folder to forum articles' do
     @controller.stubs(:profile).returns(fast_create(Enterprise, :name => 'test_ent', :identifier => 'test_ent'))
+    @controller.stubs(:user).returns(profile)
     forum = Forum.create!(:name => 'Forum for test', :profile => profile)
     @controller.stubs(:params).returns({ :parent_id => forum.id })
-    assert_not_includes @controller.available_article_types, Folder
+    assert_not_includes available_article_types, Folder
   end
   should 'not offer rssfeed to forum articles' do
     @controller.stubs(:profile).returns(fast_create(Enterprise, :name => 'test_ent', :identifier => 'test_ent'))
+    @controller.stubs(:user).returns(profile)
     forum = Forum.create!(:name => 'Forum for test', :profile => profile)
     @controller.stubs(:params).returns({ :parent_id => forum.id })
-    assert_not_includes @controller.available_article_types, RssFeed
+    assert_not_includes available_article_types, RssFeed
   end
   should 'update forum posts_per_page setting' do
@@ -1499,20 +1519,12 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_nil data[1]['error']
   end
-  protected
-
-  # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
-  # For now we are assuming that the JSON is close enough to Ruby and just
-  # making some adjustments.
-  def parse_json_response
-    eval(@response.body.gsub('":', '"=>').gsub('null', 'nil'))
-  end
-
   should 'make RawHTMLArticle available only to environment admins' do
     @controller.stubs(:profile).returns(profile)
-    assert_not_includes @controller.available_article_types, RawHTMLArticle
+    @controller.stubs(:user).returns(profile)
+    assert_not_includes available_article_types, RawHTMLArticle
     profile.environment.add_admin(profile)
-    assert_includes @controller.available_article_types, RawHTMLArticle
+    assert_includes available_article_types, RawHTMLArticle
   end
   should 'include new contents special types from plugins' do
@@ -1526,8 +1538,25 @@ class CmsControllerTest &lt; ActionController::TestCase
     get :index, :profile => profile.identifier
-    assert_includes @controller.special_article_types, Integer
-    assert_includes @controller.special_article_types, Float
+    assert_includes special_article_types, Integer
+    assert_includes special_article_types, Float
+  end
+
+  protected
+
+  # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
+  # For now we are assuming that the JSON is close enough to Ruby and just
+  # making some adjustments.
+  def parse_json_response
+    eval(@response.body.gsub('":', '"=>').gsub('null', 'nil'))
+  end
+
+  def available_article_types
+    @controller.send(:available_article_types)
+  end
+
+  def special_article_types
+    @controller.send(:special_article_types)
   end
 end
@@ -601,15 +601,6 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'a', :attributes => { :href => '/myprofile/default_user/cms' }
   end
-  should 'not display link to CMS if disabled' do
-    env = Environment.default
-    env.enable('disable_cms')
-    env.save!
-    get :index, :profile => profile.identifier
-
-    assert_no_tag :tag => 'a', :attributes => { :href => '/myprofile/default_user/cms' }
-  end
-
   should 'offer to create blog in control panel' do
     get :index, :profile => profile.identifier
     assert_tag :tag => 'a', :attributes => { :href => "/myprofile/default_user/cms/new?type=Blog" }
@@ -1638,4 +1638,37 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal [c1,c2,c5], Article.text_articles
   end
+  should 'not allow all community members to edit by default' do
+    community = fast_create(Community)
+    admin = create_user('community-admin').person
+    member = create_user.person
+
+    community.add_admin(admin)
+    community.add_member(member)
+    a = Article.new(:profile => community)
+
+    assert_equal false, a.allow_members_to_edit
+    assert_equal false, a.allow_edit?(member)
+  end
+
+  should 'be able to allow all members of a community to edit' do
+    community = fast_create(Community)
+    admin = create_user('community-admin').person
+    member = create_user.person
+
+    community.add_admin(admin)
+    community.add_member(member)
+    a = Article.new(:profile => community)
+
+    a.allow_members_to_edit = true
+
+    assert_equal true, a.allow_edit?(member)
+  end
+
+  should 'not crash on allow_edit without a current user' do
+    a = build(Article)
+    a.allow_members_to_edit = true
+    assert !a.allow_edit?(nil)
+  end
+
 end
@@ -8,7 +8,7 @@ class CmsHelperTest &lt; ActiveSupport::TestCase
   should 'show default options for article' do
     CmsHelperTest.any_instance.stubs(:controller).returns(ActionController::Base.new)
-    result = options_for_article(RssFeed.new)
+    result = options_for_article(RssFeed.new(:profile => Profile.new))
     assert_match /id="article_published" name="article\[published\]" type="checkbox" value="1"/, result
     assert_match /id="article_accept_comments" name="article\[accept_comments\]" type="checkbox" value="1"/, result
   end
@@ -478,6 +478,14 @@ class UserTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'activate right after creation when confirmation is not required' do
+    e = Environment.default
+    e.enable('skip_new_user_email_confirmation')
+    e.save!
+
+    assert new_user.activated?
+  end
+
   protected
     def new_user(options = {})
       user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
	@@ -26,6 +26,7 @@ class Article < ActiveRecord::Base		@@ -26,6 +26,7 @@ class Article < ActiveRecord::Base
26		26
27	settings_items :display_hits, :type => :boolean, :default => true	27	settings_items :display_hits, :type => :boolean, :default => true
28	settings_items :author_name, :type => :string, :default => ""	28	settings_items :author_name, :type => :string, :default => ""
		29	+ settings_items :allow_members_to_edit, :type => :boolean, :default => false
29		30
30	belongs_to :reference_article, :class_name => "Article", :foreign_key => 'reference_article_id'	31	belongs_to :reference_article, :class_name => "Article", :foreign_key => 'reference_article_id'
31		32
	@@ -408,6 +409,17 @@ class Article < ActiveRecord::Base		@@ -408,6 +409,17 @@ class Article < ActiveRecord::Base
408	user && user.has_permission?('view_private_content', profile)	409	user && user.has_permission?('view_private_content', profile)
409	end	410	end
410		411
		412	+ alias :allow_delete? :allow_post_content?
		413	+ alias :allow_spread? :allow_post_content?
		414	+
		415	+ def allow_create?(user)
		416	+ allow_post_content?(user) \|\| allow_publish_content?(user)
		417	+ end
		418	+
		419	+ def allow_edit?(user)
		420	+ allow_post_content?(user) \|\| user && allow_members_to_edit && user.is_member_of?(profile)
		421	+ end
		422	+
411	def comments_updated	423	def comments_updated
412	ferret_update	424	ferret_update
413	end	425	end
	@@ -26,7 +26,7 @@		@@ -26,7 +26,7 @@
26		26
27	<%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>	27	<%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
28		28
29	- <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') if !environment.enabled?('disable_cms') \|\| profile.community? %>	29	+ <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') %>
30		30
31	<% unless profile.enterprise? %>	31	<% unless profile.enterprise? %>
32	<%= case profile.blogs.count	32	<%= case profile.blogs.count
	@@ -98,13 +98,6 @@ Feature: delete profile		@@ -98,13 +98,6 @@ Feature: delete profile
98	And I go to /myprofile/sample-enterprise/profile_editor/destroy_profile	98	And I go to /myprofile/sample-enterprise/profile_editor/destroy_profile
99	Then I should see "Access denied"	99	Then I should see "Access denied"
100		100
101	- Scenario: community regular member cannot see link to delete profile
102	- Given "Joao Silva" is a member of "Sample Community"
103	- And I am logged in as "joaosilva"
104	- And I am on Sample Community's control panel
105	- When I follow "Community Info and settings"
106	- Then I should not see "Delete profile"
107	-
108	Scenario: environment admin deletes profile	101	Scenario: environment admin deletes profile
109	Given I am logged in as admin	102	Given I am logged in as admin
110	And I am on Joao Silva's control panel	103	And I am on Joao Silva's control panel
	@@ -12,7 +12,6 @@ repos = []		@@ -12,7 +12,6 @@ repos = []
12	if File.exists?(locale_dir)	12	if File.exists?(locale_dir)
13	repos << FastGettext::TranslationRepository.build('noosfero', :type => 'mo', :path => locale_dir)	13	repos << FastGettext::TranslationRepository.build('noosfero', :type => 'mo', :path => locale_dir)
14	repos << FastGettext::TranslationRepository.build('iso_3166', :type => 'mo', :path => locale_dir)	14	repos << FastGettext::TranslationRepository.build('iso_3166', :type => 'mo', :path => locale_dir)
15	- repos << FastGettext::TranslationRepository.build('rails', :type => 'mo', :path => locale_dir)
16	end	15	end
17		16
18	FastGettext.add_text_domain 'noosferofull', :type => :chain, :chain => repos	17	FastGettext.add_text_domain 'noosferofull', :type => :chain, :chain => repos
	@@ -26,7 +26,7 @@ task :symlinkmo do		@@ -26,7 +26,7 @@ task :symlinkmo do
26	lang = File.basename(dir)	26	lang = File.basename(dir)
27	orig_lang = langmap[lang] \|\| lang	27	orig_lang = langmap[lang] \|\| lang
28	mkdir_p("#{Rails.root}/locale/#{lang}/LC_MESSAGES")	28	mkdir_p("#{Rails.root}/locale/#{lang}/LC_MESSAGES")
29	- ['iso_3166', 'rails'].each do \|domain\|	29	+ ['iso_3166'].each do \|domain\|
30	origin = "/usr/share/locale/#{orig_lang}/LC_MESSAGES/#{domain}.mo"	30	origin = "/usr/share/locale/#{orig_lang}/LC_MESSAGES/#{domain}.mo"
31	target = "#{Rails.root}/locale/#{lang}/LC_MESSAGES/#{domain}.mo"	31	target = "#{Rails.root}/locale/#{lang}/LC_MESSAGES/#{domain}.mo"
32	if !File.symlink?(target)	32	if !File.symlink?(target)
	@@ -737,6 +737,16 @@ class AccountControllerTest < ActionController::TestCase		@@ -737,6 +737,16 @@ class AccountControllerTest < ActionController::TestCase
737	end	737	end
738	end	738	end
739		739
		740	+ should 'login after signup when no e-mail confirmation is required' do
		741	+ e = Environment.default
		742	+ e.enable('skip_new_user_email_confirmation')
		743	+ e.save!
		744	+
		745	+ new_user
		746	+ assert_response :redirect
		747	+ assert_not_nil assigns(:current_user)
		748	+ end
		749	+
740	protected	750	protected
741	def new_user(options = {}, extra_options ={})	751	def new_user(options = {}, extra_options ={})
742	data = {:profile_data => person_data}	752	data = {:profile_data => person_data}
	@@ -601,15 +601,6 @@ class ProfileEditorControllerTest < ActionController::TestCase		@@ -601,15 +601,6 @@ class ProfileEditorControllerTest < ActionController::TestCase
601	assert_tag :tag => 'a', :attributes => { :href => '/myprofile/default_user/cms' }	601	assert_tag :tag => 'a', :attributes => { :href => '/myprofile/default_user/cms' }
602	end	602	end
603		603
604	- should 'not display link to CMS if disabled' do
605	- env = Environment.default
606	- env.enable('disable_cms')
607	- env.save!
608	- get :index, :profile => profile.identifier
609	-
610	- assert_no_tag :tag => 'a', :attributes => { :href => '/myprofile/default_user/cms' }
611	- end
612	-
613	should 'offer to create blog in control panel' do	604	should 'offer to create blog in control panel' do
614	get :index, :profile => profile.identifier	605	get :index, :profile => profile.identifier
615	assert_tag :tag => 'a', :attributes => { :href => "/myprofile/default_user/cms/new?type=Blog" }	606	assert_tag :tag => 'a', :attributes => { :href => "/myprofile/default_user/cms/new?type=Blog" }
	@@ -1638,4 +1638,37 @@ class ArticleTest < ActiveSupport::TestCase		@@ -1638,4 +1638,37 @@ class ArticleTest < ActiveSupport::TestCase
1638	assert_equal [c1,c2,c5], Article.text_articles	1638	assert_equal [c1,c2,c5], Article.text_articles
1639	end	1639	end
1640		1640
		1641	+ should 'not allow all community members to edit by default' do
		1642	+ community = fast_create(Community)
		1643	+ admin = create_user('community-admin').person
		1644	+ member = create_user.person
		1645	+
		1646	+ community.add_admin(admin)
		1647	+ community.add_member(member)
		1648	+ a = Article.new(:profile => community)
		1649	+
		1650	+ assert_equal false, a.allow_members_to_edit
		1651	+ assert_equal false, a.allow_edit?(member)
		1652	+ end
		1653	+
		1654	+ should 'be able to allow all members of a community to edit' do
		1655	+ community = fast_create(Community)
		1656	+ admin = create_user('community-admin').person
		1657	+ member = create_user.person
		1658	+
		1659	+ community.add_admin(admin)
		1660	+ community.add_member(member)
		1661	+ a = Article.new(:profile => community)
		1662	+
		1663	+ a.allow_members_to_edit = true
		1664	+
		1665	+ assert_equal true, a.allow_edit?(member)
		1666	+ end
		1667	+
		1668	+ should 'not crash on allow_edit without a current user' do
		1669	+ a = build(Article)
		1670	+ a.allow_members_to_edit = true
		1671	+ assert !a.allow_edit?(nil)
		1672	+ end
		1673	+
1641	end	1674	end
	@@ -8,7 +8,7 @@ class CmsHelperTest < ActiveSupport::TestCase		@@ -8,7 +8,7 @@ class CmsHelperTest < ActiveSupport::TestCase
8		8
9	should 'show default options for article' do	9	should 'show default options for article' do
10	CmsHelperTest.any_instance.stubs(:controller).returns(ActionController::Base.new)	10	CmsHelperTest.any_instance.stubs(:controller).returns(ActionController::Base.new)
11	- result = options_for_article(RssFeed.new)	11	+ result = options_for_article(RssFeed.new(:profile => Profile.new))
12	assert_match /id="article_published" name="article\[published\]" type="checkbox" value="1"/, result	12	assert_match /id="article_published" name="article\[published\]" type="checkbox" value="1"/, result
13	assert_match /id="article_accept_comments" name="article\[accept_comments\]" type="checkbox" value="1"/, result	13	assert_match /id="article_accept_comments" name="article\[accept_comments\]" type="checkbox" value="1"/, result
14	end	14	end
	@@ -478,6 +478,14 @@ class UserTest < ActiveSupport::TestCase		@@ -478,6 +478,14 @@ class UserTest < ActiveSupport::TestCase
478	end	478	end
479	end	479	end
480		480
		481	+ should 'activate right after creation when confirmation is not required' do
		482	+ e = Environment.default
		483	+ e.enable('skip_new_user_email_confirmation')
		484	+ e.save!
		485	+
		486	+ assert new_user.activated?
		487	+ end
		488	+
481	protected	489	protected
482	def new_user(options = {})	490	def new_user(options = {})
483	user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))	491	user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))