shoulda-matchers 2.8.0 → 3.0.0.rc1

data/lib/shoulda/matchers/integrations/registry.rb

@@ -0,0 +1,28 @@
+module Shoulda
+  module Matchers
+    module Integrations
+      # @private
+      class Registry
+        def register(klass, name)
+          registry[name] = klass
+        end
+
+        def find!(name)
+          find_class!(name).new
+        end
+
+        private
+
+        def registry
+          @_registry ||= {}
+        end
+
+        def find_class!(name)
+          registry.fetch(name) do
+            raise ArgumentError, "'#{name}' is not registered"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shoulda/matchers/integrations/test_frameworks.rb

@@ -0,0 +1,16 @@
+require 'shoulda/matchers/integrations/test_frameworks/active_support_test_case'
+require 'shoulda/matchers/integrations/test_frameworks/minitest_4'
+require 'shoulda/matchers/integrations/test_frameworks/minitest_5'
+require 'shoulda/matchers/integrations/test_frameworks/missing_test_framework'
+require 'shoulda/matchers/integrations/test_frameworks/rspec'
+require 'shoulda/matchers/integrations/test_frameworks/test_unit'
+
+module Shoulda
+  module Matchers
+    module Integrations
+      # @private
+      module TestFrameworks
+      end
+    end
+  end
+end

data/lib/shoulda/matchers/integrations/test_frameworks/active_support_test_case.rb

@@ -0,0 +1,37 @@
+module Shoulda
+  module Matchers
+    module Integrations
+      module TestFrameworks
+        # @private
+        class ActiveSupportTestCase
+          Integrations.register_test_framework(self, :active_support_test_case)
+
+          def validate!
+          end
+
+          def include(*modules)
+            test_case_class.include(*modules)
+          end
+
+          def n_unit?
+            true
+          end
+
+          def present?
+            true
+          end
+
+          protected
+
+          attr_reader :configuration
+
+          private
+
+          def test_case_class
+            ActiveSupport::TestCase
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shoulda/matchers/integrations/test_frameworks/minitest_4.rb

@@ -0,0 +1,36 @@
+module Shoulda
+  module Matchers
+    module Integrations
+      module TestFrameworks
+        # @private
+        class Minitest4
+          Integrations.register_test_framework(self, :minitest_4)
+
+          def validate!
+          end
+
+          def include(*modules)
+            test_case_class.class_eval do
+              include(*modules)
+              extend(*modules)
+            end
+          end
+
+          def n_unit?
+            true
+          end
+
+          def present?
+            true
+          end
+
+          private
+
+          def test_case_class
+            MiniTest::Unit::TestCase
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shoulda/matchers/integrations/test_frameworks/minitest_5.rb

@@ -0,0 +1,37 @@
+module Shoulda
+  module Matchers
+    module Integrations
+      module TestFrameworks
+        # @private
+        class Minitest5
+          Integrations.register_test_framework(self, :minitest_5)
+          Integrations.register_test_framework(self, :minitest)
+
+          def validate!
+          end
+
+          def include(*modules)
+            test_case_class.class_eval do
+              include(*modules)
+              extend(*modules)
+            end
+          end
+
+          def n_unit?
+            true
+          end
+
+          def present?
+            true
+          end
+
+          private
+
+          def test_case_class
+            Minitest::Test
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shoulda/matchers/integrations/test_frameworks/missing_test_framework.rb

@@ -0,0 +1,40 @@
+module Shoulda
+  module Matchers
+    module Integrations
+      module TestFrameworks
+        # @private
+        class MissingTestFramework
+          Integrations.register_test_framework(self, :missing_test_framework)
+
+          def validate!
+            raise TestFrameworkNotConfigured, <<-EOT
+You need to set a test framework. Please add the following to your
+test helper:
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    # Choose one:
+    with.test_framework :rspec
+    with.test_framework :minitest    # or, :minitest_5
+    with.test_framework :minitest_4
+    with.test_framework :test_unit
+  end
+end
+EOT
+          end
+
+          def include(*modules)
+          end
+
+          def n_unit?
+            false
+          end
+
+          def present?
+            false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shoulda/matchers/integrations/test_frameworks/rspec.rb

@@ -0,0 +1,29 @@
+module Shoulda
+  module Matchers
+    module Integrations
+      module TestFrameworks
+        # @private
+        class Rspec
+          Integrations.register_test_framework(self, :rspec)
+
+          def validate!
+          end
+
+          def include(*modules)
+            ::RSpec.configure do |config|
+              config.include(*modules)
+            end
+          end
+
+          def n_unit?
+            false
+          end
+
+          def present?
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shoulda/matchers/integrations/test_frameworks/test_unit.rb

@@ -0,0 +1,36 @@
+module Shoulda
+  module Matchers
+    module Integrations
+      module TestFrameworks
+        # @private
+        class TestUnit
+          Integrations.register_test_framework(self, :test_unit)
+
+          def validate!
+          end
+
+          def include(*modules)
+            test_case_class.class_eval do
+              include(*modules)
+              extend(*modules)
+            end
+          end
+
+          def n_unit?
+            true
+          end
+
+          def present?
+            true
+          end
+
+          private
+
+          def test_case_class
+            ::Test::Unit::TestCase
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shoulda/matchers/rails_shim.rb

@@ -2,38 +2,6 @@ module Shoulda
   module Matchers
     # @private
     class RailsShim
