moved Merb::Test::Rspec module inside the environment check

cardmagic · Feb 13, 2008 · c8af8f4 · c8af8f4
1 parent d117d44
commit c8af8f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/merb_rspec/lib/merb_rspec.rb b/merb_rspec/lib/merb_rspec.rb
@@ -2,10 +2,6 @@
   Merb::Plugins.add_rakefiles "merb_rspec/merbtasks"
 end
 
-module Merb::Test::Rspec
-
-end
-
 # Don't include anything for RSpec if we're not in the test environment
 if Merb.environment == "test"
   require 'merb-core/test/fake_request'
@@ -15,11 +11,14 @@ module Merb::Test::Rspec
   dependency 'hpricot'
   dependency 'merb-test'
 
-
   require 'spec'
   require 'spec/mocks'
   require 'spec/story'
 
+  module Merb::Test::Rspec
+
+  end
+
   require File.join(File.dirname(__FILE__), 'matchers', 'controller_matchers')
   require File.join(File.dirname(__FILE__), 'matchers', 'markup_matchers')
 

diff --git a/merb_rspec/specs/spec_helper.rb b/merb_rspec/specs/spec_helper.rb
@@ -1,6 +1,5 @@
 require 'rubygems'
 require "merb-core"
-require "merb-test"
 
 Merb.start :environment => "test", :adapter => "runner"