rspec-rails 2.99.0.beta1 → 2.99.0.beta2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzMxYzE1NGZhMDdhYTFkNTc5Y2MyNTU1M2IxMWUyOGY1MzMwZTU5NA==
+    YzY3ODRlMWU4ZjJkNDI5NjU1M2NhZGM2ZTJjM2EyMGUzYjdkMDFhNA==
   data.tar.gz: !binary |-
-    ODA5YjFlY2UzYjk0YTNhNTkwMmE2ZTBhMDZjNWU5OGI4NTY3YzFmYQ==
+    ODJlYTA0ZTU4M2NlOWJhMzU1NDk3NjJhMDAzNDNjMTJlYjg1MzQyMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWQwNDc3ZjhkNzI2Zjc5YzU1YjJhOWRjMmJhNDJkODQ4YTE4MjBlMzY1YWE2
-    YzI5MjQ1ZjJjNDg2MDQyMzA5YTFhMTQ1OTE0ZDllOTYyMjliZmZhOTU2MDI0
-    MmQzNGUwNTZjZWM1NGViNzAxOGY4YjgxMTI1OTQ4OTZhN2FlMDk=
+    YWU5ZWVhNWFiYzdiZWY1ZWQ0OWYyMjEyZTIwOTJjZDIxODBjM2Q1ZTljMDg1
+    MTdhYzFjZjlhYjBhNjlmNTk1YTFkMGU1YTk0M2ZjM2NmMDE5NTNlOTI0MmQ3
+    OGVhMDRjZjRjNjI2NWJkZGY3YzU2Yjc3ZGI0NTM1YjFkYzU4MDQ=
   data.tar.gz: !binary |-
-    OWM4ZGMwODc0NTRlNDYwNjNmYWQ5MmM3ZTVmMTY3ODVjNjY4M2IzNGI4MTA4
-    N2E2MmU2OGE1NDZjYTZhYjU1ZDM1MjAxOTUwMmMxZGY4ODgxMGEwZmQzOGJh
-    MTBkZjBlNjYwOWVkN2JiOTFiZjMxNmQ4ODgxYTAyZWEyODkwNzY=
+    OGJjZTRhNWZjMWQyMGUzYzcyNzc5OTNjZWVkMTVjMDBjZWJmN2NjNjQ0NWJh
+    ZTk2M2M4MTVkNWJkMTliZDY2YWViODIwNDIwYzRlOTMzOTVmNjJjZTIzYTc3
+    Yjg4ZWFhZDY5OTEyZmE3N2Y0ZGVhMmIwYmQ3NmFmOTVhYmZmYmE=

data/Changelog.md

@@ -1,3 +1,21 @@
+### 2.99.0.beta2 / 2014-02-17
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.99.0.beta1...v2.99.0.beta2)
+
+Bug fixes
+
+* Use `__send__` rather than `send` to prevent naming collisions (Bradley Schaefer)
+* Supports Rails 4.1. (Andy Lindeman)
+* Loads ActiveSupport properly to support changes in Rails 4.1. (Andy Lindeman)
+* Anonymous controllers inherit from `ActionController::Base` if `ApplicationController`
+  is not present. (Jon Rowe)
+
+Deprecations
+
+* Deprecates the `--webrat` option to the scaffold and request spec generator (Andy Lindeman)
+* Deprecates the use of `Capybara::DSL` (e.g., `visit`) in controller specs.
+  It is more appropriate to use capybara in feature specs (`spec/features`)
+  instead. (Andy Lindeman)
+
 ### 2.99.0.beta1 / 2013-11-07
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.14.0...v2.99.0.beta1)
 

data/features/controller_specs/capybara.feature

