Merge branch 'stable'

Joenio Costa
2 parents 353ef7f9 a8383d7c
Showing 21 changed files with 159 additions and 23 deletions Show diff stats
app/controllers/public/catalog_controller.rb
app/controllers/public/enterprise_registration_controller.rb
app/models/create_enterprise.rb
app/models/environment_statistics_block.rb
app/views/catalog/index.rhtml
app/views/content_viewer/_comment_form.rhtml
app/views/shared/tiny_mce.rhtml
config/environment.rb
db/migrate/20100730141134_set_owner_environment_to_enterprises_environment.rb
db/schema.rb
features/comment.feature
features/manage_products.feature
features/register_enterprise.feature
features/step_definitions/noosfero_steps.rb
test/functional/catalog_controller_test.rb
test/functional/enterprise_registration_controller_test.rb
test/functional/enterprise_validation_controller_test.rb
test/unit/create_enterprise_test.rb
test/unit/environment_statistics_block_test.rb
test/unit/tiny_mce_article_test.rb
@@ -4,7 +4,7 @@ class CatalogController &lt; PublicController
   before_filter :check_enterprise_and_environment
  
   def index
-    @products = @profile.products
+    @products = @profile.products.paginate(:per_page => 10, :page => params[:page])
   end
  
   protected
@@ -16,9 +16,9 @@ class EnterpriseRegistrationController &lt; ApplicationController
         @create_enterprise.target = Profile.find(params[:create_enterprise][:target_id])
       end
     elsif @validation == :admin || @validation == :none
-        @create_enterprise.target = @create_enterprise.environment
+        @create_enterprise.target = environment
     end
-    @create_enterprise.requestor = current_user.person
+    @create_enterprise.requestor = user
     the_action =
       if request.post?
         if @create_enterprise.valid_before_selecting_target?
@@ -91,7 +91,7 @@ class CreateEnterprise &lt; Task
   end
  
   def environment
-    region ? region.environment : self.requestor ? self.requestor.environment : Environment.default
+    requestor.environment
   end
  
   def available_regions
@@ -17,11 +17,12 @@ class EnvironmentStatisticsBlock &lt; Block
     enterprises = owner.enterprises.visible.count
     communities = owner.communities.visible.count
  
