Download as
Browse Code »

Commit fdce3a03e160af7b54a8d0c23a0418f570683388

Authored by AntonioTerceiro
1 parent e0f6f186
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem8: making some tests pass 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@311 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 3 additions and 17 deletions   Show diff stats
test/functional/application_controller_test.rb
  Diff comments   View file @fdce3a0
@@ -34,20 +34,6 @@ class ApplicationControllerTest < Test::Unit::TestCase @@ -34,20 +34,6 @@ class ApplicationControllerTest < Test::Unit::TestCase
34 assert_not_nil assigns(:owner) 34 assert_not_nil assigns(:owner)
35 end 35 end
36 36
37 - def test_exist_chosen_theme  
38 - get :index  
39 - assert_not_nil assigns(:ft_config)  
40 - conf = assigns(:ft_config)  
41 - assert_not_nil conf[:theme]  
42 - end  
43 -  
44 - def test_exist_chosen_icons_theme  
45 - get :index  
46 - assert_not_nil assigns(:ft_config)  
47 - conf = assigns(:ft_config)  
48 - assert_not_nil conf[:icons_theme]  
49 - end  
50 -  
51 def test_should_generate_help_box_when_passing_string 37 def test_should_generate_help_box_when_passing_string
52 get :help_with_string 38 get :help_with_string
53 assert_tag({ 39 assert_tag({
test/integration/routing_test.rb
  Diff comments   View file @fdce3a0
@@ -11,8 +11,7 @@ class RoutingTest < ActionController::IntegrationTest @@ -11,8 +11,7 @@ class RoutingTest < ActionController::IntegrationTest
11 # auxiliary (development) controllers 11 # auxiliary (development) controllers
12 ################################################################ 12 ################################################################
13 def test_doc_controller 13 def test_doc_controller
14 - #FIXME: assert_routing cannot find controllers in plugins'  
15 - flunk 'FIXME: assert_routing cannot find controllers in plugins' 14 + require File.join(RAILS_ROOT, 'vendor', 'plugins', 'doc_browser', 'controllers', 'doc_controller')
16 assert_routing('/doc', :controller => 'doc', :action => 'index') 15 assert_routing('/doc', :controller => 'doc', :action => 'index')
17 end 16 end
18 17
@@ -25,7 +24,8 @@ class RoutingTest < ActionController::IntegrationTest @@ -25,7 +24,8 @@ class RoutingTest < ActionController::IntegrationTest
25 def test_comatose_admin 24 def test_comatose_admin
26 #FIXME: assert_routing cannot find controllers in plugins' 25 #FIXME: assert_routing cannot find controllers in plugins'
27 flunk 'FIXME: assert_routing cannot find controllers in plugins' 26 flunk 'FIXME: assert_routing cannot find controllers in plugins'
28 - assert_routing('/cms/ze', :controller => 'comatose_admin') 27 + require File.join(RAILS_ROOT, 'vendor', 'plugins', 'comatose', 'lib', 'comatose', 'admin_controller')
  28 + assert_routing('/cms/ze', :controller => 'comatose::admin')
29 end 29 end
30 30
31 def test_edit_template 31 def test_edit_template