Download as
Browse Code »

Commit ebb438085fe977dc68d9d4ef9c991d36390410fc

Authored by Victor Costa
1 parent 72c34d1c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails3: fix tests related to controllers listing in noosfero_test

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
test/unit/noosfero_test.rb
  Diff comments   View file @ebb4380
@@ -4,12 +4,12 @@ require 'noosfero' @@ -4,12 +4,12 @@ require 'noosfero'
4 class NoosferoTest < ActiveSupport::TestCase 4 class NoosferoTest < ActiveSupport::TestCase
5 5
6 def test_should_list_controllers_in_directory 6 def test_should_list_controllers_in_directory
7 - Dir.expects(:glob).with(Rails.root.join('app', 'controllers', 'lala', '*_controller.rb')).returns(["app', 'controllers', 'lala', 'system_admin_controller.rb", "app', 'controllers', 'lala', 'environment_admin_controller.rb", "app', 'controllers', 'lala', 'public_controller.rb", "app', 'controllers', 'lala', 'profile_admin_controller.rb"]).once 7 + Dir.expects(:glob).with(Rails.root.join('app', 'controllers', 'lala', '*_controller.rb')).returns(["app/controllers/lala/system_admin_controller.rb", "app/controllers/lala/environment_admin_controller.rb", "app/controllers/lala/public_controller.rb", "app/controllers/lala/profile_admin_controller.rb"]).once
8 assert_equal ["system_admin", "environment_admin", "public", "profile_admin"], Noosfero.controllers_in_directory('lala') 8 assert_equal ["system_admin", "environment_admin", "public", "profile_admin"], Noosfero.controllers_in_directory('lala')
9 end 9 end
10 10
11 def test_should_generate_pattern_for_controllers_in_directory 11 def test_should_generate_pattern_for_controllers_in_directory
12 - Dir.expects(:glob).with(Rails.root.join('app', 'controllers', 'lala', '*_controller.rb')).returns(["app', 'controllers', 'lala', 'system_admin_controller.rb", "app', 'controllers', 'lala', 'environment_admin_controller.rb", "app', 'controllers', 'lala', 'public_controller.rb", "app', 'controllers', 'lala', 'profile_admin_controller.rb"]).once 12 + Dir.expects(:glob).with(Rails.root.join('app', 'controllers', 'lala', '*_controller.rb')).returns(["app/controllers/lala/system_admin_controller.rb", "app/controllers/lala/environment_admin_controller.rb", "app/controllers/lala/public_controller.rb", "app/controllers/lala/profile_admin_controller.rb"]).once
13 assert_equal(/(system_admin|environment_admin|public|profile_admin)/, Noosfero.pattern_for_controllers_in_directory('lala')) 13 assert_equal(/(system_admin|environment_admin|public|profile_admin)/, Noosfero.pattern_for_controllers_in_directory('lala'))
14 end 14 end
15 15