@@ -177,11 +177,15 @@ module Kernel # # This will now use the RSpec generator for tests # $ merb-gen model ActivityEvent # @api public - def use_test(test_framework, *test_dependencies) + def use_testing_framework(test_framework, *test_dependencies) Merb.test_framework = test_framework Kernel.dependencies test_dependencies if Merb.env == "test" || Merb.env.nil? end + + def use_test(*args) + use_testing_framework(*args) + end # Used in Merb.root/config/init.rb to tell Merb which template engine to # prefer. lib/merb-core/core_ext/kernel.rb 6958852ac4177eef45abacd99acacacdab5d5b5d Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/ea52be274b4dc5369553736c2b93e4988a2bb18e ea52be274b4dc5369553736c2b93e4988a2bb18e 2008-10-09T17:11:05-07:00 2008-10-09T17:11:05-07:00 #use_test is inconsistent with the rest of the framework. Add #use_testing_framework but keep #use_test around for a while. 2b9b23852a80dd87d2194c0194ccdea609f93c0c Michael S. Klishin michael@novemberain.com