From ebb438085fe977dc68d9d4ef9c991d36390410fc Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Fri, 17 Jan 2014 17:10:33 +0000 Subject: [PATCH] rails3: fix tests related to controllers listing in noosfero_test --- test/unit/noosfero_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/noosfero_test.rb b/test/unit/noosfero_test.rb index d23d68e..3b26ebb 100644 --- a/test/unit/noosfero_test.rb +++ b/test/unit/noosfero_test.rb @@ -4,12 +4,12 @@ require 'noosfero' class NoosferoTest < ActiveSupport::TestCase def test_should_list_controllers_in_directory - 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 + 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 assert_equal ["system_admin", "environment_admin", "public", "profile_admin"], Noosfero.controllers_in_directory('lala') end def test_should_generate_pattern_for_controllers_in_directory - 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 + 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 assert_equal(/(system_admin|environment_admin|public|profile_admin)/, Noosfero.pattern_for_controllers_in_directory('lala')) end -- libgit2 0.21.2