rspec-rails 3.6.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c537d208f4489a1d0fb5ac026b430f07327c164b
-  data.tar.gz: 51ed9efc1690bd7f989d86c9663b64d4e2718f00
+  metadata.gz: af8e2712271eef87e27c945e5d3752b46c0c6c44
+  data.tar.gz: f7a2803d48fd6e3130f2e3a3acccd083d13e615b
 SHA512:
-  metadata.gz: f16177eea0379c2961a8b81df5354594a00869c45ba8c078fe2495eb094fadf2fd72ae1fa400e87d1bbf3e7d6a6e8f818934f1ff83c55db23e34bbcc2f4c8bfe
-  data.tar.gz: 850422365039c632a94cf4010e0eb0654956fefdb129f938070d688ae70f58b786b05f01d304bca0cc46d5583a760701eec2acc95c1467a972e89100bab77694
+  metadata.gz: 7246455923effd2d777053e85788a72d979528422466821432257dc1d564c8ec2206f51199d2846dd66b7d201723d5c4e6405bc588321f8bd3c09c13f4a7c0e9
+  data.tar.gz: ee14397f82807074ac6c979272083d336ca8e76f1a62d1dee8dfcc41d3856a7a0c9f4e09e7be54eede82dee4da609bc75ae7cb5b813d977040e5f4c6dd870494

data/Changelog.md

@@ -1,5 +1,8 @@
-### 3.6.1 / 2017-07-25
-[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.6.0...v3.6.1)
+### Development
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.7.0...master)
+
+### 3.7.0 / 2017-10-17
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.6.0...v3.7.0)
 
 Bug Fixes:
 