@@ -0,0 +1,44 @@
+Feature: use of capybara in controller specs
+
+  In RSpec 2.x, capybara's DSL was automatically available in controller
+  specs. In RSpec 3.x, capybara is no longer available in controller specs
+  automatically.
+
+  To continue using capybara's DSL in controller specs, include
+  `Capybara::DSL` explicitly.
+
+  Scenario: Capybara::DSL methods are available, but raise deprecation warnings
+    Given a file named "spec/controllers/widgets_controller_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe WidgetsController do
+        describe "GET index" do
+          it "says 'Listing widgets'" do
+            expect(RSpec).to receive(:deprecate)
+            visit "/widgets"
+          end
+        end
+      end
+      """
+    When I run `rspec spec`
+    Then the examples should all pass
+
+  Scenario: include Capybara::DSL methods explicitly
+    Given a file named "spec/controllers/widgets_controller_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe WidgetsController do
+        include Capybara::DSL
+
+        describe "GET index" do
+          it "says 'Listing widgets'" do
+            expect(RSpec).not_to receive(:deprecate)
+            visit "/widgets"
+          end
+        end
+      end
+      """
+    When I run `rspec spec`
+    Then the examples should all pass

data/features/controller_specs/render_views.feature

@@ -71,7 +71,7 @@ Feature: render_views
         end
       end
       """
-    When I run `rspec spec --order default --format documentation`
+    When I run `rspec spec --order defined --format documentation`
     Then the output should contain:
       """ruby
       WidgetsController

data/lib/autotest/rails_rspec2.rb

@@ -25,6 +25,7 @@ rescue LoadError
 
   $:.push(*Dir["vendor/rails/*/lib"])
 
+  require 'active_support'
   require 'active_support/core_ext'
   require 'autotest/rspec2'
 

data/lib/generators/rspec/install/templates/spec/spec_helper.rb.tt

@@ -2,7 +2,6 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

data/lib/generators/rspec/integration/integration_generator.rb

@@ -10,15 +10,16 @@ module Rspec
       def generate_request_spec
         return unless options[:request_specs]
 
+        RSpec.deprecate("the --webrat-matchers option", :replacement => nil) if options[:webrat_matchers]
+        RSpec.deprecate("the --webrat option", :replacement => nil) if options[:webrat]
+
         template 'request_spec.rb',
                  File.join('spec/requests', class_path, "#{table_name}_spec.rb")
       end
 
     protected
 
-      # @deprecated Use `--webrat` instead.
       def webrat?
-        RSpec.deprecate("the --webrat-matchers option", :replacement => "--webrat") if options[:webrat_matchers]
         options[:webrat] || options[:webrat_matchers]
       end
 

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -22,6 +22,9 @@ module Rspec
       def generate_controller_spec
         return unless options[:controller_specs]
 
+        RSpec.deprecate("the --webrat-matchers option", :replacement => nil) if options[:webrat_matchers]
+        RSpec.deprecate("the --webrat option", :replacement => nil) if options[:webrat]
+
         template 'controller_spec.rb',
                  File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
       end
@@ -46,9 +49,7 @@ module Rspec
 
       protected
 
-        # @deprecated Use `--webrat` instead.
         def webrat?
-          RSpec.deprecate("--webrat-matchers", :replacement => "--webrat") if options[:webrat_matchers]
           options[:webrat] || options[:webrat_matchers]
         end
 

data/lib/rspec/rails/adapters.rb

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'active_support'
 require 'active_support/concern'
 
 module RSpec
@@ -8,7 +9,13 @@ module RSpec
       require 'minitest/assertions'
       Assertions = Minitest::Assertions
     else
-      require 'test/unit/assertions'
+      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
 
@@ -101,10 +108,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
@@ -114,7 +121,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
 

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

@@ -55,9 +55,10 @@ module RSpec::Rails
       #       # ....
       #     end
       def controller(base_class = nil, &body)
+        root_controller = defined?(ApplicationController) ? ApplicationController : ActionController::Base
         base_class ||= RSpec.configuration.infer_base_class_for_anonymous_controllers? ?
                          controller_class :
