rspec-rails 2.14.0 → 2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d8abb1f01a347fd1b2a6ec73a1fa43744b8b721
-  data.tar.gz: 2217552c216c853b6cfb550680193da17b324269
+  metadata.gz: 4c053ac2d2a951f4774f401d7b068dece619f61e
+  data.tar.gz: a81a760b010b0d6af7e1ad35d6a35228936151e5
 SHA512:
-  metadata.gz: 303482e646eba42a2a8b5eb9a3d6634b769337b3a496db7b40098f0fb99f2dbc9ea05c53f7c12e97dc40dec8802ad69a100e8a26269fd3bd938ed0bac011b345
-  data.tar.gz: 8a4c7c39fe7817b538a3fb79c18cfe9852947c542a7f10b426a491968078f7a4afa6411e8c02f3840c38b7816db6204f10be7734d40fe798d5fe2590c8b71a86
+  metadata.gz: 53811242800f841314f83b633db928d3a98e566813dec259dcff79e1387f063a2d6bf93bb826ca74d2c4917464fffbdcf69408e6a929de35c5f424cf1715dcca
+  data.tar.gz: 60e09ccad88d509eb2b7e84b60511ada80418ad995a581d1bc4b18414330316b03fb2d709476d088709b2010db5060965d5827f69714821be690f8e1dd46b2c2

data/Changelog.md

@@ -1,3 +1,18 @@
+### 2.14.1 / 2013-12-29
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.14.0...v2.14.1)
+
+Bug fixes
+
+* Fixes "warning: instance variable @orig\_routes not initialized" raised by
+  controller specs when `--warnings` are enabled. (Andy Lindeman)
+* Where possible, check against the version of ActiveRecord, rather than
+  Rails. It is possible to use some of rspec-rails without all of Rails.
+  (Darryl Pogue)
+* Supports Rails 4.1 and Minitest 5. (Patrick Van Stee, Andy Lindeman)
+* Explicitly depends on `activemodel`. This allows libraries that do not bring
+  in all of `rails` to use `rspec-rails`. (John Firebaugh)
+* Use `__send__` rather than `send` to prevent naming collisions (Bradley Schaefer)
+
 ### 2.14.0 / 2013-07-06
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.14.0.rc1...v2.14.0)
 

data/features/matchers/relation_match_array.feature

@@ -11,7 +11,12 @@ Feature: ActiveRecord::Relation match array
 
       describe Widget do
         let!(:widgets) { Array.new(3) { Widget.create } }
-        subject { Widget.scoped }
+
+        if ::Rails::VERSION::STRING >= '4'
+          subject { Widget.all }
+        else
+          subject { Widget.scoped }
+        end
 
         it "returns all widgets in any order" do
           expect(subject).to match_array(widgets)

data/features/model_specs/errors_on.feature

@@ -10,7 +10,7 @@ Feature: errors_on
         validates_presence_of :name
 
         # In Rails 4, mass assignment protection is implemented on controllers
-        attr_accessible :name if ::Rails::VERSION::STRING < '4'
+        attr_accessible :name if ::ActiveRecord::VERSION::STRING < '4'
 
         validates_length_of :name, :minimum => 10, :on => :publication
       end

data/features/support/rubinius.rb

@@ -0,0 +1,6 @@
+# Required until https://github.com/rubinius/rubinius/issues/2430 is resolved
+ENV['RBXOPT'] = "#{ENV["RBXOPT"]} -Xcompiler.no_rbc"
+
+Around "@unsupported-on-rbx" do |scenario, block|
+  block.call unless defined?(Rubinius)
+end

data/lib/rspec/rails/adapters.rb

@@ -1,14 +1,29 @@
 require 'delegate'
 require 'active_support/concern'
-require 'test/unit/assertions'
 
 module RSpec
   module Rails
