rspec-rails 3.2.3 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b253eb3b0e3dec76470a3b9539138bff0a8b33c
-  data.tar.gz: 06602ed978e71e6c85feb573bdc1e86978380cf1
+  metadata.gz: 9d716116d6947d7386ac5ea4728f9995b7c3663e
+  data.tar.gz: 13613ed86a4c02bf0f5e7804ffbcd75dc59c5a07
 SHA512:
-  metadata.gz: d430a2897898c07a2b03f8721b60c6786793a65a90c9e3ea8b0ae8a16267e8d99dc279a6420e225fc0940e2576c96139239d14a2a43120596a28d1057ab71e09
-  data.tar.gz: edafde8fc964cb4a06165f51c5ab8bb726f915bce743e488a036e40516cf1fe1dc9c02ab48f8ec208b9a7bead6a66b7ac4e8e8a7089b7097156fe80315be6fc8
+  metadata.gz: 06881e327741bb3268458ab492f432c4843b273be988c886f41a850caffe7b36e540d2d2b93a8c37de992269634fd21cb1fa7406143063c96fa17fd53920c998
+  data.tar.gz: 7bc993a1f2ae2d252f7018229d289ebf441656a1782f36d0587e35d30f10c7fa5e86648cab89dd85d0ad8d400644dc5e37586bdcc8c2c024759ed6d074e97819

data/.yardopts

@@ -1,6 +1,8 @@
 --no-private
 --exclude features
 --exclude lib/generators/([^/]+/)*.*_spec.rb
+--exclude lib/generators/([^/]+/)*templates/([^/]+/)*.rb
+--exclude lib/generators/([^/]+/)*templates/.+\.rb
 --markup markdown
 --template-path yard/template/
 -

data/Changelog.md