-      def self.layouts_ivar
-        if action_pack_major_version >= 4
-          '@_layouts'
-        else
-          '@layouts'
-        end
-      end
-
-      def self.flashes_ivar
-        if action_pack_major_version >= 4
-          :@flashes
-        else
-          :@used
-        end
-      end
-
-      def self.clean_scope(klass)
-        if active_record_major_version == 4
-          klass.all
-        else
-          klass.scoped
-        end
-      end
-
-      def self.validates_confirmation_of_error_attribute(matcher)
-        if active_model_major_version == 4
-          matcher.confirmation_attribute
-        else
-          matcher.attribute
-        end
-      end
-
       def self.verb_for_update
         if action_pack_gte_4_1?
           :patch
@@ -91,14 +59,6 @@ module Shoulda
         ::ActiveRecord::VERSION::MAJOR
       end
 
-      def self.active_model_major_version
-        ::ActiveModel::VERSION::MAJOR
-      end
-
-      def self.action_pack_major_version
-        ::ActionPack::VERSION::MAJOR
-      end
-
       def self.action_pack_gte_4_1?
         Gem::Requirement.new('>= 4.1').satisfied_by?(action_pack_version)
       end

data/lib/shoulda/matchers/version.rb

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

data/script/SUPPORTED_VERSIONS

@@ -1 +1 @@
-1.9.2 1.9.3 2.0.0 2.1.5
+2.0.0 2.1.5

data/script/update_gems_in_all_appraisals

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+SUPPORTED_VERSIONS=$(<script/SUPPORTED_VERSIONS)
+
+update-gems-for-version() {
+  local version="$1"
+  (export RBENV_VERSION=$version; bundle update "${@:2}" && bundle exec appraisal update "${@:2}")
+}
+
+for version in $SUPPORTED_VERSIONS; do
+  echo
+  echo "*** Updating gems for $version ***"
+  update-gems-for-version "$version" "$@"
+done

data/shoulda-matchers.gemspec

@@ -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 = '>= 1.9.2'
-  s.add_dependency('activesupport', '>= 3.0.0')
+  s.required_ruby_version = '>= 2.0.0'
+  s.add_dependency('activesupport', '>= 4.0.0')
 end

data/spec/acceptance/active_model_integration_spec.rb

@@ -4,7 +4,10 @@ describe 'shoulda-matchers integrates with an ActiveModel project' do
   specify 'and loads without errors' do
     create_active_model_project
 
-    add_shoulda_matchers_to_project
+    add_shoulda_matchers_to_project(
+      test_frameworks: [:rspec],
+      libraries: [:active_model]
+    )
 
     write_file 'load_dependencies.rb', <<-FILE
       require 'active_model'

data/spec/acceptance/independent_matchers_spec.rb

@@ -2,14 +2,14 @@ require 'acceptance_spec_helper'
 
 describe 'shoulda-matchers has independent matchers' do
   context 'specifically delegate_method' do
-    specify 'and integrates with a Ruby application that uses Minitest' do
+    specify 'and integrates with a Ruby application that uses the default test framework' do
       create_generic_bundler_project
 
       updating_bundle do
         add_minitest_to_project
         add_shoulda_context_to_project(manually: true)
         add_shoulda_matchers_to_project(
-          test_frameworks: [:n_unit],
+          test_frameworks: [default_test_framework],
           manually: true
         )
       end
@@ -35,11 +35,11 @@ describe 'shoulda-matchers has independent matchers' do
         end
       FILE
 
-      write_minitest_test 'test/courier_test.rb' do |test_case_superclass|
+      write_n_unit_test 'test/courier_test.rb' do |test_case_superclass|
         <<-FILE
-          require "test_helper"
-          require "courier"
-          require "post_office"
+          require 'test_helper'
+          require 'courier'
+          require 'post_office'
 
           class CourierTest < #{test_case_superclass}
             subject { Courier.new(post_office) }

data/spec/acceptance/multiple_libraries_integration_spec.rb

@@ -0,0 +1,52 @@
+require 'acceptance_spec_helper'
+
+describe 'shoulda-matchers integrates with multiple libraries' do
+  before do
+    create_rails_application
+
+    write_file 'db/migrate/1_create_users.rb', <<-FILE
+      class CreateUsers < ActiveRecord::Migration
+        def self.up
+          create_table :users do |t|
+            t.string :name
+          end
+        end
+      end
+    FILE
+
+    run_rake_tasks!(*%w(db:drop db:create db:migrate))
+
+    write_file 'app/models/user.rb', <<-FILE
+      class User < ActiveRecord::Base
+        validates_presence_of :name
+        validates_uniqueness_of :name
+      end
+    FILE
+
+    add_rspec_file 'spec/models/user_spec.rb', <<-FILE
+      describe User do
+        it { should validate_presence_of(:name) }
+        it { should validate_uniqueness_of(:name) }
+      end
+    FILE
+
+    updating_bundle do
+      add_rspec_rails_to_project!
+      add_shoulda_matchers_to_project(
+        test_frameworks: [:rspec],
+        libraries: [:active_record, :active_model]
+      )
+    end
+  end
+
+  context 'when using both active_record and active_model libraries' do
+    it 'allows the use of matchers from both libraries' do
+      result = run_rspec_suite
+      expect(result).to have_output('2 examples, 0 failures')
+      expect(result).to have_output('should require name to be set')
+      expect(result).to have_output(
+        'should require case sensitive unique value for name'
+      )
+    end
+  end
+end