+    if ::Rails::VERSION::STRING >= '4.1.0'
+      gem 'minitest'
+      require 'minitest/assertions'
+      Assertions = Minitest::Assertions
+    else
+      begin
+        require 'test/unit/assertions'
+      rescue LoadError
+        # work around for Rubinius not having a std std-lib
+        require 'rubysl-test-unit' if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+        require 'test/unit/assertions'
+      end
+      Assertions = Test::Unit::Assertions
+    end
+
+    # @api private
     class AssertionDelegator < Module
       # @api private
       def initialize(*assertion_modules)
         assertion_class = Class.new(SimpleDelegator) do
-          include Test::Unit::Assertions
+          include ::RSpec::Rails::Assertions
           include ::RSpec::Rails::MinitestCounters
           assertion_modules.each { |mod| include mod }
         end
@@ -38,8 +53,10 @@ module RSpec
       end
     end
 
-    # MiniTest::Unit::LifecycleHooks
-    module MiniTestLifecycleAdapter
+    # Adapts example groups for `Minitest::Test::LifecycleHooks`
+    #
+    # @api private
+    module MinitestLifecycleAdapter
       extend ActiveSupport::Concern
 
       included do |group|
@@ -79,6 +96,7 @@ module RSpec
       end
     end
 
+    # @api private
     module SetupAndTeardownAdapter
       extend ActiveSupport::Concern
 
@@ -89,10 +107,10 @@ module RSpec
         # hooks.
         def setup(*methods)
           methods.each do |method|
-            if method.to_s =~ /^setup_(fixtures|controller_request_and_response)$/
-              prepend_before { send method }
+            if method.to_s =~ /^setup_(with_controller|fixtures|controller_request_and_response)$/
+              prepend_before { __send__ method }
             else
-              before         { send method }
+              before         { __send__ method }
             end
           end
         end
@@ -102,7 +120,7 @@ module RSpec
         # Wraps `teardown` calls from within Rails' testing framework in
         # `after` hooks.
         def teardown(*methods)
-          methods.each { |method| after { send method } }
+          methods.each { |method| after { __send__ method } }
         end
       end
 
@@ -112,7 +130,8 @@ module RSpec
       end
     end
 
-    module TestUnitAssertionAdapter
+    # @private
+    module MinitestAssertionAdapter
       extend ActiveSupport::Concern
 
       module ClassMethods
@@ -122,7 +141,7 @@ module RSpec
         # examples without exposing non-assertion methods in Test::Unit or
         # Minitest.
         def assertion_method_names
-          Test::Unit::Assertions.public_instance_methods.select{|m| m.to_s =~ /^(assert|flunk)/} +
+          ::RSpec::Rails::Assertions.public_instance_methods.select{|m| m.to_s =~ /^(assert|flunk|refute)/} +
             [:build_message]
         end
 
@@ -138,8 +157,9 @@ module RSpec
         end
       end
 
+      # @api private
       class AssertionDelegator
-        include Test::Unit::Assertions
+        include ::RSpec::Rails::Assertions
         include ::RSpec::Rails::MinitestCounters
       end
 
@@ -152,5 +172,11 @@ module RSpec
         define_assertion_delegators
       end
     end
+
+    # Backwards compatibility. It's unlikely that anyone is using this
+    # constant, but we had forgotten to mark it as `@private` earlier
+    #
+    # @api private
+    TestUnitAssertionAdapter = MinitestAssertionAdapter
   end
 end

data/lib/rspec/rails/example/controller_example_group.rb

@@ -135,7 +135,7 @@ module RSpec::Rails
     def method_missing(method, *args, &block)
       if @routes && @routes.named_routes.helpers.include?(method)
         controller.send(method, *args, &block)
-      elsif @orig_routes && @orig_routes.named_routes.helpers.include?(method)
+      elsif defined?(@orig_routes) && @orig_routes && @orig_routes.named_routes.helpers.include?(method)
         controller.send(method, *args, &block)
       else
         super

