mocha 0.10.5 → 1.13.0

data/Rakefile

@@ -1,24 +1,29 @@
-require "bundler"
+require 'bundler'
 Bundler::GemHelper.install_tasks
-require "bundler/setup"
+require 'bundler/setup'
 
-require 'rdoc/task'
 require 'rake/testtask'
 
-desc "Run all tests"
+desc 'Run all tests'
 task 'default' => ['test', 'test:performance']
 
-desc "Run unit & acceptance tests"
-task 'test' => ['test:units', 'test:acceptance']
-
-namespace 'test' do
+desc 'Run tests'
+task 'test' do
+  if (test_library = ENV['MOCHA_RUN_INTEGRATION_TESTS'])
+    Rake::Task["test:integration:#{test_library}"].invoke
+  else
+    Rake::Task['test:units'].invoke
+    Rake::Task['test:acceptance'].invoke
+  end
+end
 
+namespace 'test' do # rubocop:disable Metrics/BlockLength
   unit_tests = FileList['test/unit/**/*_test.rb']
   all_acceptance_tests = FileList['test/acceptance/*_test.rb']
   ruby186_incompatible_acceptance_tests = FileList['test/acceptance/stub_class_method_defined_on_*_test.rb'] + FileList['test/acceptance/stub_instance_method_defined_on_*_test.rb']
   ruby186_compatible_acceptance_tests = all_acceptance_tests - ruby186_incompatible_acceptance_tests
 
-  desc "Run unit tests"
+  desc 'Run unit tests'
   Rake::TestTask.new('units') do |t|
     t.libs << 'test'
     t.test_files = unit_tests
@@ -26,18 +31,36 @@ namespace 'test' do
     t.warning = true
   end
 
-  desc "Run acceptance tests"
+  desc 'Run acceptance tests'
   Rake::TestTask.new('acceptance') do |t|
     t.libs << 'test'
-    if defined?(RUBY_VERSION) && (RUBY_VERSION >= "1.8.7")
-      t.test_files = all_acceptance_tests
-    else
-      t.test_files = ruby186_compatible_acceptance_tests
-    end
+    t.test_files = if defined?(RUBY_VERSION) && (RUBY_VERSION >= '1.8.7')
+                     all_acceptance_tests
+                   else
+                     ruby186_compatible_acceptance_tests
+                   end
     t.verbose = true
     t.warning = true
   end
 
+  namespace 'integration' do
+    desc 'Run MiniTest integration tests (intended to be run in its own process)'
+    Rake::TestTask.new('minitest') do |t|
+      t.libs << 'test'
+      t.test_files = FileList['test/integration/mini_test_test.rb']
+      t.verbose = true
+      t.warning = true
+    end
+
+    desc 'Run Test::Unit integration tests (intended to be run in its own process)'
+    Rake::TestTask.new('test-unit') do |t|
+      t.libs << 'test'
+      t.test_files = FileList['test/integration/test_unit_test.rb']
+      t.verbose = true
+      t.warning = true
+    end
+  end
+
   # require 'rcov/rcovtask'
   # Rcov::RcovTask.new('coverage') do |t|
   #   t.libs << 'test'
@@ -48,7 +71,7 @@ namespace 'test' do
   #   t.rcov_opts << '--xref'
   # end
 
-  desc "Run performance tests"
+  desc 'Run performance tests'
   task 'performance' do
     require File.join(File.dirname(__FILE__), 'test', 'acceptance', 'stubba_example_test')
     require File.join(File.dirname(__FILE__), 'test', 'acceptance', 'mocha_example_test')
@@ -58,100 +81,77 @@ namespace 'test' do
       puts "#{test_case}: #{benchmark_test_case(test_case, iterations)} seconds."
     end
   end
+end
 