@@ -1,3 +1,21 @@
+### 3.3.0 / 2015-06-12
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.2.3...v3.3.0)
+
+Enhancements:
+
+* Add support for PATCH to route specs created via scaffold. (Igor Zubkov, #1336)
+* Improve controller and routing spec calls to `routes` by using `yield`
+  instead of `call`. (Anton Davydov, #1308)
+* Add support for `ActiveJob` specs as standard `RSpec::Rails::RailsExampleGoup`s
+  via both `:type => :job` and inferring type from spec directory `spec/jobs`.
+  (Gabe Martin-Dempesy, #1361)
+* Include `RSpec::Rails::FixtureSupport` into example groups using metadata
+  `:use_fixtures => true`. (Aaron Kromer, #1372)
+* Include `rspec:request` generator for generating request specs; this is an
+  alias of `rspec:integration` (Aaron Kromer, #1378)
+* Update `rails_helper` generator with a default check to abort the spec run
+  when the Rails environment is production. (Aaron Kromer, #1383)
+
 ### 3.2.3 / 2015-06-06
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.2.2...v3.2.3)
 

data/README.md

@@ -518,7 +518,7 @@ expect(page).to have_http_status(:success)
 
 ## `rake` tasks
 
-Several rake tasks are provided as a convience for working with RSpec. To run
+Several rake tasks are provided as a convenience for working with RSpec. To run
 the entire spec suite use `rake spec`. To run a subset of specs use the
 associated type task, for example `rake spec:models`.
 

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

@@ -1,7 +1,9 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV['RAILS_ENV'] ||= 'test'
-require 'spec_helper'
 require File.expand_path('../../config/environment', __FILE__)
+# Prevent database truncation if the environment is production
+abort("The Rails environment is running in production mode!") if Rails.env.production?
+require 'spec_helper'
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
 

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

@@ -4,7 +4,12 @@ module Rspec
   module Generators
     # @private
     class IntegrationGenerator < Base
-      class_option :request_specs,   :type => :boolean, :default => true,  :desc => "Generate request specs"
+      # Add a deprecation for this class, before rspec-rails 4, to use the
+      # `RequestGenerator` instead
+      class_option :request_specs,
+                   :type => :boolean,
+                   :default => true,
+                   :desc => "Generate request specs"
 
       def generate_request_spec
         return unless options[:request_specs]

data/lib/generators/rspec/request/request_generator.rb

@@ -0,0 +1,10 @@
+require 'generators/rspec/integration/integration_generator'
+
+module Rspec
+  module Generators
+    # @private
+    class RequestGenerator < IntegrationGenerator
+      source_paths << File.expand_path("../../integration/templates", __FILE__)
+    end
+  end
+end

data/lib/generators/rspec/scaffold/templates/routing_spec.rb

@@ -26,10 +26,16 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:routing
       expect(:post => "/<%= ns_table_name %>").to route_to("<%= ns_table_name %>#create")
     end
 
-    it "routes to #update" do
+    it "routes to #update via PUT" do
       expect(:put => "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#update", :id => "1")
     end
 
+<% if Rails::VERSION::STRING > '4' -%>
+    it "routes to #update via PATCH" do
+      expect(:patch => "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#update", :id => "1")
+    end
+
+<% end -%>
     it "routes to #destroy" do
       expect(:delete => "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#destroy", :id => "1")
     end

data/lib/rspec/rails/adapters.rb

@@ -5,6 +5,7 @@ require 'active_support/core_ext/string'
 
 module RSpec
   module Rails
+    # @private
     def self.disable_testunit_autorun
       # `Test::Unit::AutoRunner.need_auto_run=` was introduced to the test-unit
       # gem in version 2.4.9. Previous to this version `Test::Unit.run=` was

data/lib/rspec/rails/configuration.rb

@@ -27,6 +27,7 @@ module RSpec
     DIRECTORY_MAPPINGS = {
       :controller => %w[spec controllers],
       :helper     => %w[spec helpers],
+      :job        => %w[spec jobs],
       :mailer     => %w[spec mailers],
       :model      => %w[spec models],
       :request    => %w[spec (requests|integration|api)],
@@ -52,6 +53,10 @@ module RSpec
         config.include RSpec::Rails::MailerExampleGroup, :type => :mailer
       end
 
+      if defined?(ActiveJob)
+        config.include RSpec::Rails::JobExampleGroup, :type => :job
+      end
+
       # controller settings
       config.add_setting :infer_base_class_for_anonymous_controllers, :default => true
 
@@ -60,10 +65,10 @@ module RSpec
       config.add_setting :use_instantiated_fixtures
       config.add_setting :global_fixtures
       config.add_setting :fixture_path
+      config.include RSpec::Rails::FixtureSupport, :use_fixtures
 
-      # TODO: We'll need to create a deprecated module in order to properly
-      #  report to gems / projects which are relying on this being loaded
-      #  globally.
+      # We'll need to create a deprecated module in order to properly report to
+      # gems / projects which are relying on this being loaded globally.
       #
       # See rspec/rspec-rails#1355 for history
       #
@@ -79,23 +84,25 @@ module RSpec
       # but requires this workaround:
       config.add_setting :rendering_views, :default => false
 
-      def config.render_views=(val)
-        self.rendering_views = val
-      end
+      config.instance_exec do
+        def render_views=(val)
+          self.rendering_views = val
+        end
 
-      def config.render_views
-        self.rendering_views = true
-      end
+        def render_views
+          self.rendering_views = true
+        end
 
-      def config.render_views?
-        rendering_views
-      end
+        def render_views?
+          rendering_views
+        end
 
-      def config.infer_spec_type_from_file_location!
-        DIRECTORY_MAPPINGS.each do |type, dir_parts|
-          escaped_path = Regexp.compile(dir_parts.join('[\\\/]') + '[\\\/]')
-          define_derived_metadata(:file_path => escaped_path) do |metadata|
-            metadata[:type] ||= type
+        def infer_spec_type_from_file_location!
+          DIRECTORY_MAPPINGS.each do |type, dir_parts|
+            escaped_path = Regexp.compile(dir_parts.join('[\\\/]') + '[\\\/]')
+            define_derived_metadata(:file_path => escaped_path) do |metadata|
+              metadata[:type] ||= type
+            end
           end
         end
       end

data/lib/rspec/rails/example.rb

@@ -6,4 +6,5 @@ require 'rspec/rails/example/view_example_group'
 require 'rspec/rails/example/mailer_example_group'
 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'

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

@@ -1,5 +1,10 @@
 module RSpec
   module Rails
+    # @private
+    ControllerAssertionDelegator = RSpec::Rails::AssertionDelegator.new(
+      ActionDispatch::Assertions::RoutingAssertions
+    )
+
     # Container module for controller spec functionality.
     module ControllerExampleGroup
       extend ActiveSupport::Concern
@@ -9,7 +14,7 @@ module RSpec
       include RSpec::Rails::Matchers::RedirectTo
       include RSpec::Rails::Matchers::RenderTemplate
       include RSpec::Rails::Matchers::RoutingMatchers
-      include RSpec::Rails::AssertionDelegator.new(ActionDispatch::Assertions::RoutingAssertions)
+      include ControllerAssertionDelegator
 
       # Class-level DSL for controller specs.
       module ClassMethods
@@ -110,14 +115,20 @@ module RSpec
         #
         #       # ...
         #     end
-        def routes(&blk)
+        def routes
           before do
-            self.routes = blk.call
+            self.routes = yield
           end
         end
       end
 
-      attr_reader :controller, :routes
+      # @!attribute [r]
+      # Returns the controller object instance under test.
+      attr_reader :controller
+
+      # @!attribute [r]
+      # Returns the Rails routes used for the spec.
+      attr_reader :routes
 
       # @private
       #

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

@@ -0,0 +1,22 @@
+module RSpec
+  module Rails
+    # Container module for job spec functionality. It is only available if
+    # ActiveJob has been loaded before it.
+    module JobExampleGroup
+      # This blank module is only necessary for YARD processing. It doesn't
+      # handle the conditional `defined?` check below very well.
+    end
+  end
+end
+
+if defined?(ActiveJob)
+  module RSpec
+    module Rails
+      # Container module for job spec functionality.
+      module JobExampleGroup
+        extend ActiveSupport::Concern
+        include RSpec::Rails::RailsExampleGroup
+      end
+    end
+  end
+end

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

@@ -11,6 +11,7 @@ module RSpec
       include RSpec::Rails::MinitestLifecycleAdapter if ::Rails::VERSION::STRING >= '4'
       include RSpec::Rails::MinitestAssertionAdapter
       include RSpec::Rails::Matchers
+      include RSpec::Rails::FixtureSupport
     end
   end
 end

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

@@ -2,13 +2,18 @@ require "action_dispatch/testing/assertions/routing"
 
 module RSpec
   module Rails
+    # @private
+    RoutingAssertionDelegator =  RSpec::Rails::AssertionDelegator.new(
+      ActionDispatch::Assertions::RoutingAssertions
+    )
+
     # Container module for routing spec functionality.
     module RoutingExampleGroup
       extend ActiveSupport::Concern
       include RSpec::Rails::RailsExampleGroup
       include RSpec::Rails::Matchers::RoutingMatchers
       include RSpec::Rails::Matchers::RoutingMatchers::RouteHelpers
-      include RSpec::Rails::AssertionDelegator.new(ActionDispatch::Assertions::RoutingAssertions)
+      include RSpec::Rails::RoutingAssertionDelegator
 
       # Class-level DSL for route specs.
       module ClassMethods
@@ -24,9 +29,9 @@ module RSpec
         #           route_to(:controller => "my_engine/posts", :action => "index")
         #       end
         #     end
-        def routes(&blk)
+        def routes
           before do
-            self.routes = blk.call
+            self.routes = yield
           end
         end
       end
@@ -37,6 +42,8 @@ module RSpec
         end
       end
 
+      # @!attribute [r]
+      # @private
       attr_reader :routes
 
       # @private

data/lib/rspec/rails/feature_check.rb

@@ -1,6 +1,7 @@
 # @api private
 module RSpec
   module Rails
+    # @private
     # Disable some cops until https://github.com/bbatsov/rubocop/issues/1310
     # rubocop:disable Style/IndentationConsistency
     module FeatureCheck

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.2.3'
+      STRING = '3.3.0'
     end
   end
 end

data/lib/rspec/rails/view_rendering.rb

@@ -6,7 +6,13 @@ module RSpec
     module ViewRendering
       extend ActiveSupport::Concern
 
-      attr_accessor :controller
+      # @!attribute [r]
+      # Returns the controller object instance under test.
+      attr_reader :controller
+
+      # @private
+      attr_writer :controller
+      private :controller=
 
       # DSL methods
       module ClassMethods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.3.0
 platform: ruby
 authors:
 - David Chelimsky
@@ -44,7 +44,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2015-06-06 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,56 +112,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.2
-description: RSpec for Rails
+description: rspec-rails is a testing framework for Rails 3.x and 4.x.
 email: rspec@googlegroups.com
 executables: []
 extensions: []
@@ -253,6 +253,7 @@ files:
 - lib/generators/rspec/model/templates/model_spec.rb
 - lib/generators/rspec/observer/observer_generator.rb
 - lib/generators/rspec/observer/templates/observer_spec.rb
+- lib/generators/rspec/request/request_generator.rb
 - lib/generators/rspec/scaffold/scaffold_generator.rb
 - lib/generators/rspec/scaffold/templates/controller_spec.rb
 - lib/generators/rspec/scaffold/templates/edit_spec.rb
@@ -271,6 +272,7 @@ files:
 - 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/mailer_example_group.rb
 - lib/rspec/rails/example/model_example_group.rb
 - lib/rspec/rails/example/rails_example_group.rb
@@ -315,10 +317,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rspec
+rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-rails-3.2.3
+summary: RSpec for Rails
 test_files: []
 has_rdoc: