lib/spec/mocks/extensions.rb lib/spec/mocks/framework.rb stories/mock_framework_integration/stories.rb stories/mock_framework_integration/use_flexmock.story stories/resources/spec/spec_with_flexmock.rb @@ -28,6 +28,7 @@ metaclass call with (class << self; self; end) and all will be well. * Add before_suite and after_suite callbacks to ExampleGroupMethods and Options. Closes #210. * The after(:suite) callback lambda is passed a boolean representing whether the suite passed or failed * Added IndentedTextFormatter. Closes #366. +* decoupled mock framework from global extensions used by rspec - supports use of flexmock or mocha w/ rails == Version 1.1.3 CHANGES @@ -1,18 +1,4 @@ -require 'spec/mocks/methods' -require 'spec/mocks/argument_constraint_matchers' -require 'spec/mocks/spec_methods' -require 'spec/mocks/proxy' -require 'spec/mocks/any_instance' -require 'spec/mocks/mock' -require 'spec/mocks/argument_expectation' -require 'spec/mocks/message_expectation' -require 'spec/mocks/order_group' -require 'spec/mocks/errors' -require 'spec/mocks/error_generator' -require 'spec/mocks/extensions/object' -require 'spec/mocks/extensions/class' -require 'spec/mocks/space' - +require 'spec/mocks/framework' module Spec # == Mocks and Stubs lib/spec/mocks.rb @@ -6,7 +6,7 @@ module Spec TINY = 3 RELEASE_CANDIDATE = nil - BUILD_TIME_UTC = 20080522075859 + BUILD_TIME_UTC = 20080524224246 STRING = [MAJOR, MINOR, TINY].join('.') TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_') lib/spec/version.rb @@ -1,4 +1,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "spec", "mocks")) +require 'spec/mocks/framework' +require 'spec/mocks/extensions' module Spec module Plugins plugins/mock_frameworks/rspec.rb @@ -1,5 +1,5 @@ require File.join(File.dirname(__FILE__), *%w[helper]) -["example_groups","interop"].each do |dir| +%w[example_groups interop mock_framework_integration].each do |dir| require File.join(File.dirname(__FILE__), "#{dir}/stories") end stories/all.rb 73b3bf2d683d6ee90da7ecbaeeb53708e458788f David Chelimsky dchelimsky@gmail.com http://github.com/jpshackelford/rspec/commit/2a881bfdaebe107946258889ed651941f413adbd 2a881bfdaebe107946258889ed651941f413adbd 2008-05-24T15:55:15-07:00 2008-05-24T15:55:15-07:00 Decouple mock framework from global extensions used by rspec. Supports use of flexmock or mocha w/ rspec-rails. 925d6f3b5c697dfce32afb45eca3461b7e464da3 David Chelimsky dchelimsky@gmail.com