data/lib/rspec/rails/example/rails_example_group.rb

@@ -7,8 +7,8 @@ module RSpec
     module RailsExampleGroup
       extend ActiveSupport::Concern
       include RSpec::Rails::SetupAndTeardownAdapter
-      include RSpec::Rails::MiniTestLifecycleAdapter if ::Rails::VERSION::STRING >= '4'
-      include RSpec::Rails::TestUnitAssertionAdapter
+      include RSpec::Rails::MinitestLifecycleAdapter if ::Rails::VERSION::STRING >= '4'
+      include RSpec::Rails::MinitestAssertionAdapter
       include RSpec::Rails::Matchers
     end
   end

data/lib/rspec/rails/example/view_example_group.rb

@@ -156,6 +156,9 @@ module RSpec::Rails
           view.lookup_context.prefixes << _controller_path
         end
 
+        # fixes bug with differing formats
+        view.lookup_context.view_paths.each(&:clear_cache)
+
         controller.controller_path = _controller_path
         controller.request.path_parameters[:controller] = _controller_path
         controller.request.path_parameters[:action]     = _inferred_action unless _inferred_action =~ /^_/

data/lib/rspec/rails/extensions/active_record/base.rb

@@ -3,14 +3,14 @@ module RSpec
     if defined?(ActiveRecord)
       module Extensions
         module ActiveRecord
-          # Extension to enhance `should have` on AR Model classes
+          # Extension to enhance `to have` on AR Model classes
           #
           # @example
           #
           #     ModelClass.should have(:no).records
           #     ModelClass.should have(1).record
           #     ModelClass.should have(n).records
-          if ::Rails::VERSION::STRING >= '4'
+          if ::ActiveRecord::VERSION::STRING >= '4'
             def records
               all.to_a
             end
@@ -32,7 +32,7 @@ end
 
 if defined?(::ActiveModel)
   module ::ActiveModel::Validations
-    # Extension to enhance `should have` on AR Model instances.  Calls
+    # Extension to enhance `to have` on AR Model instances.  Calls
     # model.valid? in order to prepare the object's errors object. Accepts
     # a :context option to specify the validation context.
     #
@@ -40,12 +40,12 @@ if defined?(::ActiveModel)
     #
     # @example
     #
-    #     model.should have(:no).errors_on(:attribute)
-    #     model.should have(1).error_on(:attribute)
-    #     model.should have(n).errors_on(:attribute)
-    #     model.should have(n).errors_on(:attribute, :context => :create)
+    #     expect(model).to have(:no).errors_on(:attribute)
+    #     expect(model).to have(1).error_on(:attribute)
+    #     expect(model).to have(n).errors_on(:attribute)
+    #     expect(model).to have(n).errors_on(:attribute, :context => :create)
     #
-    #     model.errors_on(:attribute).should include("can't be blank")
+    #     expect(model.errors_on(:attribute)).to include("can't be blank")
     def errors_on(attribute, options = {})
       valid_args = [options[:context]].compact
       self.valid?(*valid_args)

data/lib/rspec/rails/fixture_support.rb

@@ -4,8 +4,8 @@ module RSpec
       module FixtureSupport
         extend ActiveSupport::Concern
         include RSpec::Rails::SetupAndTeardownAdapter
-        include RSpec::Rails::MiniTestLifecycleAdapter if ::Rails::VERSION::STRING > '4'
-        include RSpec::Rails::TestUnitAssertionAdapter
+        include RSpec::Rails::MinitestLifecycleAdapter if ::ActiveRecord::VERSION::STRING > '4'
+        include RSpec::Rails::MinitestAssertionAdapter
         include ActiveRecord::TestFixtures
 
         included do

data/lib/rspec/rails/mocks.rb

@@ -29,6 +29,19 @@ module RSpec
         end
       end
 