-                         ApplicationController
+                         root_controller
 
         metadata[:example_group][:described_class] = Class.new(base_class) do
           def self.name; "AnonymousController"; end

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

@@ -152,6 +152,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/matchers/have_extension.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'active_support/core_ext/module/aliasing'
 require 'rspec/matchers/built_in/have'
 

data/lib/rspec/rails/matchers/relation_match_array.rb

@@ -1,3 +1,3 @@
 if defined?(ActiveRecord::Relation)
-  RSpec::Matchers::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::MatchArray)
+  RSpec::Matchers::BuiltIn::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::MatchArray)
 end

data/lib/rspec/rails/matchers/routing_matchers.rb

@@ -35,6 +35,10 @@ module RSpec::Rails::Matchers
         rescued_exception.message
       end
 
+      def failure_message_for_should_not
+        "expected #{@actual.inspect} not to route to #{@expected.inspect}"
+      end
+
       def description
         "route #{@actual.inspect} to #{@expected.inspect}"
       end

data/lib/rspec/rails/mocks.rb

@@ -1,3 +1,5 @@
+require 'active_support'
+require 'active_support/deprecation'
 require 'active_support/core_ext'
 require 'active_model'
 
@@ -29,6 +31,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 +60,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/vendor/capybara.rb

@@ -9,9 +9,42 @@ rescue LoadError
 end
 
 if defined?(Capybara)
+  module RSpec::Rails::DeprecatedCapybaraDSL
+    include ::Capybara::DSL
+
+    def self.included(mod)
+      mod.extend(ClassMethods)
+      super
+    end
+
+    module ClassMethods
+      def include(mod)
+        if mod == ::Capybara::DSL
+          class_variable_set(:@@_rspec_capybara_included_explicitly, true)
+        end
+
+        super
+      end
+    end
+
+    ::Capybara::DSL.instance_methods(false).each do |method|
+      # capybara internally calls `page`, skip to avoid a duplicate
+      # deprecation warning
+      next if method.to_s == 'page'
+
+      define_method method do |*args, &blk|
+        unless self.class.class_variable_defined?(:@@_rspec_capybara_included_explicitly)
+          RSpec.deprecate "Using the capybara method `#{method}` in controller specs",
+            :replacement => "feature specs (spec/features)"
+        end
+        super(*args, &blk)
+      end
+    end
+  end
+
   RSpec.configure do |c|
     if defined?(Capybara::DSL)
-      c.include Capybara::DSL, :type => :controller
+      c.include ::RSpec::Rails::DeprecatedCapybaraDSL, :type => :controller
       c.include Capybara::DSL, :type => :feature
     end
 
@@ -20,9 +53,7 @@ if defined?(Capybara)
       c.include Capybara::RSpecMatchers, :type => :helper
       c.include Capybara::RSpecMatchers, :type => :mailer
       c.include Capybara::RSpecMatchers, :type => :controller
-      c.include Capybara::RSpecMatchers, :example_group => {
-        :file_path => c.escaped_path(%w[spec features])
-      }
+      c.include Capybara::RSpecMatchers, :type => :feature
     end
 
     unless defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Rails
     module Version
-      STRING = '2.99.0.beta1'
+      STRING = '2.99.0.beta2'
     end
   end
 end

data/spec/autotest/rails_rspec2_spec.rb

@@ -9,26 +9,26 @@ describe Autotest::RailsRspec2 do
     let(:exceptions_regexp) { rails_rspec2_autotest.exceptions }
 
     it "matches './log/test.log'" do
-      exceptions_regexp.should match('./log/test.log')
+      expect(exceptions_regexp).to match('./log/test.log')
     end
 
     it "matches 'log/test.log'" do
-      exceptions_regexp.should match('log/test.log')
+      expect(exceptions_regexp).to match('log/test.log')
     end
 
     it "does not match './spec/models/user_spec.rb'" do
-      exceptions_regexp.should_not match('./spec/models/user_spec.rb')
+      expect(exceptions_regexp).not_to match('./spec/models/user_spec.rb')
     end
 
     it "does not match 'spec/models/user_spec.rb'" do
