rails3: fix some controller tests

getterm (and __) was replaced by _ (commit 86ecb14f)

rails3: fix some controller tests
getterm (and __) was replaced by _ (commit 86ecb14f)
Victor Costa
1 parent 2dbfdebd
Showing 9 changed files with 14 additions and 19 deletions Show diff stats
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/helpers/forum_helper.rb
app/helpers/language_helper.rb
app/models/link_list_block.rb
app/views/cms/select_article_type.html.erb
app/views/profile_editor/_pending_tasks.html.erb
app/views/shared/_list_groups.html.erb
test/functional/search_controller_test.rb
@@ -29,7 +29,7 @@ class SearchController &lt; PublicController
       @asset = key
       send(key)
       @order << key
-      @names[key] = getterm(description)
+      @names[key] = _(description)
     end
     @asset = nil
@@ -796,7 +796,7 @@ module ApplicationHelper
         end
       }
       html += "<br />\n".html_safe if line_size == 0 || ( values.size % line_size ) > 0
-      column = object.class.columns_hash[method.to_s]
+      column = object.class.columns_hash[method.to_s] if object
       text =
         ( column ?
           column.human_name :
@@ -1425,7 +1425,7 @@ module ApplicationHelper
       object = instance_variable_get("@#{name}")
       object.errors.full_messages.each do |msg|
         errors << msg
-      end
+      end if object
     end
     return '' if errors.empty?
@@ -1437,11 +1437,6 @@ module ApplicationHelper
     end
   end
-  # FIXME
-  def observe_field(*args)
-    ''
-  end
-
   def private_profile_partial_parameters
     if profile.person?
       @action = :add_friend
@@ -36,7 +36,7 @@ module ForumHelper
                              :id => "post-#{art.id}"
                             )
     }
-    content_tag('table', content) + (pagination or '')
+    content_tag('table', content.join) + (pagination or '')
   end
   def last_topic_update(article)
@@ -22,7 +22,7 @@ module LanguageHelper
     if options[:element] == 'dropdown'
       select_tag('lang', 
         options_for_select(locales.map{|code,name| [name, code]}, current),
-        :onchange => "document.location.href= #{url_for(params.merge(:lang => 'LANGUAGE')).inspect}.replace(/LANGUAGE/, this.value) ;",
+        :onchange => "document.location.href= #{url_for(params.merge(:lang => 'LANGUAGE'))}.replace(/LANGUAGE/, this.value) ;",
         :help => _('The language you choose here is the language used for options, buttons, etc. It does not affect the language of the content created by other users.')
       )
     else
@@ -58,7 +58,7 @@ class LinkListBlock &lt; Block
   def content(args={})
     block_title(title) +
     content_tag('ul',
-      links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))}.join(',')
+      links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))}.join
     )
   end
@@ -5,7 +5,7 @@
 <ul class="article-types">
   <% for type in @article_types %>
     <% action = type[:class].name == 'UploadedFile' ? {:action => 'upload_files'} : {:action => 'new', :type => type[:class].name} %>
-    <% content_tag('a', :href => url_for(action.merge(:parent_id => @parent_id, :back_to => @back_to))) do %>
+    <%= content_tag('a', :href => url_for(action.merge(:parent_id => @parent_id, :back_to => @back_to))) do %>
       <li class="<%= icon_for_new_article(type[:class]) %>" onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
         <strong><%= type[:short_description] %></strong>
         <div class='description'><%= type[:description] %></div>
@@ -4,7 +4,7 @@
   <div class='pending-tasks'>
     <h2><%= _('You have pending requests') %></h2>
     <ul>
-      <%= @pending_tasks.map {|task| content_tag('li', task_information(task))} %>
+      <%= @pending_tasks.map {|task| content_tag('li', task_information(task))}.join %>
     </ul>
     <%= button(:todo, _('Process requests'), :controller => 'tasks', :action => 'index') %>
   </div>
@@ -7,7 +7,7 @@
     <span class='profile-details'>
       <strong><%= group.name %></strong><br/>
       <%= _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by_resource_id(group.id) %>
-      <%= _('Type: %s') % getterm(group.class.identification) %> <br/>
+      <%= _('Type: %s') % _(group.class.identification) %> <br/>
       <%= _('Description: %s') % group.description  + '<br/>' if group.community? %>
       <%= _('Members: %s') % group.members_count.to_s %> <br/>
       <%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>
@@ -59,7 +59,7 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'search only in specified types of content' do
     get :articles, :query => 'something not important'
-    assert_equal [:articles], assigns(:searches).keys
+    assert_equal ['articles'], assigns(:searches).keys
   end
   should 'render success in search' do