-    info = [
-      n_('One user', '%{num} users', users) % { :num => users },
-      n__('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises },
-      n__('One community', '%{num} communities', communities) % { :num => communities },
-    ]
+    info = []
+    info << (n_('One user', '%{num} users', users) % { :num => users })
+    unless owner.enabled?('disable_asset_enterprises')
+      info << (n__('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises })
+    end
+    info << (n__('One community', '%{num} communities', communities) % { :num => communities })
  
     block_title(title) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n"))
   end
 <%= display_products_list @profile, @products %>
+
+<%= will_paginate @products %>
@@ -37,7 +37,7 @@
   <%= required labelled_form_field(_('Title'), text_field(:comment, :title)) %>
   <%= required labelled_form_field(_('Enter your comment'), text_area(:comment, :body, :rows => 5)) %>
   <% button_bar do %>
-    <%= submit_button('add', _('Post comment'), :onclick => "$('confirm').value = 'true'") %>
+    <%= submit_button('add', _('Post comment'), :onclick => "$('confirm').value = 'true'; this.disabled = true") %>
   <% end %>
 <% end %>
  
@@ -32,7 +32,7 @@ tinyMCE.init({
         paste_insert_word_content_callback : "convertWord",
         paste_use_dialog: false,
         apply_source_formatting : true,
-        extended_valid_elements : "applet[style|archive|codebase|code|height|width],comment,iframe[src|style|allowtransparency|frameborder|width|height]",
+        extended_valid_elements : "applet[style|archive|codebase|code|height|width],comment,iframe[src|style|allowtransparency|frameborder|width|height|scrolling]",
         content_css: '/stylesheets/tinymce.css',
         language: <%= tinymce_language.inspect %>,
         entity_encoding: 'raw'
@@ -72,7 +72,7 @@ Rails::Initializer.run do |config|
   }
  
   # 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'
+  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'
  
    # Adds custom tags to the Set of allowed html tags for the #sanitize helper
   config.action_view.sanitized_allowed_tags = 'object', 'embed', 'param', 'table', 'tr', 'th', 'td', 'applet', 'comment', 'iframe'
@@ -0,0 +1,14 @@
+class SetOwnerEnvironmentToEnterprisesEnvironment < ActiveRecord::Migration
+  def self.up
+    CreateEnterprise.find_all_by_status(3).each do |t|
+      if(Enterprise.find_by_identifier(t.data[:identifier]))
+        update("UPDATE profiles SET environment_id = '%s' WHERE identifier = '%s'" %
+              [Person.find(t.requestor_id).environment.id, t.data[:identifier]])
+      end
+    end
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20100722020357) do
+ActiveRecord::Schema.define(:version => 20100730141134) do
  
   create_table "article_versions", :force => true do |t|
     t.integer  "article_id"
@@ -57,3 +57,14 @@ Feature: comment
     When I press "Post comment"
     Then I should see "Title can't be blank"
     And I should see "Body can't be blank"
+
+  @selenium
+  Scenario: disable post comment button
+    Given I am on /booking/article-to-comment
+    And I fill in "Name" with "Joey Ramone"
+    And I fill in "e-Mail" with "joey@ramones.com"
+    And I fill in "Title" with "Hey ho, let's go!"
+    And I fill in "Enter your comment" with "Hey ho, let's go!"
+    When I press "Post comment"
+    Then the "value.Post comment" button should not be enabled
+    And I should see "Hey ho, let's go"
 \ No newline at end of file
@@ -11,6 +11,38 @@ Feature: manage products
       | redemoinho | joaosilva | Rede Moinho | true |
     And feature "disable_products_for_enterprises" is disabled on environment
  
+  Scenario: paginate public listing products and services
+    Given the following product_category
+      | name |
+      | Bicycle |
+    And the following products
+      | owner      | category |  name  | description |
+      | redemoinho | bicycle  | Bike 1 | bicycle 1  |
+      | redemoinho | bicycle  | Bike 2 | bicycle 2  |
+      | redemoinho | bicycle  | Bike 3 | bicycle 3  |
+      | redemoinho | bicycle  | Bike 4 | bicycle 4  |
+      | redemoinho | bicycle  | Bike 5 | bicycle 5  |
+      | redemoinho | bicycle  | Bike 6 | bicycle 6  |
+      | redemoinho | bicycle  | Bike 7 | bicycle 7  |
+      | redemoinho | bicycle  | Bike 8 | bicycle 8  |
+      | redemoinho | bicycle  | Bike 9 | bicycle 9  |
+      | redemoinho | bicycle  | Bike 10| bicycle 10 |
+      | redemoinho | bicycle  | Bike 11| bicycle 11 |
+    When I go to /catalog/redemoinho
+    Then I should see "Bike 1"
+    And I should see "Bike 2"
+    And I should see "Bike 3"
+    And I should see "Bike 4"
+    And I should see "Bike 5"
+    And I should see "Bike 6"
+    And I should see "Bike 7"
+    And I should see "Bike 8"
+    And I should see "Bike 9"
+    And I should see "Bike 10"
+    And I should not see "Bike 11"
+    When I follow "Next"
+    Then I should see "Bike 11"
+
   Scenario: listing products and services
     Given I am logged in as "joaosilva"
     And I am on Rede Moinho's control panel
@@ -5,8 +5,8 @@ Feature: register enterprise
  
   Background:
     Given the following users
-      | login     | name       |
-      | joaosilva | Joao Silva |
+      | login     | name       | email                  |
+      | joaosilva | Joao Silva | joaosilva@example.com  |
  
     And I am logged in as "joaosilva"
     And I am on Joao Silva's control panel
@@ -80,22 +80,24 @@ Feature: register enterprise
   Scenario: a user register an enterprise successfully through the admin
             validator method and the admin accepts
     Given organization_approval_method is "admin" on environment
+    And the mailbox is empty
     And I follow "Manage my groups"
     And the following states
       | name          |
       | Sample State  |
     And I follow "Register a new enterprise"
     And I fill in the following:
-      | Address        | my-enterprise   |
-      | Name              | My Enterprise   |
+      | Address | my-enterprise  |
+      | Name    | My Enterprise  |
     And I press "Next"
     Then I should see "Enterprise registration completed"
     And I am logged in as admin
     And I follow "Control panel"
     When I follow "Tasks"
     Then I should see /Processing task: Enterprise registration: "My Enterprise"/
-    And I choose "Ok"
+    And the first mail is to admin_user@example.com
     And I press "Ok"
+    Then the last mail is to joaosilva@example.com
     And I am logged in as "joaosilva"
     And I am on Joao Silva's control panel
     When I follow "Manage my groups"
@@ -104,23 +106,26 @@ Feature: register enterprise
   Scenario: a user register an enterprise successfully through the admin
             validator method and the admin rejects
     Given organization_approval_method is "admin" on environment
+    And the mailbox is empty
     And I follow "Manage my groups"
     And the following states
       | name          |
       | Sample State  |
     And I follow "Register a new enterprise"
     And I fill in the following:
-      | Address        | my-enterprise   |
-      | Name              | My Enterprise   |
+      | Address | my-enterprise |
+      | Name    | My Enterprise |
     And I press "Next"
     Then I should see "Enterprise registration completed"
     And I am logged in as admin
     And I follow "Control panel"
     When I follow "Tasks"
     Then I should see /Processing task: Enterprise registration: "My Enterprise"/
+    And the first mail is to admin_user@example.com
     And I choose "Cancel"
     And I fill in "Rejection explanation" with "This enterprise has some irregularities."
-    And I press "Ok"
+    When I press "Ok"
+    Then the last mail is to joaosilva@example.com
     And I am logged in as "joaosilva"
     And I am on Joao Silva's control panel
     When I follow "Manage my groups"
@@ -210,3 +210,24 @@ end
 Then /^The page title should contain "(.*)"$/ do |text|
   response.should have_selector("title:contains('#{text}')")
 end
+
+Given /^the mailbox is empty$/ do
+  ActionMailer::Base.deliveries = []
+end
+
+Given /^the (.+) mail (?:is|has) (.+) (.+)$/ do |position, field, value|
+  if(/^[0-9]+$/ =~ position)
+    ActionMailer::Base.deliveries[position.to_i][field] == value
+  else
+    ActionMailer::Base.deliveries.send(position)[field] == value
+  end
+end
+
+Given /^the (.+) mail (.+) is like (.+)$/ do |position, field, regexp|
+  re = Regexp.new(regexp)
+  if(/^[0-9]+$/ =~ position)
+    re =~ ActionMailer::Base.deliveries[position.to_i][field.to_sym]
+  else
+    re =~ ActionMailer::Base.deliveries.send(position)[field.to_sym]
+  end
+end
@@ -39,6 +39,17 @@ class CatalogControllerTest &lt; Test::Unit::TestCase
     assert_kind_of Array, assigns(:products)
   end
  
+  should 'paginate enterprise products list' do
+    1.upto(12).map do
+      fast_create(Product, :enterprise_id => @enterprise.id)
+    end
+
+    assert_equal 12, @enterprise.products.count
+    get :index, :profile => @enterprise.identifier
+    assert_equal 10, assigns(:products).count
+    assert_tag :a, :attributes => {:class => 'next_page'}
+  end
+
   should 'not give access if environment do not let' do
     env = Environment.default
     env.enable('disable_products_for_enterprises')
@@ -170,4 +170,14 @@ all_fixtures
     assert_no_tag :tag => 'option', :content => "Region without validator"
   end
  
+  should 'set current environment as the task target if approval method is admin' do
+    environment = Environment.new(:name => "Another environment")
+    environment.organization_approval_method = :admin
+    environment.save
+    @controller.stubs(:environment).returns(environment)
+
+    get :index
+    assert_equal assigns(:create_enterprise).target, environment
+  end
+
 end
@@ -74,6 +74,7 @@ class EnterpriseValidationControllerTest &lt; Test::Unit::TestCase
  
   should 'require the user to fill in the explanation for an rejection' do
     validation = CreateEnterprise.new
+    validation.stubs(:environment).returns(Environment.default)
     @org.expects(:find_pending_validation).with('kakakaka').returns(validation)
  
     # FIXME: this is not working, but should. Anyway the assert_response and
@@ -13,6 +13,7 @@ class CreateEnterpriseTest &lt; Test::Unit::TestCase
  
   should 'accept only numbers as foundation year' do
     task = CreateEnterprise.new
+    task.stubs(:environment).returns(Environment.default)
  
     task.foundation_year = "test"
     task.valid?
@@ -25,6 +26,7 @@ class CreateEnterpriseTest &lt; Test::Unit::TestCase
  
   should 'require a requestor' do
     task = CreateEnterprise.new
+    task.stubs(:environment).returns(Environment.default)
     task.valid?
  
     assert task.errors.invalid?(:requestor_id)
@@ -35,6 +37,7 @@ class CreateEnterpriseTest &lt; Test::Unit::TestCase
  
   should 'require a target (validator organization)' do
     task = CreateEnterprise.new
+    task.stubs(:environment).returns(Environment.default)
     task.valid?
  
     assert task.errors.invalid?(:target_id)
@@ -50,6 +53,7 @@ class CreateEnterpriseTest &lt; Test::Unit::TestCase
     validator = fast_create(Organization, :name => "My organization", :identifier => 'myorg', :environment_id => environment.id)
  
     task = CreateEnterprise.new
+    task.stubs(:environment).returns(Environment.default)
  
     task.region = region
     task.target = validator
@@ -71,6 +75,7 @@ class CreateEnterpriseTest &lt; Test::Unit::TestCase
  
   should 'require an explanation for rejecting enterprise creation' do
     task = CreateEnterprise.new
+    task.stubs(:environment).returns(Environment.default)
     task.reject_explanation = nil
  
     task.valid?
@@ -98,6 +103,8 @@ class CreateEnterpriseTest &lt; Test::Unit::TestCase
     validator = fast_create(Organization, :name => "My organization", :identifier => 'myorg', :environment_id => environment.id)
     region.validators << validator
     person = create_user('testuser').person
+    person.environment = environment
+    person.save
  
     task = CreateEnterprise.create!({
       :name => 'My new enterprise',
@@ -132,6 +139,8 @@ class CreateEnterpriseTest &lt; Test::Unit::TestCase
     validator = fast_create(Organization, :name => "My organization", :identifier => 'myorg', :environment_id => environment.id)
     region.validators << validator
     person = create_user('testuser').person
+    person.environment = environment
+    person.save
  
     task = CreateEnterprise.create!({
       :name => 'My new enterprise',
@@ -161,6 +170,7 @@ class CreateEnterpriseTest &lt; Test::Unit::TestCase
  
   should 'override message methods from Task' do
     specific = CreateEnterprise.new
+    specific.stubs(:environment).returns(Environment.default)
     %w[ task_created_message task_finished_message task_cancelled_message ].each do |method|
       assert_nothing_raised NotImplementedError do
         specific.send(method)
@@ -193,7 +203,9 @@ class CreateEnterpriseTest &lt; Test::Unit::TestCase
   end
  
   should 'provide a message to be sent to the target' do
-    assert_not_nil CreateEnterprise.new.target_notification_message
+    task = CreateEnterprise.new
+    task.stubs(:environment).returns(Environment.default)
+    assert_not_nil task.target_notification_message
   end
  
   should 'report as approved when approved' do
@@ -210,6 +222,7 @@ class CreateEnterpriseTest &lt; Test::Unit::TestCase
  
   should 'refuse to create an enterprise creation request with an identifier already used by another profile' do
     request = CreateEnterprise.new
+    request.stubs(:environment).returns(Environment.default)
     request.identifier = 'testid'
     request.valid?
     assert !request.errors.invalid?(:identifier)
@@ -83,4 +83,14 @@ class EnvironmentStatisticsBlockTest &lt; Test::Unit::TestCase
     assert_match /One community/, content
   end
  
+  should 'not display enterprises if disabled' do
+    env = Environment.new
+    env.enable('disable_asset_enterprises')
+
+    block = EnvironmentStatisticsBlock.new
+    block.stubs(:owner).returns(env)
+
+    assert_no_match /enterprises/i, block.content
+  end
+
 end
@@ -83,4 +83,9 @@ class TinyMceArticleTest &lt; Test::Unit::TestCase
     assert_match  /<!-- .* --> <h1> Wellformed html code <\/h1>/, article.body
   end
  
+  should 'allow iframe if it is from tv.softwarelivre.org' do
+    article = TinyMceArticle.create!(:profile => profile, :name => 'article', :abstract => 'abstract', :body => "<iframe id='player-base' src='http://tv.softwarelivre.org/embed/1170' width='482' height='406' align='right' frameborder='0' scrolling='no'></iframe>")
+    assert_tag_in_string article.body, :tag => 'iframe', :attributes => { :src => "http://tv.softwarelivre.org/embed/1170", :width => "482", :height => "406", :align => "right", :frameborder => "0", :scrolling => "no"}
+  end
+
 end
@@ -13,7 +13,7 @@ HTML::WhiteListSanitizer.module_eval do
  
       if final_text =~ /iframe/
         itheora_video = /<iframe(.*)src=(.*)itheora.org(.*)<\/iframe>/
-        sl_video = /<iframe(.*)src=\"http:\/\/stream.softwarelivre.org(.*)<\/iframe>/
+        sl_video = /<iframe(.*)src=\"http:\/\/(stream|tv).softwarelivre.org(.*)<\/iframe>/
         unless (final_text =~ itheora_video || final_text =~ sl_video)
           final_text = final_text.gsub(/<iframe(.*)<\/iframe>/, '')
         end
...	...	@@ -4,7 +4,7 @@ class CatalogController < PublicController
4	4	before_filter :check_enterprise_and_environment
5	5
6	6	def index
7		- @products = @profile.products
	7	+ @products = @profile.products.paginate(:per_page => 10, :page => params[:page])
8	8	end
9	9
10	10	protected
...	...
...	...	@@ -16,9 +16,9 @@ class EnterpriseRegistrationController < ApplicationController
16	16	@create_enterprise.target = Profile.find(params[:create_enterprise][:target_id])
17	17	end
18	18	elsif @validation == :admin \|\| @validation == :none
19		- @create_enterprise.target = @create_enterprise.environment
	19	+ @create_enterprise.target = environment
20	20	end
21		- @create_enterprise.requestor = current_user.person
	21	+ @create_enterprise.requestor = user
22	22	the_action =
23	23	if request.post?
24	24	if @create_enterprise.valid_before_selecting_target?
...	...
...	...	@@ -91,7 +91,7 @@ class CreateEnterprise < Task
91	91	end
92	92
93	93	def environment
94		- region ? region.environment : self.requestor ? self.requestor.environment : Environment.default
	94	+ requestor.environment
95	95	end
96	96
97	97	def available_regions
...	...
...	...	@@ -17,11 +17,12 @@ class EnvironmentStatisticsBlock < Block
17	17	enterprises = owner.enterprises.visible.count
18	18	communities = owner.communities.visible.count
19	19
20		- info = [
21		- n_('One user', '%{num} users', users) % { :num => users },
22		- n__('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises },
23		- n__('One community', '%{num} communities', communities) % { :num => communities },
24		- ]
	20	+ info = []
	21	+ info << (n_('One user', '%{num} users', users) % { :num => users })
	22	+ unless owner.enabled?('disable_asset_enterprises')
	23	+ info << (n__('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises })
	24	+ end
	25	+ info << (n__('One community', '%{num} communities', communities) % { :num => communities })
25	26
26	27	block_title(title) + content_tag('ul', info.map {\|item\| content_tag('li', item) }.join("\n"))
27	28	end
...	...
1	1	<%= display_products_list @profile, @products %>
	2	+
	3	+<%= will_paginate @products %>
...	...
...	...	@@ -37,7 +37,7 @@
37	37	<%= required labelled_form_field(_('Title'), text_field(:comment, :title)) %>
38	38	<%= required labelled_form_field(_('Enter your comment'), text_area(:comment, :body, :rows => 5)) %>
39	39	<% button_bar do %>
40		- <%= submit_button('add', _('Post comment'), :onclick => "$('confirm').value = 'true'") %>
	40	+ <%= submit_button('add', _('Post comment'), :onclick => "$('confirm').value = 'true'; this.disabled = true") %>
41	41	<% end %>
42	42	<% end %>
43	43
...	...
...	...	@@ -32,7 +32,7 @@ tinyMCE.init({
32	32	paste_insert_word_content_callback : "convertWord",
33	33	paste_use_dialog: false,
34	34	apply_source_formatting : true,
35		- extended_valid_elements : "applet[style\|archive\|codebase\|code\|height\|width],comment,iframe[src\|style\|allowtransparency\|frameborder\|width\|height]",
	35	+ extended_valid_elements : "applet[style\|archive\|codebase\|code\|height\|width],comment,iframe[src\|style\|allowtransparency\|frameborder\|width\|height\|scrolling]",
36	36	content_css: '/stylesheets/tinymce.css',
37	37	language: <%= tinymce_language.inspect %>,
38	38	entity_encoding: 'raw'
...	...
...	...	@@ -72,7 +72,7 @@ Rails::Initializer.run do \|config\|
72	72	}
73	73
74	74	# Adds custom attributes to the Set of allowed html attributes for the #sanitize helper
75		- config.action_view.sanitized_allowed_attributes = 'align', 'border', 'alt', 'vspace', 'hspace', 'width', 'heigth', 'value', 'type', 'data', 'style', 'target', 'codebase', 'archive', 'classid', 'code', 'flashvars'
	75	+ 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'
76	76
77	77	# Adds custom tags to the Set of allowed html tags for the #sanitize helper
78	78	config.action_view.sanitized_allowed_tags = 'object', 'embed', 'param', 'table', 'tr', 'th', 'td', 'applet', 'comment', 'iframe'
...	...
...	...	@@ -0,0 +1,14 @@
	1	+class SetOwnerEnvironmentToEnterprisesEnvironment < ActiveRecord::Migration
	2	+ def self.up
	3	+ CreateEnterprise.find_all_by_status(3).each do \|t\|
	4	+ if(Enterprise.find_by_identifier(t.data[:identifier]))
	5	+ update("UPDATE profiles SET environment_id = '%s' WHERE identifier = '%s'" %
	6	+ [Person.find(t.requestor_id).environment.id, t.data[:identifier]])
	7	+ end
	8	+ end
	9	+ end
	10	+
	11	+ def self.down
	12	+ say "this migration can't be reverted"
	13	+ end
	14	+end
...	...
...	...	@@ -9,7 +9,7 @@
9	9	#
10	10	# It's strongly recommended to check this file into your version control system.
11	11
12		-ActiveRecord::Schema.define(:version => 20100722020357) do
	12	+ActiveRecord::Schema.define(:version => 20100730141134) do
13	13
14	14	create_table "article_versions", :force => true do \|t\|
15	15	t.integer "article_id"
...	...