shoulda 3.6.0 → 4.0.0.rc1

data/test/acceptance_test_helper.rb

@@ -1,4 +1,4 @@
-require_relative 'support/tests/current_bundle'
+require_relative 'support/current_bundle'
 
 Tests::CurrentBundle.instance.assert_appraisal!
 
@@ -6,12 +6,38 @@ Tests::CurrentBundle.instance.assert_appraisal!
 
 require 'test_helper'
 
-acceptance_test_support_files =
-  Pathname.new('../support/acceptance/**/*.rb').expand_path(__FILE__)
-
-Dir.glob(acceptance_test_support_files).sort.each { |file| require file }
+require_relative 'support/acceptance/rails_application_with_shoulda'
+require_relative 'support/acceptance/matchers/have_output'
+require_relative 'support/acceptance/matchers/indicate_that_tests_were_run'
 
 class AcceptanceTest < Minitest::Test
-  include AcceptanceTests::Helpers
   include AcceptanceTests::Matchers
+
+  private
+
+  def app
+    @app ||= AcceptanceTests::RailsApplicationWithShoulda.new
+  end
+end
+
+begin
+  require 'rails/test_unit/reporter'
+
+  # Patch Rails' reporter for Minitest so that it looks for the test
+  # correctly under Minitest 5.11
+  # See: <https://github.com/rails/rails/pull/31624>
+  Rails::TestUnitReporter.class_eval do
+    def format_rerun_snippet(result)
+      location, line =
+        if result.respond_to?(:source_location)
+          result.source_location
+        else
+          result.method(result.name).source_location
+        end
+
+      "#{executable} #{relative_path_for(location)}:#{line}"
+    end
+  end
+rescue LoadError
+  # Okay, rails/test_unit/reporter isn't a thing, no big deal
 end

data/test/support/acceptance/add_shoulda_to_project.rb

@@ -1,33 +1,28 @@
-require_relative 'helpers/base_helpers'
-require_relative 'helpers/gem_helpers'
-
 module AcceptanceTests
   class AddShouldaToProject
-    def self.call(options)
-      new(options).call
-    end
+    ROOT_DIRECTORY = Pathname.new('../../..').expand_path(__FILE__)
 
-    include BaseHelpers
-    include GemHelpers
+    def self.call(app, options)
+      new(app, options).call
+    end
 
-    def initialize(options)
+    def initialize(app, options)
+      @app = app
       @options = options
     end
 
     def call
-      add_gem 'shoulda', gem_options
+      app.add_gem 'shoulda', gem_options
 
       unless options[:with_configuration] === false
         add_configuration_block_to_test_helper
       end
     end
 
-    protected
-
-    attr_reader :options
-
     private
 
+    attr_reader :app, :options
+
     def test_framework
       options[:test_framework]
     end
@@ -37,7 +32,7 @@ module AcceptanceTests
     end
 
     def gem_options
-      gem_options = { path: fs.root_directory }
+      gem_options = { path: ROOT_DIRECTORY }
 
       if options[:manually]
         gem_options[:require] = false
@@ -47,20 +42,20 @@ module AcceptanceTests
     end
 
     def add_configuration_block_to_test_helper
-      content = <<-EOT
+      content = <<-CONTENT
         Shoulda::Matchers.configure do |config|
           config.integrate do |with|
             #{test_framework_config}
             #{library_config}
           end
         end
-      EOT
+      CONTENT
 
       if options[:manually]
         content = "require 'shoulda'\n#{content}"
       end
 
-      fs.append_to_file('test/test_helper.rb', content)
+      app.append_to_file('test/test_helper.rb', content)
     end
 
     def test_framework_config

data/test/support/acceptance/matchers/have_output.rb

@@ -1,8 +1,10 @@
 module AcceptanceTests
   module Matchers
+    # rubocop:disable Naming/PredicateName
     def have_output(output)
       HaveOutputMatcher.new(output)
     end
+    # rubocop:enable Naming/PredicateName
 
     class HaveOutputMatcher
       def initialize(output)

data/test/support/acceptance/matchers/indicate_that_tests_were_run.rb

