@@ -139,6 +139,7 @@ module Kernel # # This will now use the RSpec generator for tests # $ ruby script/generate controller MyController def use_test(test_framework) + return unless Merb.env == 'test' raise "use_test only supports :rspec and :test_unit currently" unless [:rspec, :test_unit].include?(test_framework.to_sym) Merb.generator_scope.delete(:rspec) lib/merb-core/core_ext/kernel.rb @@ -1,5 +1,7 @@ require File.join(File.dirname(__FILE__), "..", "..", "spec_helper") +Merb.environment = 'test' + describe "Plugins", "default GENERATOR_SCOPE" do it "should have :merb_default first" do Merb.generator_scope.first.should == :merb_default spec/private/plugins/plugin_spec.rb 451c7857437a4084c00e5057fb6efd2092290342 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/758a19603ad276a6e95cbaed00bd6b9b4182f0eb 758a19603ad276a6e95cbaed00bd6b9b4182f0eb 2008-03-03T15:23:07-08:00 2008-03-03T15:23:07-08:00 do not load test framework unless Merb.env == 'test' cb8c87614cc74668b7d100af29a0165ded7d51ce Ezra Zygmuntowicz ez@engineyard.com