Merge branch 'master' into rails3_stable

Conflicts: app/helpers/layout_helper.rb db/schema.rb

Merge branch 'master' into rails3_stable
Conflicts: app/helpers/layout_helper.rb db/schema.rb
Victor Costa
2 parents 71b7f7a9 3f489bc4
Showing 21 changed files with 39 additions and 209 deletions Show diff stats
Gemfile
Gemfile.lock
app/controllers/admin/environment_design_controller.rb
app/controllers/my_profile/cms_controller.rb
app/helpers/article_helper.rb
app/helpers/layout_helper.rb
app/models/box.rb
app/models/environment.rb
app/models/environment_statistics_block.rb
app/sweepers/profile_sweeper.rb
app/views/cms/edit.html.erb
baseplugins/statistics
db/migrate/20140827191326_remove_environment_statistics_block.rb
db/schema.rb
debian/control
script/noosfero-plugins
script/quick-start
test/functional/cms_controller_test.rb
test/functional/environment_design_controller_test.rb
test/unit/box_test.rb
@@ -18,7 +18,6 @@ gem &#39;rake&#39;, :require =&gt; false
 gem 'grape', '0.2.1'
 gem 'rest-client'
 gem 'exception_notification'
-gem 'gettext_rails'
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
 # with their GEM names (not the Debian package names)
@@ -67,15 +67,6 @@ GEM
       activesupport (>= 3.0.4)
     fast_gettext (0.6.8)
     ffi (1.0.11)
-    gettext (2.2.1)
-      locale
-    gettext_activerecord (2.1.0)
-      activerecord (>= 2.3.2)
-      gettext (>= 2.1.0)
-    gettext_rails (2.1.0)
-      gettext_activerecord (>= 2.1.0)
-      locale_rails (>= 2.0.5)
-      rails (>= 2.3.2)
     gherkin (2.4.21)
       json (>= 1.4.6)
     hike (1.2.1)
@@ -83,9 +74,6 @@ GEM
     i18n (0.6.0)
     journey (1.0.3)
     json (1.7.3)
-    locale (2.0.5)
-    locale_rails (2.0.5)
-      locale (>= 2.0.5)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -184,7 +172,6 @@ DEPENDENCIES
   database_cleaner
   exception_notification
   fast_gettext
-  gettext_rails
   hpricot
   mocha
   nokogiri
@@ -9,9 +9,7 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   end
   def available_blocks
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+    @available_blocks ||= [ ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
     @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
   end
@@ -7,7 +7,7 @@ class CmsController &lt; MyProfileController
   def search_tags
     arg = params[:term].downcase
     result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
-    render :text => prepare_to_token_input2(result).to_json
+    render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
   end
   def self.protect_if(*args)
@@ -83,7 +83,7 @@ module ArticleHelper
     array.map { |object| {:id => object.id, :name => object.name} }
   end
-  def prepare_to_token_input2(array)
+  def prepare_to_token_input_by_label(array)
     array.map { |object| {:label => object.name, :value => object.name} }
   end
@@ -27,6 +27,7 @@ module LayoutHelper
       'thickbox',
       'lightbox',
       'colorbox',
+      'inputosaurus',
       'chat',
       pngfix_stylesheet_path,
     ] + tokeninput_stylesheets
@@ -28,9 +28,6 @@ class Box &lt; ActiveRecord::Base
       CategoriesBlock,
       CommunitiesBlock,
       EnterprisesBlock,
-      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-      #      the Noosfero core soon, see ActionItem3045
-      EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
       FeedReaderBlock,
@@ -53,9 +50,6 @@ class Box &lt; ActiveRecord::Base
       CommunitiesBlock,
       DisabledEnterpriseMessageBlock,
       EnterprisesBlock,
-      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-      #      the Noosfero core soon, see ActionItem3045
-      EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
       FeaturedProductsBlock,
@@ -177,9 +177,6 @@ class Environment &lt; ActiveRecord::Base
     # "left" area
     env.boxes[1].blocks << LoginBlock.new
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    env.boxes[1].blocks << EnvironmentStatisticsBlock.new
     env.boxes[1].blocks << RecentDocumentsBlock.new
     # "right" area
@@ -1,33 +0,0 @@
-# TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-#      the Noosfero core soon, see ActionItem3045
-
-class EnvironmentStatisticsBlock < Block
-
-  def self.description
-    _('Environment stastistics (DEPRECATED)')
-  end
-
-  def default_title
-    _('Statistics for %s') % owner.name
-  end
-
-  def help
-    _('This block presents some statistics about your environment.')
-  end
-
-  def content(args={})
-    users = owner.people.visible.count
-    enterprises = owner.enterprises.visible.count
-    communities = owner.communities.visible.count
-
-    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
-
-end
@@ -8,9 +8,6 @@ class ProfileSweeper # &lt; ActiveRecord::Observer
   end
   def after_create(profile)
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    expire_statistics_block_cache(profile)
   end
 protected
@@ -31,13 +28,6 @@ protected
     expire_blogs(profile) if profile.organization?
   end
-  # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-  #      the Noosfero core soon, see ActionItem3045
-  def expire_statistics_block_cache(profile)
-    blocks = profile.environment.blocks.select { |b| b.kind_of?(EnvironmentStatisticsBlock) }
-    BlockSweeper.expire_blocks(blocks)
-  end
-
   def expire_blogs(profile)
     profile.blogs.select{|b| !b.empty?}.each do |blog|
       pages = blog.posts.count / blog.posts_per_page + 1
@@ -33,9 +33,8 @@
   <br />
-  <%= stylesheet_link_tag('inputosaurus') %>
-
   <%= f.text_field('tag_list', :size => 64) %>
+  <%= content_tag( 'small', _('Separate tags with commas') ) %>
   <script>
     jQuery('#article_tag_list').inputosaurus({
@@ -0,0 +1 @@
+../plugins/statistics
 \ No newline at end of file
@@ -0,0 +1,9 @@
+class RemoveEnvironmentStatisticsBlock < ActiveRecord::Migration
+  def self.up
+    update("UPDATE blocks SET type = 'StatisticsBlock' WHERE type = 'EnvironmentStatisticsBlock'")
+  end
+
+  def self.down
+    say("Nothing to undo (cannot recover the data)")
+  end
+end
@@ -11,11 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-<<<<<<< HEAD
-ActiveRecord::Schema.define(:version => 20140807134625) do
-=======
-ActiveRecord::Schema.define(:version => 20140808185510) do
->>>>>>> rails3
+ActiveRecord::Schema.define(:version => 20140827191326) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -7,7 +7,6 @@ Build-Depends:
  debhelper (>= 7.0.50~),
  po4a,
  ruby-gettext,
- ruby-gettext-rails,
  ruby-sqlite3,
  rake,
  rails3 (>= 3.2.6-1~),
@@ -77,8 +77,7 @@ run(){
 _enable(){
   plugin="$1"
-  cd $enabled_plugins_dir
-  source="../../plugins/$plugin"
+  source="$available_plugins_dir/$plugin"
   target="$enabled_plugins_dir/$plugin"
   base="$base_plugins_dir/$plugin"
   run "$source/before_enable.rb"
@@ -101,15 +100,11 @@ _enable(){
       fi
     fi
     if [ "$installation_ok" = true ] && [ "$dependencies_ok" = true ]; then
-      ln -s "$source" "$plugin"
+      ln -s "$source" "$target"
       plugins_public_dir="$NOOSFERO_DIR/public/plugins"
       plugins_features_dir="$NOOSFERO_DIR/features/plugins"
-      cd $plugins_public_dir
-      test -d "$source/public" && ln -s "$source/public" "$plugin"
-      if [ -d "$NOOSFERO_DIR/features" ]; then
-        cd $plugins_features_dir
-        test -d "$source/features" && ln -s "$source/features" "$plugin"
-      fi
+      test -d "$target/public" && ln -s "$target/public" "$plugins_public_dir/$plugin"
+      test -d "$NOOSFERO_DIR/features" && test -d "$target/features" && ln -s "$target/features" "$plugins_features_dir/$plugin"
       _say "$plugin enabled"
       run "$source/after_enable.rb"
       needs_migrate=true
@@ -85,7 +85,7 @@ fi
 run rake db:schema:load
 run rake db:data:minimal
 run rake db:test:prepare
-run rails runner 'Environment.default.enable("skip_new_user_email_confirmation")'
+rails runner 'Environment.default.enable("skip_new_user_email_confirmation")'
 # FIXME compile translations depends on ruby-gettext-rails, please see debian/control
 # run rake noosfero:translations:compile
@@ -1807,6 +1807,23 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_template 'cms/publish'
   end
+  should 'response of search_tags be json' do
+    get :search_tags, :profile => profile.identifier, :term => 'linux'
+    assert_equal 'application/json', @response.content_type
+  end
+
+  should 'return empty json if does not find tag' do
+    get :search_tags, :profile => profile.identifier, :term => 'linux'
+    assert_equal "[]", @response.body
+  end
+
+  should 'return tags found' do
+    tag = mock; tag.stubs(:name).returns('linux')
+    ActsAsTaggableOn::Tag.stubs(:find).returns([tag])
+    get :search_tags, :profile => profile.identifier, :term => 'linux'
+    assert_equal '[{"label":"linux","value":"linux"}]', @response.body
+  end
+
   protected
   # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
@@ -6,9 +6,7 @@ class EnvironmentDesignController; def rescue_action(e) raise e end; end
 class EnvironmentDesignControllerTest < ActionController::TestCase
-  # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-  #      the Noosfero core soon, see ActionItem3045
-  ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+  ALL_BLOCKS = [ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
   def setup
     @controller = EnvironmentDesignController.new
@@ -77,18 +75,6 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'p', :attributes => { :id => 'no_portal_community' }
   end
-  # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-  #      the Noosfero core soon, see ActionItem3045
-  should 'be able to edit EnvironmentStatisticsBlock' do
-    login_as(create_admin_user(Environment.default))
-    b = EnvironmentStatisticsBlock.create!
-    e = Environment.default
-    e.boxes.create!
-    e.boxes.first.blocks << b
-    get :edit, :id => b.id
-    assert_tag :tag => 'input', :attributes => { :id => 'block_title' }
-  end
-
   should 'be able to edit EnterprisesBlock' do
     login_as(create_admin_user(Environment.default))
     b = EnterprisesBlock.create!
@@ -33,9 +33,6 @@ class BoxTest &lt; ActiveSupport::TestCase
     assert blocks.include?('categories-block')
     assert blocks.include?('communities-block')
     assert blocks.include?('enterprises-block')
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    assert blocks.include?('environment-statistics-block')
     assert blocks.include?('fans-block')
     assert blocks.include?('favorite-enterprises-block')
     assert blocks.include?('feed-reader-block')
@@ -64,9 +61,6 @@ class BoxTest &lt; ActiveSupport::TestCase
     assert blocks.include?('communities-block')
     assert blocks.include?('disabled-enterprise-message-block')
     assert blocks.include?('enterprises-block')
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    assert blocks.include?('environment-statistics-block')
     assert blocks.include?('fans-block')
     assert blocks.include?('favorite-enterprises-block')
     assert blocks.include?('featured-products-block')
@@ -1,99 +0,0 @@
-# TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-#      the Noosfero core soon, see ActionItem3045
-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class EnvironmentStatisticsBlockTest < ActiveSupport::TestCase
-
-  should 'inherit from Block' do
-    assert_kind_of Block, EnvironmentStatisticsBlock.new
-  end
-
-  should 'describe itself' do
-    assert_not_equal Block.description, EnvironmentStatisticsBlock.description
-  end
-
-  should 'provide a default title' do
-    owner = mock
-    owner.expects(:name).returns('my environment')
-
-    block = EnvironmentStatisticsBlock.new
-    block.expects(:owner).returns(owner)
-    assert_equal 'Statistics for my environment', block.title
-  end
-
-  should 'generate statistics' do
-    env = create(Environment)
-    user1 = create_user('testuser1', :environment_id => env.id)
-    user2 = create_user('testuser2', :environment_id => env.id)
-
-    fast_create(Enterprise, :environment_id => env.id)
-    fast_create(Community, :environment_id => env.id)
-
-    block = EnvironmentStatisticsBlock.new
-    env.boxes.first.blocks << block
-
-    content = block.content
-
-    assert_match(/One enterprise/, content)
-    assert_match(/2 users/, content)
-    assert_match(/One community/, content)
-  end
-
-  should 'generate statistics including private profiles' do
-    env = create(Environment)
-    user1 = create_user('testuser1', :environment_id => env.id)
-    user2 = create_user('testuser2', :environment_id => env.id)
-    user3 = create_user('testuser3', :environment_id => env.id)
-    p = user3.person; p.public_profile = false; p.save!
-
-    fast_create(Enterprise, :environment_id => env.id)
-    fast_create(Enterprise, :environment_id => env.id, :public_profile => false)
-
-    fast_create(Community, :environment_id => env.id)
-    fast_create(Community, :environment_id => env.id, :public_profile => false)
-
-    block = EnvironmentStatisticsBlock.new
-    env.boxes.first.blocks << block
-
-    content = block.content
-
-    assert_match /2 enterprises/, content
-    assert_match /3 users/, content
-    assert_match /2 communities/, content
-  end
-
-  should 'generate statistics but not for not visible profiles' do
-    env = create(Environment)
-    user1 = create_user('testuser1', :environment_id => env.id)
-    user2 = create_user('testuser2', :environment_id => env.id)
-    user3 = create_user('testuser3', :environment_id => env.id)
-    p = user3.person; p.visible = false; p.save!
-
-    fast_create(Enterprise, :environment_id => env.id)
-    fast_create(Enterprise, :environment_id => env.id, :visible => false)
-
-    fast_create(Community, :environment_id => env.id)
-    fast_create(Community, :environment_id => env.id, :visible => false)
-
-    block = EnvironmentStatisticsBlock.new
-    env.boxes.first.blocks << block
-
-    content = block.content
-
-    assert_match /One enterprise/, content
-    assert_match /2 users/, content
-    assert_match /One community/, content
-  end
-
-  should 'not display enterprises if disabled' do
-    env = fast_create(Environment)
-    env.enable('disable_asset_enterprises', false)
-
-    block = EnvironmentStatisticsBlock.new
-    block.stubs(:owner).returns(env)
-
-    assert_no_match /enterprises/i, block.content
-  end
-
-end
	@@ -18,7 +18,6 @@ gem 'rake', :require => false		@@ -18,7 +18,6 @@ gem 'rake', :require => false
18	gem 'grape', '0.2.1'	18	gem 'grape', '0.2.1'
19	gem 'rest-client'	19	gem 'rest-client'
20	gem 'exception_notification'	20	gem 'exception_notification'
21	-gem 'gettext_rails'
22		21
23	# FIXME list here all actual dependencies (i.e. the ones in debian/control),	22	# FIXME list here all actual dependencies (i.e. the ones in debian/control),
24	# with their GEM names (not the Debian package names)	23	# with their GEM names (not the Debian package names)
	@@ -67,15 +67,6 @@ GEM		@@ -67,15 +67,6 @@ GEM
67	activesupport (>= 3.0.4)	67	activesupport (>= 3.0.4)
68	fast_gettext (0.6.8)	68	fast_gettext (0.6.8)
69	ffi (1.0.11)	69	ffi (1.0.11)
70	- gettext (2.2.1)
71	- locale
72	- gettext_activerecord (2.1.0)
73	- activerecord (>= 2.3.2)
74	- gettext (>= 2.1.0)
75	- gettext_rails (2.1.0)
76	- gettext_activerecord (>= 2.1.0)
77	- locale_rails (>= 2.0.5)
78	- rails (>= 2.3.2)
79	gherkin (2.4.21)	70	gherkin (2.4.21)
80	json (>= 1.4.6)	71	json (>= 1.4.6)
81	hike (1.2.1)	72	hike (1.2.1)
	@@ -83,9 +74,6 @@ GEM		@@ -83,9 +74,6 @@ GEM
83	i18n (0.6.0)	74	i18n (0.6.0)
84	journey (1.0.3)	75	journey (1.0.3)
85	json (1.7.3)	76	json (1.7.3)
86	- locale (2.0.5)
87	- locale_rails (2.0.5)
88	- locale (>= 2.0.5)
89	mail (2.4.4)	77	mail (2.4.4)
90	i18n (>= 0.4.0)	78	i18n (>= 0.4.0)
91	mime-types (~> 1.16)	79	mime-types (~> 1.16)
	@@ -184,7 +172,6 @@ DEPENDENCIES		@@ -184,7 +172,6 @@ DEPENDENCIES
184	database_cleaner	172	database_cleaner
185	exception_notification	173	exception_notification
186	fast_gettext	174	fast_gettext
187	- gettext_rails
188	hpricot	175	hpricot
189	mocha	176	mocha
190	nokogiri	177	nokogiri
	@@ -7,7 +7,7 @@ class CmsController < MyProfileController		@@ -7,7 +7,7 @@ class CmsController < MyProfileController
7	def search_tags	7	def search_tags
8	arg = params[:term].downcase	8	arg = params[:term].downcase
9	result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])	9	result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
10	- render :text => prepare_to_token_input2(result).to_json	10	+ render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
11	end	11	end
12		12
13	def self.protect_if(*args)	13	def self.protect_if(*args)
	@@ -83,7 +83,7 @@ module ArticleHelper		@@ -83,7 +83,7 @@ module ArticleHelper
83	array.map { \|object\| {:id => object.id, :name => object.name} }	83	array.map { \|object\| {:id => object.id, :name => object.name} }
84	end	84	end
85		85
86	- def prepare_to_token_input2(array)	86	+ def prepare_to_token_input_by_label(array)
87	array.map { \|object\| {:label => object.name, :value => object.name} }	87	array.map { \|object\| {:label => object.name, :value => object.name} }
88	end	88	end
89		89
	@@ -1,33 +0,0 @@	@@ -1,33 +0,0 @@
1	-# TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
2	-# the Noosfero core soon, see ActionItem3045
3	-
4	-class EnvironmentStatisticsBlock < Block
5	-
6	- def self.description
7	- _('Environment stastistics (DEPRECATED)')
8	- end
9	-
10	- def default_title
11	- _('Statistics for %s') % owner.name
12	- end
13	-
14	- def help
15	- _('This block presents some statistics about your environment.')
16	- end
17	-
18	- def content(args={})
19	- users = owner.people.visible.count
20	- enterprises = owner.enterprises.visible.count
21	- communities = owner.communities.visible.count
22	-
23	- info = []
24	- info << (n_('One user', '%{num} users', users) % { :num => users })
25	- unless owner.enabled?('disable_asset_enterprises')
26	- info << (n_('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises })
27	- end
28	- info << (n_('One community', '%{num} communities', communities) % { :num => communities })
29	-
30	- block_title(title) + content_tag('ul', info.map {\|item\| content_tag('li', item) }.join("\n"))
31	- end
32	-
33	-end
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../plugins/statistics
0	\ No newline at end of file	2	\ No newline at end of file
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class RemoveEnvironmentStatisticsBlock < ActiveRecord::Migration
	2	+ def self.up
	3	+ update("UPDATE blocks SET type = 'StatisticsBlock' WHERE type = 'EnvironmentStatisticsBlock'")
	4	+ end
	5	+
	6	+ def self.down
	7	+ say("Nothing to undo (cannot recover the data)")
	8	+ end
	9	+end
	@@ -77,8 +77,7 @@ run(){		@@ -77,8 +77,7 @@ run(){
77		77
78	_enable(){	78	_enable(){
79	plugin="$1"	79	plugin="$1"
80	- cd $enabled_plugins_dir
81	- source="../../plugins/$plugin"	80	+ source="$available_plugins_dir/$plugin"
82	target="$enabled_plugins_dir/$plugin"	81	target="$enabled_plugins_dir/$plugin"
83	base="$base_plugins_dir/$plugin"	82	base="$base_plugins_dir/$plugin"
84	run "$source/before_enable.rb"	83	run "$source/before_enable.rb"
	@@ -101,15 +100,11 @@ _enable(){		@@ -101,15 +100,11 @@ _enable(){
101	fi	100	fi
102	fi	101	fi
103	if [ "$installation_ok" = true ] && [ "$dependencies_ok" = true ]; then	102	if [ "$installation_ok" = true ] && [ "$dependencies_ok" = true ]; then
104	- ln -s "$source" "$plugin"	103	+ ln -s "$source" "$target"
105	plugins_public_dir="$NOOSFERO_DIR/public/plugins"	104	plugins_public_dir="$NOOSFERO_DIR/public/plugins"
106	plugins_features_dir="$NOOSFERO_DIR/features/plugins"	105	plugins_features_dir="$NOOSFERO_DIR/features/plugins"
107	- cd $plugins_public_dir
108	- test -d "$source/public" && ln -s "$source/public" "$plugin"
109	- if [ -d "$NOOSFERO_DIR/features" ]; then
110	- cd $plugins_features_dir
111	- test -d "$source/features" && ln -s "$source/features" "$plugin"
112	- fi	106	+ test -d "$target/public" && ln -s "$target/public" "$plugins_public_dir/$plugin"
		107	+ test -d "$NOOSFERO_DIR/features" && test -d "$target/features" && ln -s "$target/features" "$plugins_features_dir/$plugin"
113	_say "$plugin enabled"	108	_say "$plugin enabled"
114	run "$source/after_enable.rb"	109	run "$source/after_enable.rb"
115	needs_migrate=true	110	needs_migrate=true
	@@ -85,7 +85,7 @@ fi		@@ -85,7 +85,7 @@ fi
85	run rake db:schema:load	85	run rake db:schema:load
86	run rake db:data:minimal	86	run rake db:data:minimal
87	run rake db:test:prepare	87	run rake db:test:prepare
88	-run rails runner 'Environment.default.enable("skip_new_user_email_confirmation")'	88	+rails runner 'Environment.default.enable("skip_new_user_email_confirmation")'
89		89
90	# FIXME compile translations depends on ruby-gettext-rails, please see debian/control	90	# FIXME compile translations depends on ruby-gettext-rails, please see debian/control
91	# run rake noosfero:translations:compile	91	# run rake noosfero:translations:compile
	@@ -1807,6 +1807,23 @@ class CmsControllerTest < ActionController::TestCase		@@ -1807,6 +1807,23 @@ class CmsControllerTest < ActionController::TestCase
1807	assert_template 'cms/publish'	1807	assert_template 'cms/publish'
1808	end	1808	end
1809		1809
		1810	+ should 'response of search_tags be json' do
		1811	+ get :search_tags, :profile => profile.identifier, :term => 'linux'
		1812	+ assert_equal 'application/json', @response.content_type
		1813	+ end
		1814	+
		1815	+ should 'return empty json if does not find tag' do
		1816	+ get :search_tags, :profile => profile.identifier, :term => 'linux'
		1817	+ assert_equal "[]", @response.body
		1818	+ end
		1819	+
		1820	+ should 'return tags found' do
		1821	+ tag = mock; tag.stubs(:name).returns('linux')
		1822	+ ActsAsTaggableOn::Tag.stubs(:find).returns([tag])
		1823	+ get :search_tags, :profile => profile.identifier, :term => 'linux'
		1824	+ assert_equal '[{"label":"linux","value":"linux"}]', @response.body
		1825	+ end
		1826	+
1810	protected	1827	protected
1811		1828
1812	# FIXME this is to avoid adding an extra dependency for a proper JSON parser.	1829	# FIXME this is to avoid adding an extra dependency for a proper JSON parser.