+      # Starting with Rails 4.1, ActiveRecord associations are inversible
+      # by default. This class represents an association from the mocked
+      # model's perspective.
+      #
+      # @private
+      class Association
+        attr_accessor :target, :inversed
+
+        def initialize(association_name)
+          @association_name = association_name
+        end
+      end
+
       module ActiveRecordInstanceMethods
         # Stubs `persisted?` to return `false` and `id` to return `nil`.
         def destroy
@@ -45,6 +58,13 @@ module RSpec
         def new_record?
           !persisted?
         end
+
+        # Returns an object representing an association from the mocked
+        # model's perspective. For use by Rails internally only.
+        def association(association_name)
+          @associations ||= Hash.new { |h, k| h[k] = Association.new(k) }
+          @associations[association_name]
+        end
       end
 
       # Creates a test double representing `string_or_model_class` with common

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Rails
     module Version
-      STRING = '2.14.0'
+      STRING = '2.14.1'
     end
   end
 end

data/spec/rspec/rails/assertion_adapter_spec.rb

@@ -1,9 +1,9 @@
 require "spec_helper"
 
-describe RSpec::Rails::TestUnitAssertionAdapter do
-  include RSpec::Rails::TestUnitAssertionAdapter
+describe RSpec::Rails::MinitestAssertionAdapter do
+  include RSpec::Rails::MinitestAssertionAdapter
 
-  Test::Unit::Assertions.public_instance_methods.select{|m| m.to_s =~ /^(assert|flunk)/}.each do |m|
+  RSpec::Rails::Assertions.public_instance_methods.select{|m| m.to_s =~ /^(assert|flunk|refute)/}.each do |m|
     if m.to_s == "assert_equal"
       it "exposes #{m} to host examples" do
         assert_equal 3,3
@@ -18,11 +18,11 @@ describe RSpec::Rails::TestUnitAssertionAdapter do
     end
   end
 
-  it "does not expose internal methods of MiniTest" do
+  it "does not expose internal methods of Minitest" do
     methods.should_not include("_assertions")
   end
 
-  it "does not expose MiniTest's message method" do
+  it "does not expose Minitest's message method" do
     methods.should_not include("message")
   end
 end

data/spec/rspec/rails/assertion_delegator_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe RSpec::Rails::AssertionDelegator do
   it "provides a module that delegates assertion methods to an isolated class" do
     klass = Class.new {
-      include RSpec::Rails::AssertionDelegator.new(Test::Unit::Assertions)
+      include RSpec::Rails::AssertionDelegator.new(RSpec::Rails::Assertions)
     }
 
     expect(klass.new).to respond_to(:assert)

data/spec/rspec/rails/example/view_example_group_spec.rb

@@ -194,6 +194,21 @@ module RSpec::Rails
         view_spec.stub(:_view) { view }
         view_spec.view.should == view
       end
+
+      it 'is accessible to hooks' do
+        with_isolated_config do
+          run_count = 0
+          RSpec.configuration.before(:each, :type => :view) do
+            allow(view).to receive(:a_stubbed_helper) { :value }
+            run_count += 1
+          end
+          group = RSpec::Core::ExampleGroup.describe 'a view', :type => :view do
+            specify { true }
+          end
+          group.run NullObject.new
+          expect(run_count).to eq 1
+        end
+      end
     end
 
     describe "#template" do

data/spec/rspec/rails/minitest_lifecycle_adapter_spec.rb

@@ -1,10 +1,10 @@
 require "spec_helper"
 
-describe RSpec::Rails::MiniTestLifecycleAdapter do
+describe RSpec::Rails::MinitestLifecycleAdapter do
   it "invokes minitest lifecycle hooks at the appropriate times" do
     invocations = []
