rails4: fix remaining funcionals tests

Braulio Bhavamitra
1 parent fafb323e
Showing 16 changed files with 48 additions and 54 deletions Show diff stats
Gemfile
app/controllers/admin/admin_panel_controller.rb
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/folder_helper.rb
app/views/content_viewer/folder.html.erb
app/views/shared/logged_in/xmpp_chat.html.erb
test/functional/application_controller_test.rb
test/functional/catalog_controller_test.rb
test/functional/cms_controller_test.rb
test/functional/favorite_enterprises_controller_test.rb
test/functional/manage_products_controller_test.rb
test/functional/profile_controller_test.rb
@@ -20,7 +20,7 @@ gem &#39;exception_notification&#39;,   &#39;~&gt; 4.0.1&#39;
 gem 'gettext',                  '~> 2.2.1', :require => false
 gem 'locale',                   '~> 2.0.5'
 gem 'whenever', :require => false
-gem 'eita-jrails', '>= 0.9.9', require: 'jrails'
+gem 'eita-jrails', '>= 0.10.0', require: 'jrails'
  
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
@@ -54,7 +54,7 @@ class AdminPanelController &lt; AdminController
  
      if request.post?
        env = environment
-       folders = Folder.where :profile_id => env.portal_community, :id => params[:folders] if params[:folders]
+       folders = env.portal_community.folders.where(id: params[:folders]).order(params[:folders].reverse.map{ |f| "id=#{f}" }) if params[:folders]
        env.portal_folders = folders
        if env.save
          session[:notice] = _('Saved the portal folders')
@@ -141,7 +141,7 @@ class ApplicationController &lt; ActionController::Base
       # Check if the requested profile belongs to another domain
       if @profile && !params[:profile].blank? && params[:profile] != @profile.identifier
         @profile = @environment.profiles.find_by_identifier params[:profile]
-        redirect_to params.merge(:host => @profile.default_hostname)
+        redirect_to url_for(params.merge host: @profile.default_hostname)
       end
     end
   end
@@ -197,7 +197,7 @@ class ApplicationController &lt; ActionController::Base
   def redirect_to_current_user
     if params[:profile] == '~'
       if logged_in?
-        redirect_to params.merge(:profile => user.identifier)
+        redirect_to url_for(params.merge profile: user.identifier)
       else
         render_not_found
       end
@@ -58,7 +58,7 @@ class CmsController &lt; MyProfileController
   def view
     @article = profile.articles.find(params[:id])
     @articles = @article.children.reorder("case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC, name")
-    @articles = @articles.where type: 'RssFeed' if @article.has_posts?
+    @articles = @articles.where "type <> ?", 'RssFeed' if @article.has_posts?
     @articles = @articles.paginate per_page: per_page, page: params[:npage]
   end
  
@@ -232,7 +232,7 @@ class CmsController &lt; MyProfileController
       else
         session[:notice] = _('File(s) successfully uploaded')
         if @back_to
-          redirect_to @back_to
+          redirect_to url_for(@back_to)
         elsif @parent
           redirect_to :action => 'view', :id => @parent.id
         else
@@ -115,7 +115,7 @@ class AccountController &lt; ApplicationController
           @user.person.affiliate(@user.person, [owner_role]) if owner_role
           invitation = Task.from_code(@invitation_code).first
           if invitation
-            invitation.update_attributes!({:friend => @user.person})
+            invitation.update_attributes! friend: @user.person
             invitation.finish
           end
  
@@ -36,7 +36,7 @@ class ProfileController &lt; PublicController
  
   def tag_feed
     @tag = params[:id]
-    tagged = profile.articles.paginate(:per_page => 20, :page => 1).order('published_at DESC').includes(:tags).where('tags.name LIKE ?', @tag)
+    tagged = profile.articles.paginate(:per_page => 20, :page => 1).order('published_at DESC').joins(:tags).where('tags.name LIKE ?', @tag)
     feed_writer = FeedWriter.new
     data = feed_writer.write(
       tagged,
@@ -907,8 +907,14 @@ module ApplicationHelper
   end
   alias :top_url :base_url
  
+  class View < ActionView::Base
+    def url_for *args
+      self.controller.url_for *args
+    end
+  end
+
   def helper_for_article(article)
-    article_helper = ActionView::Base.new
+    article_helper = View.new
     article_helper.controller = controller
     article_helper.extend ArticleHelper
     article_helper.extend Rails.application.routes.url_helpers
@@ -5,12 +5,11 @@ module FolderHelper
   def list_contents(configure={})
     configure[:recursive] ||= false
     configure[:list_type] ||= :folder
-    if !configure[:contents].blank?
-      configure[:contents] = configure[:contents].order('name ASC').paginate(
-        :per_page => 30,
-        :page => params[:npage]
-      )
-
+    contents = configure[:contents]
+    contents = contents.order('name ASC') unless contents.is_a? Array
+    contents = contents.paginate per_page: 30, page: params[:npage]
+    configure[:contents] = contents
+    if contents.present?
       render :file => 'shared/content_list', :locals => configure
     else
       content_tag('em', _('(empty folder)'))
@@ -4,8 +4,4 @@
   </div>
 <% end %>
  
-<% if folder.children.empty? %>
-  <em><%= _('(empty folder)') %></em>
-<% else %>
-  <%= list_contents(:contents=>folder.children) %>
-<% end %>
+<%= list_contents contents: folder.children %>
-    <%= javascript_include_tag 'strophejs-1.1.3/strophe.min', 'jquery.emoticon', '../designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'chat', 'perfect-scrollbar.min.js', 'perfect-scrollbar.with-mousewheel.min.js', 'jquery.timeago.js' %>
+    <%= javascript_include_tag 'strophejs-1.1.3/strophe.min', 'jquery.emoticon', 'designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'chat', 'perfect-scrollbar.min.js', 'perfect-scrollbar.with-mousewheel.min.js', 'jquery.timeago.js' %>
     <%= stylesheet_link_tag 'perfect-scrollbar.min.css' %>
  
     <% extend ChatHelper %>
@@ -278,10 +278,7 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     uses_host 'other.environment'
     get :index
     assert_tag :tag => 'div', :attributes => {:id => 'user_menu_ul'}
-    assert_tag :tag => 'div', :attributes => {:id => 'user_menu_ul'},
-                :descendant => {:tag => 'a', :attributes => { :href => 'http://other.environment/adminuser' }},
-                :descendant => {:tag => 'a', :attributes => { :href => 'http://other.environment/myprofile/adminuser' }},
-                :descendant => {:tag => 'a', :attributes => { :href => '/admin' }}
+    assert_tag tag: 'div', attributes: {id: 'user_menu_ul'}, descendant: {tag: 'a', attributes: { href: '/admin' }}
   end
  
   should 'not display invisible blocks' do
@@ -359,13 +356,10 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
  
-    ActionView::Helpers::AssetTagHelper::StylesheetIncludeTag.any_instance.stubs('asset_file_path!')
-    ActionView::Helpers::AssetTagHelper::JavascriptIncludeTag.any_instance.stubs('asset_file_path!')
-
     get :index
  
-    assert_tag :tag => 'link', :attributes => {:href => /#{plugin1_path}/, :type => 'text/css', :rel => 'stylesheet'}
-    assert_tag :tag => 'link', :attributes => {:href => /#{plugin2_path}/, :type => 'text/css', :rel => 'stylesheet'}
+    assert_tag tag: 'link', attributes: {href: /#{plugin1_path}/, rel: 'stylesheet'}
+    assert_tag tag: 'link', attributes: {href: /#{plugin2_path}/, rel: 'stylesheet'}
   end
  
   should 'include javascripts supplied by plugins' do
@@ -395,13 +389,11 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     environment.enable_plugin(Plugin1.name)
     environment.enable_plugin(Plugin2.name)
  
-    ActionView::Helpers::AssetTagHelper::JavascriptIncludeTag.any_instance.stubs('asset_file_path!')
-
     get :index
  
-    assert_tag :tag => 'script', :attributes => {:src => /#{plugin1_path}/, :type => 'text/javascript'}
-    assert_tag :tag => 'script', :attributes => {:src => /#{plugin2_path2}/, :type => 'text/javascript'}
-    assert_tag :tag => 'script', :attributes => {:src => /#{plugin2_path3}/, :type => 'text/javascript'}
+    assert_tag tag: 'script', attributes: {src: /#{plugin1_path}/}
+    assert_tag tag: 'script', attributes: {src: /#{plugin2_path2}/}
+    assert_tag tag: 'script', attributes: {src: /#{plugin2_path3}/}
   end
  
   should 'include content in the beginning of body supplied by plugins regardless it is a block or html code' do
@@ -461,15 +453,15 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     e.access_control_allow_origin = ['http://allowed']
     e.save!
  
-    @request.env["Origin"] = "http://allowed"
+    @request.headers["Origin"] = "http://allowed"
     get :index
     assert_response :success
  
-    @request.env["Origin"] = "http://other"
+    @request.headers["Origin"] = "http://other"
     get :index
     assert_response :success
  
-    @request.env["Origin"] = "http://other"
+    @request.headers["Origin"] = "http://other"
     e.restrict_to_access_control_origins = true
     e.save!
     get :index
@@ -63,7 +63,7 @@ class CatalogControllerTest &lt; ActionController::TestCase
   end
  
   should 'show action moved to manage_products controller' do
-    assert_raise ActionController::RoutingError do
+    assert_raise ActionController::UrlGenerationError do
       get :show, :id => 1
     end
   end
@@ -537,18 +537,18 @@ class CmsControllerTest &lt; ActionController::TestCase
   end
  
   should 'filter html with white_list from tiny mce article abstract' do
-    post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'article', :abstract => "<script>alert('test')</script> article", :body => 'the text of the article ...' }
-    assert_equal " article", assigns(:article).abstract
+    post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'article', :abstract => "<script>alert('text')</script> article", :body => 'the text of the article ...' }
+    assert_equal "alert('text') article", assigns(:article).abstract
   end
  
   should 'filter html with white_list from tiny mce article body' do
     post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'article', :abstract => 'abstract', :body => "the <script>alert('text')</script> of article ..." }
-    assert_equal "the  of article ...", assigns(:article).body
+    assert_equal "the alert('text') of article ...", assigns(:article).body
   end
  
   should 'not filter html tags permitted from tiny mce article body' do
     post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'article', :abstract => 'abstract', :body => "<b>the</b> <script>alert('text')</script> <strong>of</strong> article ..." }
-    assert_equal "<b>the</b>  <strong>of</strong> article ...", assigns(:article).body
+    assert_equal "<b>the</b> alert('text') <strong>of</strong> article ...", assigns(:article).body
   end
  
   should 'sanitize tags' do
@@ -19,7 +19,6 @@ class FavoriteEnterprisesControllerTest &lt; ActionController::TestCase
     get :index
     assert_response :success
     assert_template 'index'
-    assert_kind_of Array, assigns(:favorite_enterprises)
   end
  
   should 'confirm addition of new favorite enterprise' do
@@ -175,8 +175,8 @@ class ManageProductsControllerTest &lt; ActionController::TestCase
  
   should 'filter html with white list from description of product' do
     product = fast_create(Product, :profile_id => @enterprise.id, :product_category_id => @product_category.id)
-    post 'edit', :profile => @enterprise.identifier, :id => product.id, :field => 'info', :product => { :name => 'name', :description => "<b id='html_descr'>descr bold</b>" }
-    assert_equal "<b>descr bold</b>", assigns(:product).description
+    post 'edit', :profile => @enterprise.identifier, :id => product.id, :field => 'info', :product => { :name => 'name', :description => "<b id=\"html_descr\">descr bold</b>" }
+    assert_equal "<b id=\"html_descr\">descr bold</b>", assigns(:product).description
   end
  
   should 'not let users in if environment do not let' do
@@ -340,7 +340,7 @@ class ManageProductsControllerTest &lt; ActionController::TestCase
   end
  
   should 'render partial certifiers for selection' do
-    get :certifiers_for_selection, :profile => @enterprise.identifier
+    xhr :get, :certifiers_for_selection, :profile => @enterprise.identifier
     assert_template '_certifiers_for_selection'
   end
  
@@ -475,7 +475,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     fast_create(TextileArticle, :name => 'Unpublished post', :parent_id => profile.blog.id, :profile_id => profile.id, :published => false)
  
     get :index, :profile => profile.identifier
-    assert_tag :tag => 'a', :content => '2 posts', :attributes => { :href => /\/testuser\/blog/ }
+    assert_tag :tag => 'a', :content => '2 posts', :attributes => { :href => /\/testuser\/#{blog.slug}/ }
   end
  
   should 'show number of published images in index' do
@@ -1179,7 +1179,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     20.times {comment = fast_create(Comment, :source_id => article, :title => 'a comment', :body => 'lalala', :created_at => Time.now)}
     article.reload
     assert_equal 20, article.comments.count
-    get :more_comments, :activity => activity.id, :comment_page => 2
+    xhr :get, :more_comments, :activity => activity.id, :comment_page => 2
     assert_response :success
     assert_template '_comment'
     assert_select_rjs :insert_html do
@@ -1204,7 +1204,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     20.times {fast_create(Scrap, :sender_id => profile.id, :receiver_id => profile.id, :scrap_id => scrap.id)}
     profile.reload
     assert_equal 20, scrap.replies.count
-    get :more_replies, :activity => scrap.id, :comment_page => 2
+    xhr :get, :more_replies, :activity => scrap.id, :comment_page => 2
     assert_response :success
     assert_template '_profile_scrap'
     assert_select_rjs :insert_html do
@@ -1386,7 +1386,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     activity = ActionTracker::Record.last
  
     login_as(profile.identifier)
-    get :more_comments, :profile => profile.identifier, :activity => activity.id, :comment_page => 1, :tab_action => 'wall'
+    xhr :get, :more_comments, :profile => profile.identifier, :activity => activity.id, :comment_page => 1, :tab_action => 'wall'
  
     assert_select_rjs :insert_html do
       assert_select 'span', :content => '(removed user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-removed'}
@@ -1415,7 +1415,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     activity = ActionTracker::Record.last
  
     login_as(profile.identifier)
-    get :more_comments, :profile => profile.identifier, :activity => activity.id, :comment_page => 1, :tab_action => 'wall'
+    xhr :get, :more_comments, :profile => profile.identifier, :activity => activity.id, :comment_page => 1, :tab_action => 'wall'
  
     assert_select_rjs :insert_html do
       assert_select 'span', :content => '(unauthenticated user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-unknown'}
@@ -1671,7 +1671,8 @@ class ProfileControllerTest &lt; ActionController::TestCase
     get :index
  
     assert_tag :tag => 'div', :attributes => {:id => 'manage-communities'}
-    assert_select '#manage-communities li > a' do |links|
+    doc = Nokogiri::HTML @response.body
+    assert_select doc, '#manage-communities li > a' do |links|
       assert_equal 2, links.length
       assert_match /community_1/, links.to_s
       assert_match /community_2/, links.to_s
@@ -1699,7 +1700,8 @@ class ProfileControllerTest &lt; ActionController::TestCase
     get :index
  
     assert_tag :tag => 'div', :attributes => {:id => 'manage-enterprises'}
-    assert_select '#manage-enterprises li > a' do |links|
+    doc = Nokogiri::HTML @response.body
+    assert_select doc, '#manage-enterprises li > a' do |links|
       assert_equal 1, links.length
       assert_match /Test enterprise1/, links.to_s
       assert_no_match /Test enterprise_2/, links.to_s
...	...	@@ -20,7 +20,7 @@ gem 'exception_notification', '~> 4.0.1'
20	20	gem 'gettext', '~> 2.2.1', :require => false
21	21	gem 'locale', '~> 2.0.5'
22	22	gem 'whenever', :require => false
23		-gem 'eita-jrails', '>= 0.9.9', require: 'jrails'
	23	+gem 'eita-jrails', '>= 0.10.0', require: 'jrails'
24	24
25	25	# asset pipeline
26	26	gem 'uglifier', '>= 1.0.3'
...	...
...	...	@@ -54,7 +54,7 @@ class AdminPanelController < AdminController
54	54
55	55	if request.post?
56	56	env = environment
57		- folders = Folder.where :profile_id => env.portal_community, :id => params[:folders] if params[:folders]
	57	+ folders = env.portal_community.folders.where(id: params[:folders]).order(params[:folders].reverse.map{ \|f\| "id=#{f}" }) if params[:folders]
58	58	env.portal_folders = folders
59	59	if env.save
60	60	session[:notice] = _('Saved the portal folders')
...	...
...	...	@@ -141,7 +141,7 @@ class ApplicationController < ActionController::Base
141	141	# Check if the requested profile belongs to another domain
142	142	if @profile && !params[:profile].blank? && params[:profile] != @profile.identifier
143	143	@profile = @environment.profiles.find_by_identifier params[:profile]
144		- redirect_to params.merge(:host => @profile.default_hostname)
	144	+ redirect_to url_for(params.merge host: @profile.default_hostname)
145	145	end
146	146	end
147	147	end
...	...	@@ -197,7 +197,7 @@ class ApplicationController < ActionController::Base
197	197	def redirect_to_current_user
198	198	if params[:profile] == '~'
199	199	if logged_in?
200		- redirect_to params.merge(:profile => user.identifier)
	200	+ redirect_to url_for(params.merge profile: user.identifier)
201	201	else
202	202	render_not_found
203	203	end
...	...
...	...	@@ -58,7 +58,7 @@ class CmsController < MyProfileController
58	58	def view
59	59	@article = profile.articles.find(params[:id])
60	60	@articles = @article.children.reorder("case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC, name")
61		- @articles = @articles.where type: 'RssFeed' if @article.has_posts?
	61	+ @articles = @articles.where "type <> ?", 'RssFeed' if @article.has_posts?
62	62	@articles = @articles.paginate per_page: per_page, page: params[:npage]
63	63	end
64	64
...	...	@@ -232,7 +232,7 @@ class CmsController < MyProfileController
232	232	else
233	233	session[:notice] = _('File(s) successfully uploaded')
234	234	if @back_to
235		- redirect_to @back_to
	235	+ redirect_to url_for(@back_to)
236	236	elsif @parent
237	237	redirect_to :action => 'view', :id => @parent.id
238	238	else
...	...
...	...	@@ -115,7 +115,7 @@ class AccountController < ApplicationController
115	115	@user.person.affiliate(@user.person, [owner_role]) if owner_role
116	116	invitation = Task.from_code(@invitation_code).first
117	117	if invitation
118		- invitation.update_attributes!({:friend => @user.person})
	118	+ invitation.update_attributes! friend: @user.person
119	119	invitation.finish
120	120	end
121	121
...	...
...	...	@@ -36,7 +36,7 @@ class ProfileController < PublicController
36	36
37	37	def tag_feed
38	38	@tag = params[:id]
39		- tagged = profile.articles.paginate(:per_page => 20, :page => 1).order('published_at DESC').includes(:tags).where('tags.name LIKE ?', @tag)
	39	+ tagged = profile.articles.paginate(:per_page => 20, :page => 1).order('published_at DESC').joins(:tags).where('tags.name LIKE ?', @tag)
40	40	feed_writer = FeedWriter.new
41	41	data = feed_writer.write(
42	42	tagged,
...	...
...	...	@@ -907,8 +907,14 @@ module ApplicationHelper
907	907	end
908	908	alias :top_url :base_url
909	909
	910	+ class View < ActionView::Base
	911	+ def url_for *args
	912	+ self.controller.url_for *args
	913	+ end
	914	+ end
	915	+
910	916	def helper_for_article(article)
911		- article_helper = ActionView::Base.new
	917	+ article_helper = View.new
912	918	article_helper.controller = controller
913	919	article_helper.extend ArticleHelper
914	920	article_helper.extend Rails.application.routes.url_helpers
...	...
...	...	@@ -5,12 +5,11 @@ module FolderHelper
5	5	def list_contents(configure={})
6	6	configure[:recursive] \|\|= false
7	7	configure[:list_type] \|\|= :folder
8		- if !configure[:contents].blank?
9		- configure[:contents] = configure[:contents].order('name ASC').paginate(
10		- :per_page => 30,
11		- :page => params[:npage]
12		- )
13		-
	8	+ contents = configure[:contents]
	9	+ contents = contents.order('name ASC') unless contents.is_a? Array
	10	+ contents = contents.paginate per_page: 30, page: params[:npage]
	11	+ configure[:contents] = contents
	12	+ if contents.present?
14	13	render :file => 'shared/content_list', :locals => configure
15	14	else
16	15	content_tag('em', _('(empty folder)'))
...	...
...	...	@@ -4,8 +4,4 @@
4	4	</div>
5	5	<% end %>
6	6
7		-<% if folder.children.empty? %>
8		- <em><%= _('(empty folder)') %></em>
9		-<% else %>
10		- <%= list_contents(:contents=>folder.children) %>
11		-<% end %>
	7	+<%= list_contents contents: folder.children %>
...	...
1		- <%= javascript_include_tag 'strophejs-1.1.3/strophe.min', 'jquery.emoticon', '../designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'chat', 'perfect-scrollbar.min.js', 'perfect-scrollbar.with-mousewheel.min.js', 'jquery.timeago.js' %>
	1	+ <%= javascript_include_tag 'strophejs-1.1.3/strophe.min', 'jquery.emoticon', 'designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'chat', 'perfect-scrollbar.min.js', 'perfect-scrollbar.with-mousewheel.min.js', 'jquery.timeago.js' %>
2	2	<%= stylesheet_link_tag 'perfect-scrollbar.min.css' %>
3	3
4	4	<% extend ChatHelper %>
...	...