shoulda-matchers 3.1.3 → 4.0.0.rc1

data/lib/shoulda/matchers/util/word_wrap.rb

@@ -1,10 +1,14 @@
 module Shoulda
   module Matchers
     # @private
-    def self.word_wrap(document, options = {})
-      Document.new(document, options).wrap
+    module WordWrap
+      def word_wrap(document, options = {})
+        Document.new(document, options).wrap
+      end
     end
 
+    extend WordWrap
+
     # @private
     class Document
       def initialize(document, indent: 0)

data/lib/shoulda/matchers/version.rb

@@ -1,6 +1,6 @@
 module Shoulda
   module Matchers
     # @private
-    VERSION = '3.1.3'.freeze
+    VERSION = '4.0.0.rc1'.freeze
   end
 end

data/script/install_gems_in_all_appraisals

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-SUPPORTED_VERSIONS=$(<script/SUPPORTED_VERSIONS)
+set -euo pipefail
+
+SUPPORTED_VERSIONS=$(script/supported_ruby_versions)
 
 install-gems-for-version() {
   local version="$1"

data/script/run_all_tests

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-SUPPORTED_VERSIONS=$(<script/SUPPORTED_VERSIONS)
+set -euo pipefail
+
+SUPPORTED_VERSIONS=$(script/supported_ruby_versions)
 
 run-tests-for-version() {
   local version="$1"

data/script/supported_ruby_versions

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'yaml'
+
+travis_config_path = File.expand_path('../../.travis.yml', __FILE__)
+travis_config = YAML.load_file(travis_config_path)
+puts travis_config.fetch('rvm').join(' ')

data/script/update_gem_in_all_appraisals

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-SUPPORTED_VERSIONS=$(<script/SUPPORTED_VERSIONS)
+set -euo pipefail
+
+SUPPORTED_VERSIONS=$(script/supported_ruby_versions)
 gem="$1"
 
 update-gem-for-version() {

data/script/update_gems_in_all_appraisals

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-SUPPORTED_VERSIONS=$(<script/SUPPORTED_VERSIONS)
+set -euo pipefail
+
+SUPPORTED_VERSIONS=$(script/supported_ruby_versions)
 
 update-gems-for-version() {
   local version="$1"

data/shoulda-matchers.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
                    "Matt Jankowski", "Stafford Brunk", "Elliot Winkler"]
   s.date        = Time.now.strftime("%Y-%m-%d")
   s.email       = "support@thoughtbot.com"
-  s.homepage    = "http://thoughtbot.com/community/"
+  s.homepage    = "https://matchers.shoulda.io/"
   s.summary     = "Making tests easy on the fingers and eyes"
   s.license     = "MIT"
   s.description = "Making tests easy on the fingers and eyes"
@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = '>= 2.0.0'
-  s.add_dependency('activesupport', '>= 4.0.0')
+  s.required_ruby_version = '>= 2.2.0'
+  s.add_dependency('activesupport', '>= 4.2.0')
 end

data/spec/acceptance/independent_matchers_spec.rb

@@ -56,7 +56,7 @@ describe 'shoulda-matchers has independent matchers, specifically delegate_metho
 
     expect(result).to indicate_number_of_tests_was_run(1)
     expect(result).to have_output(
-      'Courier should delegate #deliver to #post_office object'
+      'Courier should delegate #deliver to the #post_office object'
     )
   end
 
@@ -119,7 +119,7 @@ describe 'shoulda-matchers has independent matchers, specifically delegate_metho
 
     expect(result).to indicate_number_of_tests_was_run(1)
     expect(result).to have_output(
-      /Courier\s+should delegate #deliver to #post_office object/
+      /Courier\s+should delegate #deliver to the #post_office object/
     )
   end
 end

data/spec/acceptance/multiple_libraries_integration_spec.rb

@@ -5,7 +5,7 @@ describe 'shoulda-matchers integrates with multiple libraries' do
     create_rails_application
 
     write_file 'db/migrate/1_create_users.rb', <<-FILE
-      class CreateUsers < ActiveRecord::Migration
+      class CreateUsers < #{migration_class_name}
         def self.up
           create_table :users do |t|
             t.string :name

data/spec/acceptance/rails_integration_spec.rb

@@ -5,7 +5,7 @@ describe 'shoulda-matchers integrates with Rails' do
     create_rails_application
 
     write_file 'db/migrate/1_create_users.rb', <<-FILE
-      class CreateUsers < ActiveRecord::Migration
+      class CreateUsers < #{migration_class_name}
         def self.up
           create_table :users do |t|
             t.string :name
@@ -26,7 +26,7 @@ describe 'shoulda-matchers integrates with Rails' do
       class ExamplesController < ApplicationController
         def show
           @example = 'hello'
-          render nothing: true
+          head :ok
         end
       end
     FILE

data/spec/spec_helper.rb

@@ -7,15 +7,14 @@ require 'pry-byebug'
 require 'rspec'
 
 RSpec.configure do |config|
-  config.order = :random
-
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
 
+  config.order = :random
   config.default_formatter = 'doc'
-
   config.mock_with :rspec
+  config.example_status_persistence_file_path = 'spec/examples.txt'
 end
 
 $VERBOSE = true

data/spec/support/acceptance/helpers.rb

@@ -3,6 +3,7 @@ require_relative 'helpers/base_helpers'
 require_relative 'helpers/command_helpers'
 require_relative 'helpers/gem_helpers'
 require_relative 'helpers/n_unit_helpers'
+require_relative 'helpers/rails_migration_helpers'
 require_relative 'helpers/rails_version_helpers'
 require_relative 'helpers/rspec_helpers'
 require_relative 'helpers/ruby_version_helpers'
@@ -23,6 +24,7 @@ module AcceptanceTests
     include CommandHelpers
     include GemHelpers
     include NUnitHelpers
+    include RailsMigrationHelpers
     include RailsVersionHelpers
     include RspecHelpers
     include RubyVersionHelpers

data/spec/support/acceptance/helpers/command_helpers.rb

@@ -20,11 +20,8 @@ module AcceptanceTests
       end
     end
 
-    def run_command_within_bundle(*args)
+    def run_command_isolated_from_bundle(*args)
       run_command(*args) do |runner|
-        runner.command_prefix = 'bundle exec'
-        runner.env['BUNDLE_GEMFILE'] = fs.find_in_project('Gemfile').to_s
-
         runner.around_command do |run_command|
           Bundler.with_clean_env(&run_command)
         end
@@ -33,6 +30,22 @@ module AcceptanceTests
       end
     end
 
+    def run_command_isolated_from_bundle!(*args)
+      run_command_isolated_from_bundle(*args) do |runner|
+        runner.run_successfully = true
+        yield runner if block_given?
+      end
+    end
+
+    def run_command_within_bundle(*args)
+      run_command_isolated_from_bundle(*args) do |runner|
+        runner.command_prefix = 'bundle exec'
+        runner.env['BUNDLE_GEMFILE'] = fs.find_in_project('Gemfile').to_s
+
+        yield runner if block_given?
+      end
+    end
+
     def run_command_within_bundle!(*args)
       run_command_within_bundle(*args) do |runner|
         runner.run_successfully = true

data/spec/support/acceptance/helpers/rails_migration_helpers.rb

@@ -0,0 +1,21 @@
+require_relative 'gem_helpers'
+
+module AcceptanceTests
+  module RailsMigrationHelpers
+    include RailsVersionHelpers
+
+    def migration_class_name
+      if rails_version >= 5
+        "ActiveRecord::Migration[#{rails_version_for_migration}]"
+      else
+        'ActiveRecord::Migration'
+      end
+    end
+
+    private
+
+    def rails_version_for_migration
+      rails_version.to_s.split('.')[0..1].join('.')
+    end
+  end
+end

data/spec/support/acceptance/helpers/step_helpers.rb

@@ -20,7 +20,7 @@ module AcceptanceTests
     def create_generic_bundler_project
       fs.clean
       fs.create
-      run_command! 'bundle init'
+      run_command_isolated_from_bundle! 'bundle init'
     end
 
     def add_shoulda_matchers_to_project(options = {})

data/spec/support/tests/current_bundle.rb

@@ -32,18 +32,12 @@ EOT
       available_appraisals.sort.last
     end
 
-    private
-
     def available_appraisals
-      appraisals = []
-
-      Appraisal::File.each do |appraisal|
-        appraisals << appraisal.name
-      end
-
-      appraisals
+      Appraisal::AppraisalFile.each.map(&:name)
     end
 
+    private
+
     def current_appraisal
       if appraisal_in_use?
         File.basename(path, ".gemfile")

data/spec/support/tests/filesystem.rb

@@ -2,9 +2,9 @@ require 'fileutils'
 
 module Tests
   class Filesystem
-    PROJECT_NAME = 'test-project'
+    PROJECT_NAME = 'test-project'.freeze
     ROOT_DIRECTORY = Pathname.new('../../../..').expand_path(__FILE__)
-    TEMP_DIRECTORY = ROOT_DIRECTORY.join('tmp/acceptance')
+    TEMP_DIRECTORY = Pathname.new('/tmp/shoulda-matchers-acceptance')
     PROJECT_DIRECTORY = TEMP_DIRECTORY.join(PROJECT_NAME)
 
     def root_directory

data/spec/support/unit/attribute.rb

@@ -1,7 +1,5 @@
 module UnitTests
   class Attribute
-    attr_reader :name, :column_type, :column_options
-
     DEFAULT_COLUMN_TYPE = :string
     DEFAULT_COLUMN_OPTIONS = {
       null: false,

data/spec/support/unit/capture.rb

@@ -2,7 +2,9 @@ module Kernel
   # #capture, #silence_stream, and #silence_stderr are deprecated after Rails
   # 4.2 and will be removed in 5.0, so just override them completely here
 
-  undef_method :capture
+  if method_defined?(:capture)
+    undef_method :capture
+  end
 
   def capture(stream)
     stream = stream.to_s
@@ -20,7 +22,9 @@ module Kernel
     stream_io.reopen(origin_stream)
   end
 
-  undef_method :silence_stream
+  if method_defined?(:silence_stream)
+    undef_method :silence_stream
+  end
 
   def silence_stream(stream)
     old_stream = stream.dup
@@ -32,7 +36,9 @@ module Kernel
     old_stream.close
   end
 
-  undef_method :silence_stderr
+  if method_defined?(:silence_stderr)
+    undef_method :silence_stderr
+  end
 
   def silence_stderr
     silence_stream(STDERR) { yield }

data/spec/support/unit/helpers/action_pack_versions.rb

@@ -0,0 +1,22 @@
+module UnitTests
+  module ActionPackVersions
+    extend self
+
+    def self.configure_example_group(example_group)
+      example_group.include(self)
+      example_group.extend(self)
+    end
+
+    def action_pack_gte_5?
+      action_pack_version >= 5
+    end
+
+    def action_pack_lt_5?
+      action_pack_version < 5
+    end
+
+    def action_pack_version
+      Tests::Version.new(ActionPack::VERSION::STRING)
+    end
+  end
+end

data/spec/support/unit/helpers/active_model_versions.rb

@@ -21,6 +21,10 @@ module UnitTests
       ::ActiveModel::VERSION::MAJOR == 4
     end
 
+    def active_model_supports_absence_validation?
+      active_model_version >= 4
+    end
+
     def active_model_supports_strict?
       active_model_version >= 3.2
     end

data/spec/support/unit/helpers/active_record_versions.rb

@@ -9,16 +9,36 @@ module UnitTests
       Tests::Version.new(::ActiveRecord::VERSION::STRING)
     end
 
-    def active_record_supports_enum?
-      defined?(::ActiveRecord::Enum)
+    def active_record_enum_supports_prefix_and_suffix?
+      active_record_version >= 5
     end
 
     def active_record_supports_has_secure_password?
       active_record_version >= 3.1
     end
 
+    def active_record_supports_has_secure_token?
+      active_record_version >= 5.0
+    end
+
     def active_record_supports_array_columns?
       active_record_version > 4.2
     end
+
+    def active_record_supports_relations?
+      active_record_version >= 4
+    end
+
+    def active_record_supports_more_dependent_options?
+      active_record_version >= 4
+    end
+
+    def active_record_uniqueness_supports_array_columns?
+      active_record_version < 5
+    end
+
+    def active_record_supports_optional_for_associations?
+      active_record_version >= 5
+    end
   end
 end

data/spec/support/unit/helpers/active_resource_builder.rb

@@ -1,8 +1,8 @@
-require 'active_resource'
-
 module UnitTests
   module ActiveResourceBuilder
     def self.configure_example_group(example_group)
+      require 'active_resource'
+
       example_group.include ActiveResourceBuilder
 
       example_group.after do

data/spec/support/unit/helpers/controller_builder.rb

@@ -22,7 +22,7 @@ module UnitTests
     def build_fake_response(opts = {}, &block)
       action = opts[:action] || 'example'
       partial = opts[:partial] || '_partial'
-      block ||= lambda { render nothing: true }
+      block ||= lambda { head :ok }
       controller_class = define_controller('Examples') do
         layout false
         define_method(action, &block)

data/spec/support/unit/helpers/message_helpers.rb

@@ -0,0 +1,19 @@
+module UnitTests
+  module MessageHelpers
+    include Shoulda::Matchers::WordWrap
+
+    def self.configure_example_group(example_group)
+      example_group.include(self)
+    end
+
+    def format_message(message, one_line: false)
+      stripped_message = message.strip_heredoc.strip
+
+      if one_line
+        stripped_message.tr("\n", " ").squeeze(" ")
+      else
+        word_wrap(stripped_message)
+      end
+    end
+  end
+end

data/spec/support/unit/helpers/rails_versions.rb

@@ -1,5 +1,7 @@
 module UnitTests
   module RailsVersions
+    extend self
+
     def self.configure_example_group(example_group)
       example_group.include(self)
       example_group.extend(self)
@@ -17,6 +19,10 @@ module UnitTests
       rails_version =~ '~> 4.0'
     end
 
+    def rails_lte_4?
+      rails_version <= 4
+    end
+
     def rails_gte_4_1?
       rails_version >= 4.1
     end
@@ -24,5 +30,13 @@ module UnitTests
     def rails_gte_4_2?
       rails_version >= 4.2
     end
+
+    def rails_lt_5?
+      rails_version < 5
+    end
+
+    def rails_5_x?
+      rails_version =~ '~> 5.0'
+    end
   end
 end