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

…into merge-requests/291

Merge commit 'refs/merge-requests/291' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/291
Rodrigo Souto
2 parents 8e9c9d70 ee97d763
Showing 3 changed files with 32 additions and 4 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
test/functional/cms_controller_test.rb
test/test_helper.rb
@@ -182,7 +182,14 @@ class CmsController &lt; MyProfileController
     if request.post?
       @article.destroy
       session[:notice] = _("\"#{@article.name}\" was removed.")
-      redirect_to :action => (@article.parent ? 'view' : 'index'), :id => @article.parent
+      referer = ActionController::Routing::Routes.recognize_path URI.parse(request.referer).path rescue nil
+      if referer and referer[:controller] == 'cms'
+        redirect_to referer
+      elsif @article.parent
+        redirect_to @article.parent.url
+      else
+        redirect_to profile.url
+      end
     end
   end
@@ -6,6 +6,8 @@ class CmsController; def rescue_action(e) raise e end; end
 class CmsControllerTest < ActionController::TestCase
+  include NoosferoTestHelper
+
   fixtures :environments
   def setup
@@ -199,13 +201,29 @@ class CmsControllerTest &lt; ActionController::TestCase
   should 'be able to remove article' do
     a = profile.articles.build(:name => 'my-article')
     a.save!
-
     assert_difference Article, :count, -1 do
+      @request.env['HTTP_REFERER'] = url_for :controller => 'cms', :profile => profile.identifier, :action => 'index'
       post :destroy, :profile => profile.identifier, :id => a.id
       assert_redirected_to :controller => 'cms', :profile => profile.identifier, :action => 'index'
     end
   end
+  should 'redirect to cms after remove article from content management' do
+    a = profile.articles.build(:name => 'my-article')
+    a.save!
+    @request.env['HTTP_REFERER'] = url_for :controller => 'cms', :profile => profile.identifier, :action => 'index'
+    post :destroy, :profile => profile.identifier, :id => a.id
+    assert_redirected_to :controller => 'cms', :profile => profile.identifier, :action => 'index'
+  end
+
+  should 'redirect to blog after remove article from content viewer' do
+    a = profile.articles.build(:name => 'my-article')
+    a.save!
+    @request.env['HTTP_REFERER'] = url_for :controller => 'content_viewer', :action => 'view_page'
+    post :destroy, :profile => profile.identifier, :id => a.id
+    assert_redirected_to :controller => 'content_viewer', :action => 'view_page'
+  end
+
   should 'be able to acess Rss feed creation page' do
     login_as(profile.identifier)
     assert_nothing_raised do
@@ -887,6 +905,7 @@ class CmsControllerTest &lt; ActionController::TestCase
   should 'offer confirmation to remove article' do
     a = profile.articles.create!(:name => 'my-article')
+    @request.env['HTTP_REFERER'] = url_for :controller => 'cms', :profile => profile.identifier, :action => 'index'
     post :destroy, :profile => profile.identifier, :id => a.id
     assert_response :redirect
   end
@@ -256,9 +256,11 @@ module NoosferoTestHelper
   def will_paginate(arg1, arg2)
   end
-  def url_for(args = {})
-    args
+  def url_for *args
+    url = ActionController::UrlRewriter.new(@request, nil)
+    url.rewrite *args
   end
+
   def javascript_tag(any)
     ''
   end
	@@ -182,7 +182,14 @@ class CmsController < MyProfileController		@@ -182,7 +182,14 @@ class CmsController < MyProfileController
182	if request.post?	182	if request.post?
183	@article.destroy	183	@article.destroy
184	session[:notice] = _("\"#{@article.name}\" was removed.")	184	session[:notice] = _("\"#{@article.name}\" was removed.")
185	- redirect_to :action => (@article.parent ? 'view' : 'index'), :id => @article.parent	185	+ referer = ActionController::Routing::Routes.recognize_path URI.parse(request.referer).path rescue nil
		186	+ if referer and referer[:controller] == 'cms'
		187	+ redirect_to referer
		188	+ elsif @article.parent
		189	+ redirect_to @article.parent.url
		190	+ else
		191	+ redirect_to profile.url
		192	+ end
186	end	193	end
187	end	194	end
188		195