rspec-rails 4.0.0.beta2 → 4.0.0.beta3

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

@@ -14,20 +14,19 @@ module RSpec
         include RSpec::Mocks::ExampleMethods
 
         def initialize(mailer_class, method_name)
-          super(mailer_job)
+          super(nil)
           @mailer_class = mailer_class
           @method_name = method_name
           @mail_args = []
-          @args = mailer_args
         end
 
         def description
-          "enqueues #{@mailer_class.name}.#{@method_name}"
+          "enqueues #{mailer_class_name}.#{@method_name}"
         end
 
         def with(*args, &block)
           @mail_args = args
-          block.nil? ? super(*mailer_args) : super(*mailer_args, &yield_mail_args(block))
+          block.nil? ? super : super(&yield_mail_args(block))
         end
 
         def matches?(block)
@@ -50,7 +49,7 @@ module RSpec
         private
 
         def base_message
-          "#{@mailer_class.name}.#{@method_name}".tap do |msg|
+          [mailer_class_name, @method_name].compact.join('.').tap do |msg|
             msg << " #{expected_count_message}"
             msg << " with #{@mail_args}," if @mail_args.any?
             msg << " on queue #{@queue}," if @queue
@@ -63,24 +62,31 @@ module RSpec
           "#{message_expectation_modifier} #{@expected_number} #{@expected_number == 1 ? 'time' : 'times'}"
         end
 
-        def mailer_args
-          if @mail_args.any?
-            base_mailer_args + @mail_args
-          else
-            mailer_method_arity = @mailer_class.instance_method(@method_name).arity
+        def mailer_class_name
+          @mailer_class ? @mailer_class.name : 'ActionMailer::Base'
+        end
+
+        def job_match?(job)
+          legacy_mail?(job) || parameterized_mail?(job) || unified_mail?(job)
+        end
 
-            number_of_args = if mailer_method_arity < 0
-                               (mailer_method_arity + 1).abs
-                             else
-                               mailer_method_arity
-                             end
+        def arguments_match?(job)
+          @args =
+            if @mail_args.any?
+              base_mailer_args + @mail_args
+            elsif @mailer_class && @method_name
+              base_mailer_args + [any_args]
+            elsif @mailer_class
+              [mailer_class_name, any_args]
+            else
+              []
+            end
 
-            base_mailer_args + Array.new(number_of_args) { anything }
-          end
+          super(job)
         end
 
         def base_mailer_args
-          [@mailer_class.name, @method_name.to_s, MAILER_JOB_METHOD]
+          [mailer_class_name, @method_name.to_s, MAILER_JOB_METHOD]
         end
 
         def yield_mail_args(block)
@@ -95,7 +101,7 @@ module RSpec
 
         def unmatching_mail_jobs
           @unmatching_jobs.select do |job|
-            job[:job] == mailer_job
+            job_match?(job)
           end
         end
 
@@ -121,8 +127,16 @@ module RSpec
           "#{mailer_method} #{msg_parts.join(', ')}".strip
         end
 
-        def mailer_job
-          ActionMailer::DeliveryJob
+        def legacy_mail?(job)
+          job[:job] == ActionMailer::DeliveryJob
+        end
+
+        def parameterized_mail?(job)
+          RSpec::Rails::FeatureCheck.has_action_mailer_parameterized? && job[:job] == ActionMailer::Parameterized::DeliveryJob
+        end
+
+        def unified_mail?(job)
+          RSpec::Rails::FeatureCheck.has_action_mailer_unified_delivery? && job[:job] == ActionMailer::MailDeliveryJob
         end
       end
       # @api public
@@ -135,6 +149,14 @@ module RSpec
       # @example
       #     expect {
       #       MyMailer.welcome(user).deliver_later
+      #     }.to have_enqueued_mail
+      #
+      #     expect {
+      #       MyMailer.welcome(user).deliver_later
+      #     }.to have_enqueued_mail(MyMailer)
+      #
+      #     expect {
+      #       MyMailer.welcome(user).deliver_later
       #     }.to have_enqueued_mail(MyMailer, :welcome)
       #
       #     # Using alias