@@ -0,0 +1,109 @@
+require_relative '../helpers/array_helpers'
+require_relative '../helpers/pluralization_helpers'
+
+module AcceptanceTests
+  module Matchers
+    def indicate_that_tests_were_run(series)
+      IndicateThatTestsWereRunMatcher.new(series)
+    end
+
+    class IndicateThatTestsWereRunMatcher
+      include ArrayHelpers
+      include PluralizationHelpers
+
+      def initialize(expected_numbers)
+        @expected_numbers = expected_numbers
+      end
+
+      def matches?(runner)
+        @runner = runner
+        Set.new(expected_numbers).subset?(Set.new(actual_numbers))
+      end
+
+      def failure_message
+        "Expected output to indicate that #{some_tests_were_run}.\n" +
+          "#{formatted_expected_numbers}\n" +
+          "#{formatted_actual_numbers}\n\n" +
+          "Output:\n\n" +
+          actual_output
+      end
+
+      protected
+
+      attr_reader :expected_numbers, :runner
+
+      private
+
+      def some_tests_were_run
+        if some_tests_were_run_clauses.size > 1
+          "#{to_sentence(some_tests_were_run_clauses)} were run"
+        else
+          "#{some_tests_were_run_clauses} was run"
+        end
+      end
+
+      def some_tests_were_run_clauses
+        expected_numbers.map do |type, number|
+          if number == 1
+            "#{number} #{type.to_s.chop}"
+          else
+            "#{number} #{type}"
+          end
+        end
+      end
+
+      def formatted_expected_numbers
+        "Expected numbers: #{format_hash(expected_numbers)}"
+      end
+
+      def formatted_actual_numbers
+        report_line = find_report_line_in(actual_output)
+
+        if report_line
+          "Actual numbers: #{report_line.inspect}"
+        else
+          'Actual numbers: (n/a)'
+        end
+      end
+
+      def actual_numbers
+        numbers = parse(
+          actual_output,
+          [:tests, :assertions, :failures, :errors, :skips],
+        )
+        numbers || {}
+      end
+
+      def actual_output
+        runner.output
+      end
+
+      def parse(text, pieces)
+        report_line = find_report_line_in(text)
+
+        if report_line
+          pieces.inject({}) do |hash, piece|
+            number = report_line.match(/(\d+) #{piece}/)[1].to_i
+            hash.merge(piece => number)
+          end
+        end
+      end
+
+      def find_report_line_in(text)
+        lines = text.split(/\n/)
+
+        index_of_line_with_time = lines.find_index do |line|
+          line =~ /\AFinished in \d\.\d+s\Z/
+        end
+
+        if index_of_line_with_time
+          lines[index_of_line_with_time + 1]
+        end
+      end
+
+      def format_hash(hash)
+        '{' + hash.map { |k, v| "#{k}: #{v.inspect}" }.join(', ') + '}'
+      end
+    end
+  end
+end

data/test/support/acceptance/rails_application_with_shoulda.rb

@@ -0,0 +1,47 @@
+require_relative 'add_shoulda_to_project'
+require_relative '../snowglobe'
+
+module AcceptanceTests
+  class RailsApplicationWithShoulda < Snowglobe::RailsApplication
+    def create
+      super
+
+      bundle.updating do
+        bundle.add_gem 'minitest-reporters'
+        AddShouldaToProject.call(
+          self,
+          test_framework: :minitest,
+          libraries: [:rails],
+        )
+      end
+
+      fs.append_to_file 'test/test_helper.rb', <<-FILE
+        require 'minitest/autorun'
+        require 'minitest/reporters'
+
+        Minitest::Reporters.use!(Minitest::Reporters::SpecReporter.new)
+
+        begin
+          require "rails/test_unit/reporter"
+
+          # Patch Rails' reporter for Minitest so that it looks for the test
+          # correctly under Minitest 5.11
+          # See: <https://github.com/rails/rails/pull/31624>
+          Rails::TestUnitReporter.class_eval do
+            def format_rerun_snippet(result)
+              location, line = if result.respond_to?(:source_location)
+                result.source_location
+              else
+                result.method(result.name).source_location
+              end
+
+              "\#{executable} \#{relative_path_for(location)}:\#{line}"
+            end
+          end
+        rescue LoadError
+          # Okay, rails/test_unit/reporter isn't a thing, no big deal
+        end
+      FILE
+    end
+  end
+end

data/test/support/{tests/current_bundle.rb → current_bundle.rb}

@@ -9,13 +9,13 @@ module Tests
 
     def assert_appraisal!
       unless appraisal_in_use?
-        message = <<EOT
+        message = <<MSG
 
 
 Please run tests starting with `appraisal <appraisal_name>`.
 Possible appraisals are: #{available_appraisals}
 
-EOT
+MSG
         raise AppraisalNotSpecified, message
       end
     end
@@ -29,7 +29,7 @@ EOT
     end
 
     def latest_appraisal
-      available_appraisals.sort.last
+      available_appraisals.max
     end
 
     private
@@ -55,7 +55,7 @@ EOT
     end
 
     def root
-      Pathname.new('../../../..').expand_path(__FILE__)
+      Pathname.new('../../..').expand_path(__FILE__)
     end
   end
 end

data/test/support/snowglobe.rb

@@ -0,0 +1,5 @@
+require 'snowglobe'
+
+Snowglobe.configure do |config|
+  config.project_name = 'shoulda'
+end

data/test/test_helper.rb

@@ -1,14 +1,19 @@
-PROJECT_ROOT = Pathname.new('../..').expand_path(__FILE__).freeze
-$LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
-
+require 'bundler/setup'
 require 'pry'
 require 'pry-byebug'
 require 'minitest/autorun'
 require 'minitest/reporters'
-require 'shoulda'
+require 'warnings_logger'
+
+require_relative '../lib/shoulda'
 
 Minitest::Reporters.use!(Minitest::Reporters::SpecReporter.new)
 
+WarningsLogger::Spy.call(
+  project_name: 'shoulda',
+  project_directory: Pathname.new('../..').expand_path(__FILE__),
+)
+
 Shoulda::Matchers.configure do |config|
   config.integrate do |with|
     with.test_framework :minitest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - Tammer Saleh
@@ -12,42 +12,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 2.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 2.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 description: Making tests easy on the fingers and eyes
 email: support@thoughtbot.com
 executables: []
@@ -57,8 +51,8 @@ files:
 - ".autotest"
 - ".gitignore"
 - ".hound.yml"
-- ".hound/ruby.yml"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Appraisals
 - CONTRIBUTING.md
@@ -66,40 +60,35 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- gemfiles/4.2.gemfile
-- gemfiles/4.2.gemfile.lock
-- gemfiles/5.0.gemfile
-- gemfiles/5.0.gemfile.lock
+- gemfiles/rails_4_2.gemfile
+- gemfiles/rails_4_2.gemfile.lock
+- gemfiles/rails_5_0.gemfile
+- gemfiles/rails_5_0.gemfile.lock
+- gemfiles/rails_5_1.gemfile
+- gemfiles/rails_5_1.gemfile.lock
+- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_5_2.gemfile.lock
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_0.gemfile.lock
 - lib/shoulda.rb
 - lib/shoulda/version.rb
+- script/install_gems_in_all_appraisals
+- script/run_all_tests
+- script/supported_ruby_versions
+- script/update_gem_in_all_appraisals
+- script/update_gems_in_all_appraisals
 - shoulda.gemspec
-- test/acceptance/rails_integration_test.rb
+- test/acceptance/integrates_with_rails_test.rb
 - test/acceptance_test_helper.rb
-- test/report_warnings.rb
 - test/support/acceptance/add_shoulda_to_project.rb
-- test/support/acceptance/helpers.rb
-- test/support/acceptance/helpers/active_model_helpers.rb
 - test/support/acceptance/helpers/array_helpers.rb
-- test/support/acceptance/helpers/base_helpers.rb
-- test/support/acceptance/helpers/command_helpers.rb
-- test/support/acceptance/helpers/file_helpers.rb
-- test/support/acceptance/helpers/gem_helpers.rb
 - test/support/acceptance/helpers/pluralization_helpers.rb
-- test/support/acceptance/helpers/step_helpers.rb
 - test/support/acceptance/matchers/have_output.rb
-- test/support/acceptance/matchers/indicate_number_of_tests_was_run_matcher.rb
-- test/support/acceptance/matchers/indicate_that_tests_were_run_matcher.rb
-- test/support/tests/bundle.rb
-- test/support/tests/command_runner.rb
-- test/support/tests/current_bundle.rb
-- test/support/tests/filesystem.rb
-- test/support/tests/version.rb
+- test/support/acceptance/matchers/indicate_that_tests_were_run.rb
+- test/support/acceptance/rails_application_with_shoulda.rb
+- test/support/current_bundle.rb
+- test/support/snowglobe.rb
 - test/test_helper.rb
-- test/warnings_spy.rb
-- test/warnings_spy/filesystem.rb
-- test/warnings_spy/partitioner.rb
-- test/warnings_spy/reader.rb
-- test/warnings_spy/reporter.rb
 homepage: https://github.com/thoughtbot/shoulda
 licenses:
 - MIT
@@ -115,40 +104,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Making tests easy on the fingers and eyes
 test_files:
-- test/acceptance/rails_integration_test.rb
+- test/acceptance/integrates_with_rails_test.rb
 - test/acceptance_test_helper.rb
-- test/report_warnings.rb
 - test/support/acceptance/add_shoulda_to_project.rb
-- test/support/acceptance/helpers.rb
-- test/support/acceptance/helpers/active_model_helpers.rb
 - test/support/acceptance/helpers/array_helpers.rb
-- test/support/acceptance/helpers/base_helpers.rb
-- test/support/acceptance/helpers/command_helpers.rb
-- test/support/acceptance/helpers/file_helpers.rb
-- test/support/acceptance/helpers/gem_helpers.rb
 - test/support/acceptance/helpers/pluralization_helpers.rb
-- test/support/acceptance/helpers/step_helpers.rb
 - test/support/acceptance/matchers/have_output.rb
-- test/support/acceptance/matchers/indicate_number_of_tests_was_run_matcher.rb
-- test/support/acceptance/matchers/indicate_that_tests_were_run_matcher.rb
-- test/support/tests/bundle.rb
-- test/support/tests/command_runner.rb
-- test/support/tests/current_bundle.rb
-- test/support/tests/filesystem.rb
-- test/support/tests/version.rb
+- test/support/acceptance/matchers/indicate_that_tests_were_run.rb
+- test/support/acceptance/rails_application_with_shoulda.rb
+- test/support/current_bundle.rb
+- test/support/snowglobe.rb
 - test/test_helper.rb
-- test/warnings_spy.rb
-- test/warnings_spy/filesystem.rb
-- test/warnings_spy/partitioner.rb
-- test/warnings_spy/reader.rb
-- test/warnings_spy/reporter.rb