rspec-rails 3.6.0.beta1 → 3.6.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ebf54e513b2bfad6ffe14c36afa43056012db04
-  data.tar.gz: 9418672e115bde33c829fa68f68d2c44af25be19
+  metadata.gz: 92a487b773b69d4298893756136ed2ec3bbc1082
+  data.tar.gz: 175a3d8803f8c795b0b01e5f47f486d4822a9abb
 SHA512:
-  metadata.gz: 8716e97798de2b89ae70a4602bc635957af4bb4e0350ee9e8a1396c23eb978093ed6076c4786793cee571c5874a3fd84659edf98f69f521fd2461c18dc45b89e
-  data.tar.gz: 24f17af3d57c74e592fece81e6af00b0588dee7f9a5d5e279e95bde85d4ddbe341512ea997fe110166bb027da087b1e0de46c088628d4cdc2a3cfffa68c0a0d0
+  metadata.gz: caa44ae7581f7d2ed130b86ec3159c4e2d08c131373a2c293799bf160661e9cffc4efb59623265730eb4402ce27b1e9076c1a6dad844469e6475640ca3c934fb
+  data.tar.gz: f27164ec0efea4782a452ef0aab36b50147d22946a348b9b36aa36eb0ac24c9b2ae2e63b398b89af9eeee09337dc4d4ca109fe320a3d87ae963bef35f3ed3bdc

data/Capybara.md

@@ -1,4 +1,4 @@
-rspec-rails supports integration with Capbyara out of the box by adding
+rspec-rails supports integration with Capybara out of the box by adding
 its Capybara::DSL (visit/page) and Capybara::RSpecMatchers to the
 examples in the applicable directories, which differ slightly between
 Capybara 1.x and Capybara >= 2.x.

data/Changelog.md

@@ -1,3 +1,11 @@
+### 3.6.0.beta2 / 2016-12-12
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.6.0.beta1...v3.6.0.beta2)
+
+Enhancements:
+
+* Improve failure output of ActiveJob matchers by listing queued jobs.
+  (Wojciech Wnętrzak, #1722)
+
 ### 3.6.0.beta1 / 2016-10-09
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.5.2...v3.6.0.beta1)
 

data/README.md

@@ -62,6 +62,9 @@ bundle exec rspec spec/models
 
 # Run only specs for AccountsController
 bundle exec rspec spec/controllers/accounts_controller_spec.rb
+
+# Run only spec on line 8 of AccountsController
+bundle exec rspec spec/controllers/accounts_controller_spec.rb:8
 ```
 
 Specs can also be run via `rake spec`, though this command may be slower to
@@ -87,6 +90,12 @@ There are three particular `rspec-rails` specific changes to be aware of:
 4. Extraction of `stub_model` and `mock_model` to
    [`rspec-activemodel-mocks`](https://github.com/rspec/rspec-activemodel-mocks)
 5. In Rails 5.x, controller testing has been moved to its own gem which is [rails-controller-testing](https://github.com/rails/rails-controller-testing). Using `assigns` in your controller specs without adding this gem will no longer work.
+6. `rspec-rails` now includes two helpers, `spec_helper.rb` and `rails_helper.rb`.
+   `spec_helper.rb` is the conventional RSpec configuration helper, whilst the
+    Rails specific loading and bootstrapping has moved to the `rails_helper.rb`
+    file. Rails specs now need this file required beforehand either at the top
+    of the specific file (recommended) or a common configuration location such
+    as your `.rspec` file.
 
 Please see the [RSpec Rails Upgrade
 docs](https://www.relishapp.com/rspec/rspec-rails/docs/upgrade) for full
@@ -318,6 +327,28 @@ end
 For more information, see the [cucumber scenarios for mailer specs
 ](https://relishapp.com/rspec/rspec-rails/v/3-4/docs/mailer-specs).
 
+## Job specs
+
+Tagging a context with the metadata `:type => :job` treats its examples as job
+specs. Typically these specs will live in `spec/jobs`.
+
+```ruby
+require 'rails_helper'
+
+RSpec.describe UploadBackupsJob, :type => :job do
+  describe "#perform_later" do
+    it "uploads a backup" do
+      ActiveJob::Base.queue_adapter = :test
+      UploadBackupsJob.perform_later('backup')
+      expect(UploadBackupsJob).to have_been_enqueued
+    end
+  end
+end
+```
+
+For more information, see the [cucumber scenarios for job specs
+](https://relishapp.com/rspec/rspec-rails/docs/job-specs).
+
 ## View specs
 
 View specs default to residing in the `spec/views` folder. Tagging any context

data/lib/generators/rspec/mailer/templates/mailer_spec.rb

@@ -1,10 +1,10 @@
 require "rails_helper"
 
 <% module_namespacing do -%>
-RSpec.describe <%= class_name %><%= Rails.version.to_f >= 5.0 ? "Mailer" : "" %>, <%= type_metatag(:mailer) %> do
+RSpec.describe <%= Rails.version.to_f >= 5.0 ? class_name.sub(/(Mailer)?$/, 'Mailer') : class_name %>, <%= type_metatag(:mailer) %> do
 <% for action in actions -%>
   describe "<%= action %>" do
-    let(:mail) { <%= class_name %><%= Rails.version.to_f >= 5.0 ? "Mailer" : "" %>.<%= action %> }
+    let(:mail) { <%= Rails.version.to_f >= 5.0 ? class_name.sub(/(Mailer)?$/, 'Mailer') : class_name %>.<%= action %> }
 
     it "renders the headers" do
       expect(mail.subject).to eq(<%= action.to_s.humanize.inspect %>)

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

@@ -67,7 +67,14 @@ module RSpec
           end
 
           def failure_message
-            "expected to enqueue #{base_message}"
+            "expected to enqueue #{base_message}".tap do |msg|
+              if @unmatching_jobs.any?
+                msg << "\nQueued jobs:"
+                @unmatching_jobs.each do |job|
+                  msg << "\n  #{base_job_message(job)}"
+                end
+              end
+            end
           end
 
           def failure_message_when_negated
@@ -89,8 +96,8 @@ module RSpec
         private
 
           def check(jobs)
-            @matching_jobs_count = jobs.count do |job|
-              if serialized_attributes.all? { |key, value| value == job[key] }
+            @matching_jobs, @unmatching_jobs = jobs.partition do |job|
+              if arguments_match?(job) && other_attributes_match?(job)
                 args = ::ActiveJob::Arguments.deserialize(job[:args])
                 @block.call(*args)
                 true
@@ -98,6 +105,7 @@ module RSpec
                 false
               end
             end
+            @matching_jobs_count = @matching_jobs.size
 
             case @expectation_type
             when :exactly then @expected_number == @matching_jobs_count
@@ -115,9 +123,32 @@ module RSpec
             end
           end
 
+          def base_job_message(job)
+            msg_parts = []
+            msg_parts << "with #{::ActiveJob::Arguments.deserialize(job[:args])}" if job[:args].any?
+            msg_parts << "on queue #{job[:queue]}" if job[:queue]
+            msg_parts << "at #{Time.at(job[:at])}" if job[:at]
+
+            "#{job[:job].class.name} job".tap do |msg|
+              msg << " #{msg_parts.join(', ')}" if msg_parts.any?
+            end
+          end
+
+          def arguments_match?(job)
+            if @args.any?
+              deserialized_args = ::ActiveJob::Arguments.deserialize(job[:args])
+              RSpec::Mocks::ArgumentListMatcher.new(*@args).args_match?(*deserialized_args)
+            else
+              true
+            end
+          end
+
+          def other_attributes_match?(job)
+            serialized_attributes.all? { |key, value| value == job[key] }
+          end
+
           def serialized_attributes
             {}.tap do |attributes|
-              attributes[:args]  = ::ActiveJob::Arguments.serialize(@args) if @args.any?
               attributes[:at]    = @at.to_f if @at
               attributes[:queue] = @queue if @queue
               attributes[:job]   = @job if @job

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.0.beta1'
+      STRING = '3.6.0.beta2'
     end
   end
 end

data/lib/rspec/rails/view_rendering.rb

@@ -61,6 +61,20 @@ module RSpec
           end
         end
 
+        # @private
+        class LogSubscriber < ::ActiveSupport::LogSubscriber
+          def current_example_group
+            RSpec.current_example.example_group
+          end
+
+          def render_template(_event)
+            return if current_example_group.render_views?
+            info("  Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.")
+          end
+        end
+
+        LogSubscriber.attach_to(:action_view)
+
         # Delegates all methods to the submitted resolver and for all methods
         # that return a collection of `ActionView::Template` instances, return
         # templates with modified source

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 3.6.0.beta1
+  version: 3.6.0.beta2
 platform: ruby
 authors:
 - David Chelimsky
@@ -44,7 +44,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-12-12 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.beta1
+        version: 3.6.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.0.beta1
+        version: 3.6.0.beta2
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.0.beta1
+        version: 3.6.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.0.beta1
+        version: 3.6.0.beta2
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.0.beta1
+        version: 3.6.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.0.beta1
+        version: 3.6.0.beta2
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.0.beta1
+        version: 3.6.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.0.beta1
+        version: 3.6.0.beta2
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -292,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: RSpec for Rails