@@ -155,13 +155,13 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'include extra content supplied by plugins on product asset' do
     class Plugin1 < Noosfero::Plugin
       def asset_product_extras(product)
-        lambda {"<span id='plugin1'>This is Plugin1 speaking!</span>"}
+        proc {"<span id='plugin1'>This is Plugin1 speaking!</span>"}
       end
     end
     class Plugin2 < Noosfero::Plugin
       def asset_product_extras(product)
-        lambda {"<span id='plugin2'>This is Plugin2 speaking!</span>"}
+        proc {"<span id='plugin2'>This is Plugin2 speaking!</span>"}
       end
     end
@@ -182,12 +182,12 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'include extra properties of the product supplied by plugins' do
     class Plugin1 < Noosfero::Plugin
       def asset_product_properties(product)
-        return { :name => _('Property1'), :content => lambda { link_to(product.name, '/plugin1') } }
+        return { :name => _('Property1'), :content => proc { link_to(product.name, '/plugin1') } }
       end
     end
     class Plugin2 < Noosfero::Plugin
       def asset_product_properties(product)
-        return { :name => _('Property2'), :content => lambda { link_to(product.name, '/plugin2') } }
+        return { :name => _('Property2'), :content => proc { link_to(product.name, '/plugin2') } }
       end
     end
     enterprise = fast_create(Enterprise)
	@@ -29,7 +29,7 @@ class SearchController < PublicController		@@ -29,7 +29,7 @@ class SearchController < PublicController
29	@asset = key	29	@asset = key
30	send(key)	30	send(key)
31	@order << key	31	@order << key
32	- @names[key] = getterm(description)	32	+ @names[key] = _(description)
33	end	33	end
34	@asset = nil	34	@asset = nil
35		35
	@@ -36,7 +36,7 @@ module ForumHelper		@@ -36,7 +36,7 @@ module ForumHelper
36	:id => "post-#{art.id}"	36	:id => "post-#{art.id}"
37	)	37	)
38	}	38	}
39	- content_tag('table', content) + (pagination or '')	39	+ content_tag('table', content.join) + (pagination or '')
40	end	40	end
41		41
42	def last_topic_update(article)	42	def last_topic_update(article)
	@@ -22,7 +22,7 @@ module LanguageHelper		@@ -22,7 +22,7 @@ module LanguageHelper
22	if options[:element] == 'dropdown'	22	if options[:element] == 'dropdown'
23	select_tag('lang',	23	select_tag('lang',
24	options_for_select(locales.map{\|code,name\| [name, code]}, current),	24	options_for_select(locales.map{\|code,name\| [name, code]}, current),
25	- :onchange => "document.location.href= #{url_for(params.merge(:lang => 'LANGUAGE')).inspect}.replace(/LANGUAGE/, this.value) ;",	25	+ :onchange => "document.location.href= #{url_for(params.merge(:lang => 'LANGUAGE'))}.replace(/LANGUAGE/, this.value) ;",
26	:help => _('The language you choose here is the language used for options, buttons, etc. It does not affect the language of the content created by other users.')	26	:help => _('The language you choose here is the language used for options, buttons, etc. It does not affect the language of the content created by other users.')
27	)	27	)
28	else	28	else
	@@ -58,7 +58,7 @@ class LinkListBlock < Block		@@ -58,7 +58,7 @@ class LinkListBlock < Block
58	def content(args={})	58	def content(args={})
59	block_title(title) +	59	block_title(title) +
60	content_tag('ul',	60	content_tag('ul',
61	- links.select{\|i\| !i[:name].blank? and !i[:address].blank?}.map{\|i\| content_tag('li', link_html(i))}.join(',')	61	+ links.select{\|i\| !i[:name].blank? and !i[:address].blank?}.map{\|i\| content_tag('li', link_html(i))}.join
62	)	62	)
63	end	63	end
64		64
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5	<ul class="article-types">	5	<ul class="article-types">
6	<% for type in @article_types %>	6	<% for type in @article_types %>
7	<% action = type[:class].name == 'UploadedFile' ? {:action => 'upload_files'} : {:action => 'new', :type => type[:class].name} %>	7	<% action = type[:class].name == 'UploadedFile' ? {:action => 'upload_files'} : {:action => 'new', :type => type[:class].name} %>
8	- <% content_tag('a', :href => url_for(action.merge(:parent_id => @parent_id, :back_to => @back_to))) do %>	8	+ <%= content_tag('a', :href => url_for(action.merge(:parent_id => @parent_id, :back_to => @back_to))) do %>
9	<li class="<%= icon_for_new_article(type[:class]) %>" onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">	9	<li class="<%= icon_for_new_article(type[:class]) %>" onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
10	<strong><%= type[:short_description] %></strong>	10	<strong><%= type[:short_description] %></strong>
11	<div class='description'><%= type[:description] %></div>	11	<div class='description'><%= type[:description] %></div>
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4	<div class='pending-tasks'>	4	<div class='pending-tasks'>
5	<h2><%= _('You have pending requests') %></h2>	5	<h2><%= _('You have pending requests') %></h2>
6	<ul>	6	<ul>
7	- <%= @pending_tasks.map {\|task\| content_tag('li', task_information(task))} %>	7	+ <%= @pending_tasks.map {\|task\| content_tag('li', task_information(task))}.join %>
8	</ul>	8	</ul>
9	<%= button(:todo, _('Process requests'), :controller => 'tasks', :action => 'index') %>	9	<%= button(:todo, _('Process requests'), :controller => 'tasks', :action => 'index') %>
10	</div>	10	</div>
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7	<span class='profile-details'>	7	<span class='profile-details'>
8	<strong><%= group.name %></strong><br/>	8	<strong><%= group.name %></strong><br/>
9	<%= _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by_resource_id(group.id) %>	9	<%= _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by_resource_id(group.id) %>
10	- <%= _('Type: %s') % getterm(group.class.identification) %> <br/>	10	+ <%= _('Type: %s') % _(group.class.identification) %> <br/>
11	<%= _('Description: %s') % group.description + '<br/>' if group.community? %>	11	<%= _('Description: %s') % group.description + '<br/>' if group.community? %>
12	<%= _('Members: %s') % group.members_count.to_s %> <br/>	12	<%= _('Members: %s') % group.members_count.to_s %> <br/>
13	<%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>	13	<%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>
	@@ -59,7 +59,7 @@ class SearchControllerTest < ActionController::TestCase		@@ -59,7 +59,7 @@ class SearchControllerTest < ActionController::TestCase
59		59
60	should 'search only in specified types of content' do	60	should 'search only in specified types of content' do
61	get :articles, :query => 'something not important'	61	get :articles, :query => 'something not important'
62	- assert_equal [:articles], assigns(:searches).keys	62	+ assert_equal ['articles'], assigns(:searches).keys
63	end	63	end
64		64
65	should 'render success in search' do	65	should 'render success in search' do
	@@ -155,13 +155,13 @@ class SearchControllerTest < ActionController::TestCase		@@ -155,13 +155,13 @@ class SearchControllerTest < ActionController::TestCase
155	should 'include extra content supplied by plugins on product asset' do	155	should 'include extra content supplied by plugins on product asset' do
156	class Plugin1 < Noosfero::Plugin	156	class Plugin1 < Noosfero::Plugin
157	def asset_product_extras(product)	157	def asset_product_extras(product)
158	- lambda {"<span id='plugin1'>This is Plugin1 speaking!</span>"}	158	+ proc {"<span id='plugin1'>This is Plugin1 speaking!</span>"}
159	end	159	end
160	end	160	end
161		161
162	class Plugin2 < Noosfero::Plugin	162	class Plugin2 < Noosfero::Plugin
163	def asset_product_extras(product)	163	def asset_product_extras(product)
164	- lambda {"<span id='plugin2'>This is Plugin2 speaking!</span>"}	164	+ proc {"<span id='plugin2'>This is Plugin2 speaking!</span>"}
165	end	165	end
166	end	166	end
167		167
	@@ -182,12 +182,12 @@ class SearchControllerTest < ActionController::TestCase		@@ -182,12 +182,12 @@ class SearchControllerTest < ActionController::TestCase
182	should 'include extra properties of the product supplied by plugins' do	182	should 'include extra properties of the product supplied by plugins' do
183	class Plugin1 < Noosfero::Plugin	183	class Plugin1 < Noosfero::Plugin
184	def asset_product_properties(product)	184	def asset_product_properties(product)
185	- return { :name => _('Property1'), :content => lambda { link_to(product.name, '/plugin1') } }	185	+ return { :name => _('Property1'), :content => proc { link_to(product.name, '/plugin1') } }
186	end	186	end
187	end	187	end
188	class Plugin2 < Noosfero::Plugin	188	class Plugin2 < Noosfero::Plugin
189	def asset_product_properties(product)	189	def asset_product_properties(product)
190	- return { :name => _('Property2'), :content => lambda { link_to(product.name, '/plugin2') } }	190	+ return { :name => _('Property2'), :content => proc { link_to(product.name, '/plugin2') } }
191	end	191	end
192	end	192	end
193	enterprise = fast_create(Enterprise)	193	enterprise = fast_create(Enterprise)