shoulda-matchers 3.0.0.rc1 → 3.0.0

data/lib/shoulda/matchers/integrations/libraries/active_record.rb

@@ -10,7 +10,7 @@ module Shoulda
           include Integrations::Rails
 
           def integrate_with(test_framework)
-            test_framework.include(matchers_module)
+            test_framework.include(matchers_module, type: :model)
             include_into(ActiveSupport::TestCase, matchers_module)
           end
 

data/lib/shoulda/matchers/integrations/libraries/rails.rb

@@ -11,7 +11,8 @@ module Shoulda
           SUB_LIBRARIES = [
             :active_model,
             :active_record,
-            :action_controller
+            :action_controller,
+            :routing
           ]
 
           def integrate_with(test_framework)

data/lib/shoulda/matchers/integrations/libraries/routing.rb

@@ -0,0 +1,27 @@
+module Shoulda
+  module Matchers
+    module Integrations
+      module Libraries
+        # @private
+        class Routing
+          Integrations.register_library(self, :routing)
+
+          include Integrations::Inclusion
+          include Integrations::Rails
+
+          def integrate_with(test_framework)
+            test_framework.include(matchers_module, type: :routing)
+
+            include_into(::ActionController::TestCase, matchers_module)
+          end
+
+          private
+
+          def matchers_module
+            Shoulda::Matchers::Routing
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module Shoulda
           def validate!
           end
 
-          def include(*modules)
+          def include(*modules, **options)
             test_case_class.include(*modules)
           end
 

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

@@ -9,7 +9,7 @@ module Shoulda
           def validate!
           end
 
-          def include(*modules)
+          def include(*modules, **options)
             test_case_class.class_eval do
               include(*modules)
               extend(*modules)

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

@@ -10,7 +10,7 @@ module Shoulda
           def validate!
           end
 
-          def include(*modules)
+          def include(*modules, **options)
             test_case_class.class_eval do
               include(*modules)
               extend(*modules)

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

@@ -23,7 +23,7 @@ end
 EOT
           end
 
-          def include(*modules)
+          def include(*modules, **options)
           end
 
           def n_unit?

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

@@ -9,9 +9,9 @@ module Shoulda
           def validate!
           end
 
-          def include(*modules)
+          def include(*modules, **options)
             ::RSpec.configure do |config|
-              config.include(*modules)
+              config.include(*modules, **options)
             end
           end
 

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

@@ -9,7 +9,7 @@ module Shoulda
           def validate!
           end
 
-          def include(*modules)
+          def include(*modules, **options)
             test_case_class.class_eval do
               include(*modules)
               extend(*modules)

data/lib/shoulda/matchers/routing.rb

@@ -0,0 +1,10 @@
+module Shoulda
+  module Matchers
+    # @private
+    module Routing
+      def route(method, path)
+        ActionController::RouteMatcher.new(method, path, self)
+      end
+    end
+  end
+end

data/lib/shoulda/matchers/version.rb

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

data/script/SUPPORTED_VERSIONS

@@ -1 +1 @@
-2.0.0 2.1.5
+2.0.0 2.1.6 2.2.3

data/spec/acceptance/independent_matchers_spec.rb

@@ -1,64 +1,125 @@
 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 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: [default_test_framework],
-          manually: true
-        )
+describe 'shoulda-matchers has independent matchers, specifically delegate_method' 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: [default_test_framework],
+        manually: true
+      )
+    end
+
+    write_file 'lib/post_office.rb', <<-FILE
+      class PostOffice
       end
+    FILE
+
+    write_file 'lib/courier.rb', <<-FILE
+      require 'forwardable'
 
-      write_file 'lib/post_office.rb', <<-FILE
-        class PostOffice
+      class Courier
+        extend Forwardable
+
+        def_delegators :post_office, :deliver
+
+        attr_reader :post_office
+
+        def initialize(post_office)
+          @post_office = post_office
+        end
+      end
+    FILE
+
+    write_n_unit_test 'test/courier_test.rb' do |test_case_superclass|
+      <<-FILE
+        require 'test_helper'
+        require 'courier'
+        require 'post_office'
+
+        class CourierTest < #{test_case_superclass}
+          subject { Courier.new(post_office) }
+
+          should delegate_method(:deliver).to(:post_office)
+
+          def post_office
+            PostOffice.new
+          end
         end
       FILE