-    example_group = RSpec::Core::ExampleGroup.describe("MiniTestHooks") do
-      include RSpec::Rails::MiniTestLifecycleAdapter
+    example_group = RSpec::Core::ExampleGroup.describe("MinitestHooks") do
+      include RSpec::Rails::MinitestLifecycleAdapter
 
       define_method(:before_setup)    { invocations << :before_setup }
       define_method(:after_setup)     { invocations << :after_setup }
@@ -19,4 +19,13 @@ describe RSpec::Rails::MiniTestLifecycleAdapter do
       :before_setup, :after_setup, :example, :before_teardown, :after_teardown
     ])
   end
+
+  it "allows let variables named 'send'" do
+    run_result = ::RSpec::Core::ExampleGroup.describe do
+      let(:send) { "WHAT" }
+      specify { expect(send).to eq "WHAT" }
+    end.run NullObject.new
+
+    expect(run_result).to be true
+  end
 end

data/spec/rspec/rails/mocks/mock_model_spec.rb

@@ -54,6 +54,29 @@ describe "mock_model(RealModel)" do
     end
   end
 
+  describe "association" do
+    it "constructs a mock association object" do
+      model = mock_model(MockableModel)
+      expect(model.association(:association_name)).to be
+    end
+
+    it "returns a different association object for each association name" do
+      model = mock_model(MockableModel)
+      posts = model.association(:posts)
+      authors = model.association(:authors)
+
+      expect(posts).not_to equal(authors)
+    end
+
+    it "returns the same association model each time for the same association name" do
+      model = mock_model(MockableModel)
+      posts1 = model.association(:posts)
+      posts2 = model.association(:posts)
+
+      expect(posts1).to equal(posts2)
+    end
+  end
+
   describe "errors" do
     context "default" do
       it "is empty" do
@@ -360,9 +383,8 @@ describe "mock_model(RealModel)" do
   end
 
   describe "ActiveModel Lint tests" do
-    require 'test/unit/assertions'
     require 'active_model/lint'
-    include RSpec::Rails::TestUnitAssertionAdapter
+    include RSpec::Rails::MinitestAssertionAdapter
     include ActiveModel::Lint::Tests
 
     # to_s is to support ruby-1.9

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'rails/all'
 
 module RSpecRails
   class Application < ::Rails::Application
+    self.config.secret_key_base = 'ASecretString' if config.respond_to? :secret_key_base
   end
 end
 

data/spec/support/helpers.rb

@@ -16,5 +16,19 @@ module Helpers
     m
   end
 
+  def with_isolated_config
+    original_config = RSpec.configuration
+    RSpec.configuration = RSpec::Core::Configuration.new
+    RSpec.configure do |c|
+      c.include RSpec::Rails::FixtureSupport
+      c.add_setting :use_transactional_fixtures, :alias_with => :use_transactional_examples
+      c.add_setting :use_instantiated_fixtures
+      c.add_setting :global_fixtures
+      c.add_setting :fixture_path
+    end
+    yield
+    RSpec.configuration = original_config
+  end
+
   RSpec.configure {|c| c.include self}
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.1
 platform: ruby
 authors:
 - David Chelimsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +128,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +154,16 @@ dependencies:
   name: ZenTest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.9.5
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -292,6 +306,7 @@ files:
 - features/step_definitions/model_steps.rb
 - features/support/env.rb
 - features/support/rails_versions.rb
+- features/support/rubinius.rb
 - features/view_specs/inferred_controller_path.feature
 - features/view_specs/stub_template.feature
 - features/view_specs/view_spec.feature
@@ -361,10 +376,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: rspec-rails-2.14.0
+summary: rspec-rails-2.14.1
 test_files:
 - features/Autotest.md
 - features/Generators.md
@@ -405,6 +420,7 @@ test_files:
 - features/step_definitions/model_steps.rb
 - features/support/env.rb
 - features/support/rails_versions.rb
+- features/support/rubinius.rb
 - features/view_specs/inferred_controller_path.feature
 - features/view_specs/stub_template.feature
 - features/view_specs/view_spec.feature