+begin
+  require 'rubocop/rake_task'
+  if RUBY_VERSION >= '2.2.0' && (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby') && ENV['MOCHA_RUN_INTEGRATION_TESTS'].nil?
+    RuboCop::RakeTask.new
+    task 'test' => 'rubocop'
+  end
+rescue LoadError # rubocop:disable Lint/HandleExceptions
 end
 
+# rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
 def benchmark_test_case(klass, iterations)
   require 'benchmark'
+  require 'mocha/detection/mini_test'
 
   if defined?(MiniTest)
-    MiniTest::Unit.output = StringIO.new
-    Benchmark.realtime { iterations.times { |i| MiniTest::Unit.new.run(klass) } }
+    minitest_version = Gem::Version.new(Mocha::Detection::MiniTest.version)
+    if Gem::Requirement.new('>= 5.0.0').satisfied_by?(minitest_version)
+      result = Benchmark.realtime { iterations.times { |_i| klass.run(MiniTest::CompositeReporter.new) } }
+      MiniTest::Runnable.runnables.delete(klass)
+      result
+    else
+      MiniTest::Unit.output = StringIO.new
+      Benchmark.realtime { iterations.times { |_i| MiniTest::Unit.new.run([klass]) } }
+    end
   else
     load 'test/unit/ui/console/testrunner.rb' unless defined?(Test::Unit::UI::Console::TestRunner)
-    unless $silent_option
+    unless @silent_option
       begin
         load 'test/unit/ui/console/outputlevel.rb' unless defined?(Test::Unit::UI::Console::OutputLevel::SILENT)
-        $silent_option = { :output_level => Test::Unit::UI::Console::OutputLevel::SILENT }
+        @silent_option = { :output_level => Test::Unit::UI::Console::OutputLevel::SILENT }
       rescue LoadError
-        $silent_option = Test::Unit::UI::SILENT
+        @silent_option = Test::Unit::UI::SILENT
       end
     end
-    Benchmark.realtime { iterations.times { Test::Unit::UI::Console::TestRunner.run(klass, $silent_option) } }
+    Benchmark.realtime { iterations.times { Test::Unit::UI::Console::TestRunner.run(klass, @silent_option) } }
   end
 end
+# rubocop:enable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
 
-desc 'Generate RDoc'
-Rake::RDocTask.new('rdoc') do |task|
-  task.main = 'README.rdoc'
-  task.title = "Mocha #{Mocha::VERSION}"
-  task.rdoc_dir = 'doc'
-  template = File.expand_path(File.join(File.dirname(__FILE__), "templates", "html_with_google_analytics.rb"))
-  if File.exist?(template)
-    puts "*** Using RDoc template incorporating Google Analytics"
-    task.template = template
-  end
-  task.rdoc_files.include(
-    'README.rdoc',
-    'RELEASE.rdoc',
-    'COPYING.rdoc',
-    'MIT-LICENSE.rdoc',
-    'agiledox.txt',
-    'lib/mocha/api.rb',
-    'lib/mocha/mock.rb',
-    'lib/mocha/expectation.rb',
-    'lib/mocha/object.rb',
-    'lib/mocha/parameter_matchers.rb',
-    'lib/mocha/parameter_matchers',
-    'lib/mocha/state_machine.rb',
-    'lib/mocha/configuration.rb',
-    'lib/mocha/stubbing_error.rb'
-  )
-end
+if ENV['MOCHA_GENERATE_DOCS']
+  require 'yard'
 
-desc "Upload RDoc to RubyForge"
-task 'publish_docs' => ['clobber_rdoc', 'rdoc', 'examples', 'agiledox.txt'] do
-  require 'rake/contrib/sshpublisher'
-  Rake::SshDirPublisher.new("jamesmead@rubyforge.org", "/var/www/gforge-projects/mocha", "doc").upload
-end
+  desc 'Remove generated documentation'
+  task 'clobber_yardoc' do
+    `rm -rf ./docs`
+  end
 
-desc "Generate agiledox-like documentation for tests"
-file 'agiledox.txt' do
-  File.open('agiledox.txt', 'w') do |output|
-    tests = FileList['test/**/*_test.rb']
-    tests.each do |file|
-      m = %r".*/([^/].*)_test.rb".match(file)
-      output << m[1]+" should:\n"
-      test_definitions = File::readlines(file).select {|line| line =~ /.*def test.*/}
-      test_definitions.sort.each do |definition|
-        m = %r"test_(should_)?(.*)".match(definition)
-        output << " - "+m[2].gsub(/_/," ") << "\n"
-      end
+  task 'docs_environment' do
+    unless ENV['GOOGLE_ANALYTICS_WEB_PROPERTY_ID']
+      puts "\nWarning: GOOGLE_ANALYTICS_WEB_PROPERTY_ID was not defined\n\n"
     end
   end
-end
 
-desc "Convert example ruby files to syntax-highlighted html"
-task 'examples' do
-  require 'coderay'
-  mkdir_p 'doc/examples'
-  File.open('doc/examples/coderay.css', 'w') do |output|
-    output << CodeRay::Encoders[:html]::CSS.new.stylesheet
+  desc 'Generate documentation'
+  YARD::Rake::YardocTask.new('yardoc' => 'docs_environment') do |task|
+    task.options = ['--title', "Mocha #{Mocha::VERSION}", '--fail-on-warning']
   end
-  ['mocha', 'stubba', 'misc'].each do |filename|
-    File.open("doc/examples/#{filename}.html", 'w') do |file|
-      file << "<html>"
-      file << "<head>"
-      file << %q(<link rel="stylesheet" media="screen" href="coderay.css" type="text/css">)
-      file << "</head>"
-      file << "<body>"
-      file << CodeRay.scan_file("examples/#{filename}.rb").html.div
-      file << "</body>"
-      file << "</html>"
-    end
+
+  task 'checkout_docs_cname' do
+    `git checkout docs/CNAME`
   end
-end
 
-task 'release' => 'default' do
-  Rake::Task['publish_docs'].invoke
+  task 'checkout_docs_js' do
+    `git checkout docs/js/app.js`
+    `git checkout docs/js/jquery.js`
+  end
+
+  desc 'Generate documentation'
+  task 'generate_docs' => %w[clobber_yardoc yardoc checkout_docs_cname checkout_docs_js]
 end
+
+task 'release' => 'default'

data/gemfiles/Gemfile.minitest.latest

@@ -1,7 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec :path=>"../"
 
 group :development do
   gem "minitest"
-end
+end

data/gemfiles/Gemfile.test-unit.latest

@@ -1,7 +1,11 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec :path=>"../"
 
 group :development do
-  gem "test-unit"
+  if RUBY_VERSION < '1.9'
+    gem "test-unit", "~> 2"
+  else
+    gem "test-unit"
+  end
 end

data/init.rb

@@ -1,3 +1 @@
-# Mocha should no longer be loaded at plugin load time
-# You should explicitly load Mocha *after* Test::Unit or MiniTest have been loaded
-# e.g. by adding "require 'mocha'" at the bottom of test/test_helper.rb
+warn 'Mocha deprecation warning: The old-style Rails plugin will not be supported in future versions of Mocha.'

data/lib/mocha/any_instance_method.rb

@@ -1,57 +1,24 @@
-require 'mocha/class_method'
+require 'mocha/ruby_version'
+require 'mocha/stubbed_method'
 
 module Mocha
+  class AnyInstanceMethod < StubbedMethod
+    private
 
-  class AnyInstanceMethod < ClassMethod
-  
-    def mock
-      stubbee.any_instance.mocha
+    def mock_owner
+      stubbee.any_instance
     end
 
-    def reset_mocha
-      stubbee.any_instance.reset_mocha
+    def method_body(method)
+      method
     end
 
-    def hide_original_method
-      if method_exists?(method)
-        begin
-          stubbee.send(:alias_method, hidden_method, method)
-        rescue NameError
-          # deal with nasties like ActiveRecord::Associations::AssociationProxy
-        end
-      end
+    def stubbee_method(method_name)
+      stubbee.instance_method(method_name)
     end
 
-    def define_new_method
-      stubbee.class_eval(%{
-        def #{method}(*args, &block)
-          self.class.any_instance.mocha.method_missing(:#{method}, *args, &block)
-        end
-      }, __FILE__, __LINE__)
+    def original_method_owner
+      stubbee
     end
-
-    def remove_new_method
-      stubbee.send(:remove_method, method)
-    end
-
-    def restore_original_method
-      if method_exists?(hidden_method)
-        begin
-          stubbee.send(:alias_method, method, hidden_method)
-          stubbee.send(:remove_method, hidden_method)
-        rescue NameError
-          # deal with nasties like ActiveRecord::Associations::AssociationProxy
-        end
-      end
-    end
-
-    def method_exists?(method)
-      return true if stubbee.public_instance_methods(false).include?(method)
-      return true if stubbee.protected_instance_methods(false).include?(method)
-      return true if stubbee.private_instance_methods(false).include?(method)
-      return false
-    end
-    
   end
-  
 end