+    end
 
-      write_file 'lib/courier.rb', <<-FILE
-        require 'forwardable'
+    result = run_n_unit_tests('test/courier_test.rb')
 
-        class Courier
-          extend Forwardable
+    expect(result).to indicate_number_of_tests_was_run(1)
+    expect(result).to have_output(
+      'Courier should delegate #deliver to #post_office object'
+    )
+  end
 
-          def_delegators :post_office, :deliver
+  specify 'and integrates with a Ruby application that uses RSpec' do
+    create_generic_bundler_project
 
-          attr_reader :post_office
+    updating_bundle do
+      add_rspec_to_project
+      add_shoulda_matchers_to_project(
+        manually: true,
+        with_configuration: false
+      )
+      write_file 'spec/spec_helper.rb', <<-FILE
+        require 'shoulda/matchers/independent'
 
-          def initialize(post_office)
-            @post_office = post_office
-          end
+        RSpec.configure do |config|
+          config.include(Shoulda::Matchers::Independent)
         end
       FILE
+    end
+
+    write_file 'lib/post_office.rb', <<-FILE
+      class PostOffice
+      end
+    FILE
 
-      write_n_unit_test 'test/courier_test.rb' do |test_case_superclass|
-        <<-FILE
-          require 'test_helper'
-          require 'courier'
-          require 'post_office'
+    write_file 'lib/courier.rb', <<-FILE
+      require 'forwardable'
 
-          class CourierTest < #{test_case_superclass}
-            subject { Courier.new(post_office) }
+      class Courier
+        extend Forwardable
 
-            should delegate_method(:deliver).to(:post_office)
+        def_delegators :post_office, :deliver
 
-            def post_office
-              PostOffice.new
-            end
-          end
-        FILE
+        attr_reader :post_office
+
+        def initialize(post_office)
+          @post_office = post_office
+        end
       end
+    FILE
 
-      result = run_n_unit_tests('test/courier_test.rb')
+    write_file 'spec/courier_spec.rb', <<-FILE
+      require 'spec_helper'
+      require 'courier'
+      require 'post_office'
 
-      expect(result).to indicate_number_of_tests_was_run(1)
-      expect(result).to have_output(
-        'Courier should delegate #deliver to #post_office object'
-      )
-    end
+      describe Courier do
+        subject { Courier.new(post_office) }
+
+        it { should delegate_method(:deliver).to(:post_office) }
+
+        def post_office
+          PostOffice.new
+        end
+      end
+    FILE
+
+    result = run_rspec_tests('spec/courier_spec.rb')
+
+    expect(result).to indicate_number_of_tests_was_run(1)
+    expect(result).to have_output(
+      /Courier\s+should delegate #deliver to #post_office object/
+    )
   end
 end

data/spec/doublespeak_spec_helper.rb

@@ -1,4 +1,4 @@
-require 'shoulda-matchers'
+require 'shoulda/matchers/doublespeak'
 
 PROJECT_ROOT = File.expand_path('../..', __FILE__)
 $LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
@@ -10,5 +10,9 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
+  if config.files_to_run.one?
+    config.default_formatter = 'doc'
+  end
+
   config.mock_with :rspec
 end

data/spec/support/acceptance/adds_shoulda_matchers_to_project.rb

@@ -16,7 +16,10 @@ module AcceptanceTests
 
     def call
       add_gem 'shoulda-matchers', gem_options
-      configure_test_helper_files
+
+      unless options[:with_configuration] === false
+        configure_test_helper_files
+      end
     end
 
     protected
@@ -48,8 +51,10 @@ module AcceptanceTests
     def each_test_helper_file
       options[:test_frameworks].each do |test_framework|
         libraries = options.fetch(:libraries, [])