-      exceptions_regexp.should_not match('spec/models/user_spec.rb')
+      expect(exceptions_regexp).not_to match('spec/models/user_spec.rb')
     end
   end
 
   describe 'mappings' do
     it 'runs model specs when support files change' do
       rails_rspec2_autotest.find_order = %w(spec/models/user_spec.rb spec/support/blueprints.rb)
-      rails_rspec2_autotest.test_files_for('spec/support/blueprints.rb').should(
+      expect(rails_rspec2_autotest.test_files_for('spec/support/blueprints.rb')).to(
         include('spec/models/user_spec.rb'))
     end
   end

data/spec/generators/rspec/controller/controller_generator_spec.rb

@@ -17,16 +17,16 @@ describe Rspec::Generators::ControllerGenerator do
       end
 
       describe 'the spec' do
-        it { should exist }
-        it { should contain(/require 'spec_helper'/) }
-        it { should contain(/describe PostsController/) }
+        it { is_expected.to exist }
+        it { is_expected.to contain(/require 'spec_helper'/) }
+        it { is_expected.to contain(/describe PostsController/) }
       end
     end
     describe 'skipped with a flag' do
       before do
         run_generator %w(posts --no-controller_specs)
       end
-      it { should_not exist }
+      it { is_expected.not_to exist }
     end
   end
 
@@ -38,7 +38,7 @@ describe Rspec::Generators::ControllerGenerator do
         end
         describe 'index.html.erb' do
           subject { file('spec/views/posts/index.html.erb_spec.rb') }
-          it { should_not exist }
+          it { is_expected.not_to exist }
         end
       end
       describe 'with no actions' do
@@ -47,7 +47,7 @@ describe Rspec::Generators::ControllerGenerator do
         end
         describe 'index.html.erb' do
           subject { file('spec/views/posts/index.html.erb_spec.rb') }
-          it { should_not exist }
+          it { is_expected.not_to exist }
         end
       end
 
@@ -58,7 +58,7 @@ describe Rspec::Generators::ControllerGenerator do
 
         describe 'index.html.erb' do
           subject { file('spec/views/posts/index.html._spec.rb') }
-          it { should_not exist }
+          it { is_expected.not_to exist }
         end
       end
     end
@@ -70,15 +70,15 @@ describe Rspec::Generators::ControllerGenerator do
         end
         describe 'index.html.erb' do
           subject { file('spec/views/posts/index.html.erb_spec.rb') }
-          it { should exist }
-          it { should contain(/require 'spec_helper'/) }
-          it { should contain(/describe "posts\/index.html.erb"/) }
+          it { is_expected.to exist }
+          it { is_expected.to contain(/require 'spec_helper'/) }
+          it { is_expected.to contain(/describe "posts\/index.html.erb"/) }
         end
         describe 'show.html.erb' do
           subject { file('spec/views/posts/show.html.erb_spec.rb') }
-          it { should exist }
-          it { should contain(/require 'spec_helper'/) }
-          it { should contain(/describe "posts\/show.html.erb"/) }
+          it { is_expected.to exist }
+          it { is_expected.to contain(/require 'spec_helper'/) }
+          it { is_expected.to contain(/describe "posts\/show.html.erb"/) }
         end
       end
       describe 'with haml' do
@@ -87,9 +87,9 @@ describe Rspec::Generators::ControllerGenerator do
         end
         describe 'index.html.haml' do
           subject { file('spec/views/posts/index.html.haml_spec.rb') }
-          it { should exist }
-          it { should contain(/require 'spec_helper'/) }
-          it { should contain(/describe "posts\/index.html.haml"/) }
+          it { is_expected.to exist }
+          it { is_expected.to contain(/require 'spec_helper'/) }
+          it { is_expected.to contain(/describe "posts\/index.html.haml"/) }
         end
       end
     end