@@ -7,6 +10,13 @@ Bug Fixes:
   environments. (Samuel Cochran, #1831)
 * Correctly generate job name in error message. (Wojciech Wnętrzak, #1814)
 
+Enhancements:
+
+* Allow `be_a_new(...).with(...)` matcher to accept matchers for
+  attribute values. (Britni Alexander, #1811)
+* Only configure RSpec Mocks if it is fully loaded. (James Adam, #1856)
+* Integrate with `ActionDispatch::SystemTestCase`. (Sam Phippen, #1813)
+
 ### 3.6.0 / 2017-05-04
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.6.0.beta2...v3.6.0)
 

data/README.md

@@ -11,7 +11,7 @@ Add `rspec-rails` to **both** the `:development` and `:test` groups in the
 
 ```ruby
 group :development, :test do
-  gem 'rspec-rails', '~> 3.5'
+  gem 'rspec-rails', '~> 3.6'
 end
 ```
 
@@ -160,57 +160,12 @@ end
 For more information, see [cucumber scenarios for model
 specs](https://www.relishapp.com/rspec/rspec-rails/docs/model-specs).
 
-## Controller Specs
-
-Use controller specs to describe behavior of Rails controllers.
-
-Controller specs default to residing in the `spec/controllers` folder. Tagging
-any context with the metadata `:type => :controller` treats its examples as
-controller specs.
-
-For example:
-
-```ruby
-require "rails_helper"
-
-RSpec.describe PostsController, :type => :controller do
-  describe "GET #index" do
-    it "responds successfully with an HTTP 200 status code" do
-      get :index
-      expect(response).to be_success
-      expect(response).to have_http_status(200)
-    end
-
-    it "renders the index template" do
-      get :index
-      expect(response).to render_template("index")
-    end
-
-    it "loads all of the posts into @posts" do
-      post1, post2 = Post.create!, Post.create!
-      get :index
-
-      expect(assigns(:posts)).to match_array([post1, post2])
-    end
-  end
-end
-```
-
-For more information, see [cucumber scenarios for controller
-specs](https://www.relishapp.com/rspec/rspec-rails/docs/controller-specs).
-
-**Note:** To encourage more isolated testing, views are not rendered by default
-in controller specs. If you are verifying discrete view logic, use a [view
-spec](#view-specs). If you are verifying the behaviour of a controller and view
-together, consider a [request spec](#request-specs). You can use
-[render\_views](https://www.relishapp.com/rspec/rspec-rails/docs/controller-specs/render-views)
-if you must verify the rendered view contents within a controller spec, but
-this is not recommended.
-
 ## Request Specs
 
-Use request specs to specify one or more request/response cycles from end to
-end using a black box approach.
+Use request specs to describe the client-facing behavior of the application —
+specifically, the HTTP response to be issued for a given request (a.k.a.
+integration tests). Since such client-facing behavior encompasses controller
+actions, this is the type of spec to use for controller testing.
 
 Request specs default to residing in the `spec/requests`, `spec/api`, and
 `spec/integration` directories. Tagging any context with the metadata `:type =>
@@ -277,6 +232,22 @@ FactoryGirl and Capybara seem to be the most widely used. Whether you choose
 these or other libs, we strongly recommend using something for each of these
 roles.
 
+For more information, see [cucumber scenarios for request
+specs](https://relishapp.com/rspec/rspec-rails/docs/request-specs/request-spec).
+
+## Controller Specs
+
+Controller specs can be used to describe the behavior of Rails controllers. As
+of version 3.5, however, controller specs are discouraged in favor of request
+specs (which also focus largely on controllers, but capture other critical
+aspects of application behavior as well). Controller specs will continue to be
+supported until at least version 4.0 (see the [release
+notes](http://rspec.info/blog/2016/07/rspec-3-5-has-been-released/#rails-support-for-rails-5)
+for details).
+
+For more information, see [cucumber scenarios for controller
+specs](https://www.relishapp.com/rspec/rspec-rails/docs/controller-specs).
+
 ## Feature Specs
 
 Feature specs test your application from the outside by simulating a browser.

data/lib/generators/rspec/install/templates/spec/rails_helper.rb

@@ -23,7 +23,7 @@ require 'rspec/rails'
 # Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
 
 <% if RSpec::Rails::FeatureCheck.can_maintain_test_schema? -%>
-# Checks for pending migration and applies them before tests are run.
+# Checks for pending migrations and applies them before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.maintain_test_schema!
 

data/lib/rspec/rails/active_record.rb

@@ -7,7 +7,7 @@ module RSpec
       def self.initialize_activerecord_configuration(config)
         config.before :suite do
           # This allows dynamic columns etc to be used on ActiveRecord models when creating instance_doubles
-          if defined?(ActiveRecord) && defined?(ActiveRecord::Base) && defined?(::RSpec::Mocks)
+          if defined?(ActiveRecord) && defined?(ActiveRecord::Base) && defined?(::RSpec::Mocks) && (::RSpec::Mocks.respond_to?(:configuration))
             ::RSpec::Mocks.configuration.when_declaring_verifying_double do |possible_model|
               target = possible_model.target
 

data/lib/rspec/rails/configuration.rb

@@ -33,7 +33,8 @@ module RSpec
       :request    => %w[spec (requests|integration|api)],
       :routing    => %w[spec routing],
       :view       => %w[spec views],
-      :feature    => %w[spec features]
+      :feature    => %w[spec features],
+      :system     => %w[spec system]
     }
 
     # Sets up the different example group modules for the different spec types
@@ -48,6 +49,10 @@ module RSpec
       config.include RSpec::Rails::ViewExampleGroup,       :type => :view
       config.include RSpec::Rails::FeatureExampleGroup,    :type => :feature
       config.include RSpec::Rails::Matchers
+
+      if ActionPack::VERSION::STRING >= "5.1"
+        config.include RSpec::Rails::SystemExampleGroup, :type => :system
+      end
     end
 
     # @private

data/lib/rspec/rails/example.rb

@@ -8,3 +8,6 @@ require 'rspec/rails/example/routing_example_group'
 require 'rspec/rails/example/model_example_group'
 require 'rspec/rails/example/job_example_group'
 require 'rspec/rails/example/feature_example_group'
+if ActionPack::VERSION::STRING >= "5.1"
+  require 'rspec/rails/example/system_example_group'
+end

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

@@ -0,0 +1,88 @@
+if ActionPack::VERSION::STRING >= "5.1"
+  require 'action_dispatch/system_test_case'
+  module RSpec
+    module Rails
+      # @api public
+      # Container class for system tests
+      module SystemExampleGroup
+        extend ActiveSupport::Concern
+        include RSpec::Rails::RailsExampleGroup
+        include ActionDispatch::Integration::Runner
+        include ActionDispatch::Assertions
+        include RSpec::Rails::Matchers::RedirectTo
+        include RSpec::Rails::Matchers::RenderTemplate
+        include ActionController::TemplateAssertions
+
+        include ActionDispatch::IntegrationTest::Behavior
+
+        # @private
+        module BlowAwayAfterTeardownHook
+          # @private
+          def after_teardown
+          end
+        end
+
+        original_after_teardown = ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown.instance_method(:after_teardown)
+
+        include ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown
+        include ::ActionDispatch::SystemTesting::TestHelpers::ScreenshotHelper
+        include BlowAwayAfterTeardownHook
+
+        # for the SystemTesting Screenshot situation
+        def passed?
+          RSpec.current_example.exception.nil?
+        end
+
+        # @private
+        def method_name
+          @method_name ||= [
+            self.class.name.underscore,
+            RSpec.current_example.description.underscore,
+            rand(1000)
+          ].join("_").gsub(/[\/\.:, ]/, "_")
+        end
+
+        # Delegates to `Rails.application`.
+        def app
+          ::Rails.application
+        end
+
+        included do
+          attr_reader :driver
+
+          if ActionDispatch::SystemTesting::Server.respond_to?(:silence_puma=)
+            ActionDispatch::SystemTesting::Server.silence_puma = true
+          end
+
+          def initialize(*args, &blk)
+            super(*args, &blk)
+            @driver = nil
+          end
+
+          def driven_by(*args, &blk)
+            @driver = ::ActionDispatch::SystemTestCase.driven_by(*args, &blk).tap(&:use)
+          end
+
+          before do
+            # A user may have already set the driver, so only default if driver
+            # is not set
+            driven_by(:selenium) unless @driver
+            @routes = ::Rails.application.routes
+          end
+
+          after do
+            orig_stdout = $stdout
+            $stdout = StringIO.new
+            begin
+              original_after_teardown.bind(self).call
+            ensure
+              myio = $stdout
+              RSpec.current_example.metadata[:extra_failure_lines] = myio.string
+              $stdout = orig_stdout
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -32,10 +32,11 @@ module RSpec
               message << "expected #{actual.inspect} to be a new #{expected.inspect}"
             end
             unless attributes_match?(actual)
+              describe_unmatched_attributes = surface_descriptions_in(unmatched_attributes)
               if unmatched_attributes.size > 1
-                message << "attributes #{unmatched_attributes.inspect} were not set on #{actual.inspect}"
+                message << "attributes #{describe_unmatched_attributes.inspect} were not set on #{actual.inspect}"
               else
-                message << "attribute #{unmatched_attributes.inspect} was not set on #{actual.inspect}"
+                message << "attribute #{describe_unmatched_attributes.inspect} was not set on #{actual.inspect}"
               end
             end
           end.join(' and ')
@@ -49,13 +50,13 @@ module RSpec
 
         def attributes_match?(actual)
           attributes.stringify_keys.all? do |key, value|
-            actual.attributes[key].eql?(value)
+            values_match?(value, actual.attributes[key])
           end
         end
 
         def unmatched_attributes
           attributes.stringify_keys.reject do |key, value|
-            actual.attributes[key].eql?(value)
+            values_match?(value, actual.attributes[key])
           end
         end
       end

data/lib/rspec/rails/vendor/capybara.rb

@@ -17,6 +17,9 @@ if defined?(Capybara)
   RSpec.configure do |c|
     if defined?(Capybara::DSL)
       c.include Capybara::DSL, :type => :feature
+      if defined?(ActionPack) && ActionPack::VERSION::STRING >= "5.1"
+        c.include Capybara::DSL, :type => :system
+      end
     end
 
     if defined?(Capybara::RSpecMatchers)
@@ -25,6 +28,7 @@ if defined?(Capybara)
       c.include Capybara::RSpecMatchers, :type => :mailer
       c.include Capybara::RSpecMatchers, :type => :controller
       c.include Capybara::RSpecMatchers, :type => :feature
+      c.include Capybara::RSpecMatchers, :type => :system
     end
 
     unless defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)

data/lib/rspec/rails/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Rails.
     module Version
       # Current version of RSpec Rails, in semantic versioning format.
-      STRING = '3.6.1'
+      STRING = '3.7.0'
     end
   end
 end

data/lib/rspec/rails/view_path_builder.rb

@@ -18,7 +18,7 @@ module RSpec
       # @example
       #     # path cannot be built because the params are missing a required element (:id)
       #     view_path_builder.path_for({ :controller => 'posts', :action => 'delete' })
-      #     # => nil
+      #     # => ActionController::UrlGenerationError: No route matches {:action=>"delete", :controller=>"posts"}
       def path_for(path_params)
         url_for(path_params.merge(:only_path => true))
       rescue => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.7.0
 platform: ruby
 authors:
 - David Chelimsky
@@ -44,7 +44,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,56 +94,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,7 @@ files:
 - lib/rspec/rails/example/rails_example_group.rb
 - lib/rspec/rails/example/request_example_group.rb
 - lib/rspec/rails/example/routing_example_group.rb
+- lib/rspec/rails/example/system_example_group.rb
 - lib/rspec/rails/example/view_example_group.rb
 - lib/rspec/rails/extensions.rb
 - lib/rspec/rails/extensions/active_record/proxy.rb
@@ -292,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: RSpec for Rails