-        test_helper_file = test_helper_file_for(test_framework, libraries)
-        yield test_helper_file, test_framework, libraries
+
+        test_helper_files_for(test_framework, libraries).each do |test_helper_file|
+          yield test_helper_file, test_framework, libraries
+        end
       end
     end
 
@@ -85,16 +90,26 @@ module AcceptanceTests
       libraries.map { |library| "with.library :#{library}" }.join("\n")
     end
 
-    def test_helper_file_for(test_framework, libraries)
-      if integrates_with_rails?(test_framework, libraries) ||
-        integrates_with_nunit?(test_framework)
-        'test/test_helper.rb'
-      elsif integrates_with_rspec?(test_framework)
-        spec_helper_file_path
+    def test_helper_files_for(test_framework, libraries)
+      files = []
+
+      if integrates_with_nunit_and_rails?(test_framework, libraries) ||
+        integrates_with_nunit_only?(test_framework)
+        files << 'test/test_helper.rb'
       end
+
+      if integrates_with_rspec?(test_framework)
+        if bundle.includes?('rspec-rails')
+          files << 'spec/rails_helper.rb'
+        else
+          files << 'spec/spec_helper.rb'
+        end
+      end
+
+      files
     end
 
-    def integrates_with_nunit?(test_framework)
+    def integrates_with_nunit_only?(test_framework)
       nunit_frameworks = [:test_unit, :minitest, :minitest_4, :minitest_5]
       nunit_frameworks.include?(test_framework)
     end
@@ -103,8 +118,16 @@ module AcceptanceTests
       test_framework == :rspec
     end
 
-    def integrates_with_rails?(test_framework, libraries)
+    def integrates_with_rspec_rails_3_x?(test_framework, libraries)
+      integrates_with_rails?(libraries) && rspec_rails_version >= 3
+    end
+
+    def integrates_with_nunit_and_rails?(test_framework, libraries)
       test_framework.nil? && libraries.include?(:rails)
     end
+
+    def integrates_with_rails?(libraries)
+      libraries.include?(:rails)
+    end
   end
 end

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

@@ -4,25 +4,21 @@ module AcceptanceTests
   module RspecHelpers
     include GemHelpers
 
-    def rspec_rails_version
-      bundle_version_of('rspec-rails')
+    def rspec_core_version
+      bundle_version_of('rspec-core')
     end
 
-    def add_rspec_file(path, content)
-      content = "require '#{spec_helper_require_path}'\n#{content}"
-      write_file path, content
+    def rspec_expectations_version
+      bundle_version_of('rspec-expectations')
     end
 
-    def spec_helper_require_path
-      if rspec_rails_version >= 3
-        'rails_helper'
-      else
-        'spec_helper'
-      end
+    def rspec_rails_version
+      bundle_version_of('rspec-rails')
     end
 
-    def spec_helper_file_path
-      "spec/#{spec_helper_require_path}.rb"
+    def add_rspec_file(path, content)
+      content = "require 'rails_helper'\n#{content}"
+      write_file path, content
     end
   end
 end

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

@@ -90,12 +90,25 @@ module AcceptanceTests
       FILE
     end
 
+    def add_rspec_to_project
+      add_gem 'rspec-core', rspec_core_version
+      add_gem 'rspec-expectations', rspec_expectations_version
+      append_to_file 'spec/spec_helper.rb', <<-FILE
+        require 'rspec/core'
+        require 'rspec/expectations'
+      FILE
+    end
+
     def add_rspec_rails_to_project!
       add_gem 'rspec-rails', rspec_rails_version
       run_command_within_bundle!('rails g rspec:install')
       remove_from_file '.rspec', '--warnings'
     end
 
+    def run_rspec_tests(*paths)
+      run_command_within_bundle 'rspec --format documentation --backtrace', *paths
+    end
+
     def run_rspec_suite
       run_rake_tasks('spec', env: { SPEC_OPTS: '-fd' })
     end