From 22b5ba967193da198fc53415f2898833487fd410 Mon Sep 17 00:00:00 2001 From: Joenio Costa Date: Wed, 12 Oct 2011 16:34:18 -0300 Subject: [PATCH] Fixing some functional tests --- app/controllers/my_profile/profile_members_controller.rb | 4 +++- test/functional/cms_controller_test.rb | 15 --------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/app/controllers/my_profile/profile_members_controller.rb b/app/controllers/my_profile/profile_members_controller.rb index 7695d80..8ae25c6 100644 --- a/app/controllers/my_profile/profile_members_controller.rb +++ b/app/controllers/my_profile/profile_members_controller.rb @@ -25,9 +25,11 @@ class ProfileMembersController < MyProfileController session[:notice] = _('Couldn\'t change the roles') redirect_to :action => 'index' end + else + redirect_to :action => 'index' end end - + def last_admin @roles = [Profile::Roles.admin(environment.id)] @pre_population = [].to_json diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb index 7e8ce25..186b156 100644 --- a/test/functional/cms_controller_test.rb +++ b/test/functional/cms_controller_test.rb @@ -433,21 +433,6 @@ class CmsControllerTest < Test::Unit::TestCase assert_equal [c1, c3], saved.categories end - should 'filter html from textile article name' do - post :new, :type => 'TextileArticle', :profile => profile.identifier, :article => { :name => 'a test article', :body => 'the text of the article ...' } - assert_sanitized assigns(:article).name - end - - should 'filter html from textile article abstract' do - post :new, :type => 'TextileArticle', :profile => profile.identifier, :article => { :name => 'article', :abstract => 'abstract', :body => 'the text of the article ...' } - assert_sanitized assigns(:article).abstract - end - - should 'filter html from textile article body' do - post :new, :type => 'TextileArticle', :profile => profile.identifier, :article => { :name => 'article', :abstract => 'abstract', :body => 'the text of the article ...' } - assert_sanitized assigns(:article).body - end - should 'filter html with white_list from tiny mce article name' do post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => "test", :body => 'the text of the article ...' } assert_equal "test", assigns(:article).name -- libgit2 0.21.2