@@ -162,7 +184,7 @@ module RSpec
       #     expect {
       #       MyMailer.welcome(user).deliver_later(queue: :urgent_mail)
       #     }.to have_enqueued_mail(MyMailer, :welcome).on_queue(:urgent_mail)
-      def have_enqueued_mail(mailer_class, mail_method_name)
+      def have_enqueued_mail(mailer_class = nil, mail_method_name = nil)
         HaveEnqueuedMail.new(mailer_class, mail_method_name)
       end
       alias_method :have_enqueued_email, :have_enqueued_mail

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

@@ -57,7 +57,7 @@ module RSpec
         #
         #     expect(:get => "/things/special").to route_to("things#special")
         #
-        # @see http://api.rubyonrails.org/classes/ActionDispatch/Assertions/RoutingAssertions.html#method-i-assert_recognizes
+        # @see https://api.rubyonrails.org/classes/ActionDispatch/Assertions/RoutingAssertions.html#method-i-assert_recognizes
         def route_to(*expected)
           RouteToMatcher.new(self, *expected)
         end

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 = '4.0.0.beta2'
+      STRING = '4.0.0.beta3'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2
+  version: 4.0.0.beta3
 platform: ruby
 authors:
 - David Chelimsky
@@ -44,7 +44,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2019-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -199,8 +199,11 @@ files:
 - LICENSE.md
 - README.md
 - lib/generators/rspec.rb
+- lib/generators/rspec/channel/channel_generator.rb
+- lib/generators/rspec/channel/templates/channel_spec.rb.erb
 - lib/generators/rspec/controller/controller_generator.rb
 - lib/generators/rspec/controller/templates/controller_spec.rb
+- lib/generators/rspec/controller/templates/routing_spec.rb
 - lib/generators/rspec/controller/templates/view_spec.rb
 - lib/generators/rspec/feature/feature_generator.rb
 - lib/generators/rspec/feature/templates/feature_singular_spec.rb
@@ -215,6 +218,8 @@ files:
 - lib/generators/rspec/integration/templates/request_spec.rb
 - lib/generators/rspec/job/job_generator.rb
 - lib/generators/rspec/job/templates/job_spec.rb.erb
+- lib/generators/rspec/mailbox/mailbox_generator.rb
+- lib/generators/rspec/mailbox/templates/mailbox_spec.rb.erb
 - lib/generators/rspec/mailer/mailer_generator.rb
 - lib/generators/rspec/mailer/templates/fixture
 - lib/generators/rspec/mailer/templates/mailer_spec.rb
@@ -243,10 +248,12 @@ files:
 - lib/rspec/rails/adapters.rb
 - lib/rspec/rails/configuration.rb
 - lib/rspec/rails/example.rb
+- lib/rspec/rails/example/channel_example_group.rb
 - lib/rspec/rails/example/controller_example_group.rb
 - lib/rspec/rails/example/feature_example_group.rb
 - lib/rspec/rails/example/helper_example_group.rb
 - lib/rspec/rails/example/job_example_group.rb
+- lib/rspec/rails/example/mailbox_example_group.rb
 - lib/rspec/rails/example/mailer_example_group.rb
 - lib/rspec/rails/example/model_example_group.rb
 - lib/rspec/rails/example/rails_example_group.rb
@@ -261,6 +268,10 @@ files:
 - lib/rspec/rails/fixture_file_upload_support.rb
 - lib/rspec/rails/fixture_support.rb
 - lib/rspec/rails/matchers.rb
+- lib/rspec/rails/matchers/action_cable.rb
+- lib/rspec/rails/matchers/action_cable/have_broadcasted_to.rb
+- lib/rspec/rails/matchers/action_cable/have_streams.rb
+- lib/rspec/rails/matchers/action_mailbox.rb
 - lib/rspec/rails/matchers/active_job.rb
 - lib/rspec/rails/matchers/base_matcher.rb
 - lib/rspec/rails/matchers/be_a_new.rb
@@ -284,7 +295,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-rails/issues
-  changelog_uri: https://github.com/rspec/rspec-rails/blob/v4.0.0.beta2/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-rails/blob/v4.0.0.beta3/Changelog.md
   documentation_uri: https://rspec.info/documentation/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
   source_code_uri: https://github.com/rspec/rspec-rails
@@ -304,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: RSpec for Rails