Spec2Rspec

txus · Jun 29, 2009 · a5c123f · a5c123f
1 parent e2a3b1a
commit a5c123f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/spec/rspec/mocks/failing_argument_matchers_spec.rb b/spec/rspec/mocks/failing_argument_matchers_spec.rb
@@ -87,7 +87,7 @@ module Mocks
         lambda do
           @mock.should_receive(:msg).with {|arg| arg.should == :received }
           @mock.msg :no_msg_for_you
-        end.should raise_error(Spec::Expectations::ExpectationNotMetError, /expected: :received.*\s*.*got: :no_msg_for_you/)
+        end.should raise_error(Rspec::Expectations::ExpectationNotMetError, /expected: :received.*\s*.*got: :no_msg_for_you/)
       end
 
     end

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -3,7 +3,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/../lib'))
 require 'rspec/mocks'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/../../expectations/lib'))
-require 'spec/expectations'
+require 'rspec/expectations'
 
 module Macros
   def treats_method_missing_as_private(options = {:noop => true, :subject => nil})
@@ -35,7 +35,7 @@ def treats_method_missing_as_private(options = {:noop => true, :subject => nil})
   end
 end
 
-module Spec  
+module Rspec  
   module Matchers
     def with_ruby(version)
       yield if RUBY_VERSION =~ Regexp.compile("^#{version.to_s}")
@@ -47,6 +47,6 @@ def with_ruby(version)
   config.mock_with :rspec
   config.color_enabled = true
   config.extend(Macros)
-  config.include(Spec::Matchers)
+  config.include(Rspec::Matchers)
   config.include(Rspec::Mocks::Methods)
 end