rspec-rails 4.0.0.beta3 → 4.0.0.beta4

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

@@ -60,7 +60,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
     it "returns a success response" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
 <% if Rails::VERSION::STRING < '5.0' -%>
-      get :show, {:id => <%= file_name %>.to_param}, valid_session
+      get :show, {id: <%= file_name %>.to_param}, valid_session
 <% else -%>
       get :show, params: {id: <%= file_name %>.to_param}, session: valid_session
 <% end -%>
@@ -83,7 +83,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
     it "returns a success response" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
 <% if Rails::VERSION::STRING < '5.0' -%>
-      get :edit, {:id => <%= file_name %>.to_param}, valid_session
+      get :edit, {id: <%= file_name %>.to_param}, valid_session
 <% else -%>
       get :edit, params: {id: <%= file_name %>.to_param}, session: valid_session
 <% end -%>
@@ -96,7 +96,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
       it "creates a new <%= class_name %>" do
         expect {
 <% if Rails::VERSION::STRING < '5.0' -%>
-          post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
+          post :create, {<%= ns_file_name %>: valid_attributes}, valid_session
 <% else -%>
           post :create, params: {<%= ns_file_name %>: valid_attributes}, session: valid_session
 <% end -%>
@@ -105,7 +105,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
 
       it "redirects to the created <%= ns_file_name %>" do
 <% if Rails::VERSION::STRING < '5.0' -%>
-        post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
+        post :create, {<%= ns_file_name %>: valid_attributes}, valid_session
 <% else -%>
         post :create, params: {<%= ns_file_name %>: valid_attributes}, session: valid_session
 <% end -%>
@@ -116,7 +116,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
     context "with invalid params" do
       it "returns a success response (i.e. to display the 'new' template)" do
 <% if Rails::VERSION::STRING < '5.0' -%>
-        post :create, {:<%= ns_file_name %> => invalid_attributes}, valid_session
+        post :create, {<%= ns_file_name %>: invalid_attributes}, valid_session
 <% else -%>
         post :create, params: {<%= ns_file_name %>: invalid_attributes}, session: valid_session
 <% end -%>
@@ -134,7 +134,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
       it "updates the requested <%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
 <% if Rails::VERSION::STRING < '5.0' -%>
-        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => new_attributes}, valid_session
+        put :update, {id: <%= file_name %>.to_param, <%= ns_file_name %>: new_attributes}, valid_session
 <% else -%>
         put :update, params: {id: <%= file_name %>.to_param, <%= ns_file_name %>: new_attributes}, session: valid_session
 <% end -%>
@@ -145,7 +145,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
       it "redirects to the <%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
 <% if Rails::VERSION::STRING < '5.0' -%>
-        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => valid_attributes}, valid_session
+        put :update, {id: <%= file_name %>.to_param, <%= ns_file_name %>: valid_attributes}, valid_session
 <% else -%>
         put :update, params: {id: <%= file_name %>.to_param, <%= ns_file_name %>: valid_attributes}, session: valid_session
 <% end -%>
@@ -157,7 +157,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
       it "returns a success response (i.e. to display the 'edit' template)" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
 <% if Rails::VERSION::STRING < '5.0' -%>
-        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => invalid_attributes}, valid_session
+        put :update, {id: <%= file_name %>.to_param, <%= ns_file_name %>: invalid_attributes}, valid_session
 <% else -%>
         put :update, params: {id: <%= file_name %>.to_param, <%= ns_file_name %>: invalid_attributes}, session: valid_session
 <% end -%>
@@ -171,7 +171,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       expect {
 <% if Rails::VERSION::STRING < '5.0' -%>
-        delete :destroy, {:id => <%= file_name %>.to_param}, valid_session
+        delete :destroy, {id: <%= file_name %>.to_param}, valid_session
 <% else -%>
         delete :destroy, params: {id: <%= file_name %>.to_param}, session: valid_session
 <% end -%>
@@ -181,7 +181,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
     it "redirects to the <%= table_name %> list" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
 <% if Rails::VERSION::STRING < '5.0' -%>
-      delete :destroy, {:id => <%= file_name %>.to_param}, valid_session
+      delete :destroy, {id: <%= file_name %>.to_param}, valid_session
 <% else -%>
       delete :destroy, params: {id: <%= file_name %>.to_param}, session: valid_session
 <% end -%>

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

@@ -5,7 +5,7 @@ RSpec.describe "<%= ns_table_name %>/edit", <%= type_metatag(:view) %> do
   before(:each) do
     @<%= ns_file_name %> = assign(:<%= ns_file_name %>, <%= class_name %>.create!(<%= '))' if output_attributes.empty? %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
-      :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+      <%= attribute.name %>: <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <%= output_attributes.empty? ? "" : "    ))\n" -%>
   end

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

@@ -7,7 +7,7 @@ RSpec.describe "<%= ns_table_name %>/index", <%= type_metatag(:view) %> do
 <% [1,2].each_with_index do |id, model_index| -%>
       <%= class_name %>.create!(<%= output_attributes.empty? ? (model_index == 1 ? ')' : '),') : '' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
-        :<%= attribute.name %> => <%= value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+        <%= attribute.name %>: <%= value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <% if !output_attributes.empty? -%>
       <%= model_index == 1 ? ')' : '),' %>
@@ -19,7 +19,7 @@ RSpec.describe "<%= ns_table_name %>/index", <%= type_metatag(:view) %> do
   it "renders a list of <%= ns_table_name %>" do
     render
 <% for attribute in output_attributes -%>
-    assert_select "tr>td", :text => <%= value_for(attribute) %>.to_s, :count => 2
+    assert_select "tr>td", text: <%= value_for(attribute) %>.to_s, count: 2
 <% end -%>
   end
 end

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

@@ -5,7 +5,7 @@ RSpec.describe "<%= ns_table_name %>/new", <%= type_metatag(:view) %> do
   before(:each) do
     assign(:<%= ns_file_name %>, <%= class_name %>.new(<%= '))' if output_attributes.empty? %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
-      :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+      <%= attribute.name %>: <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <%= !output_attributes.empty? ? "    ))\n  end" : "  end" %>
 

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

@@ -5,43 +5,41 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:routing
   describe "routing" do
 <% unless options[:singleton] -%>
     it "routes to #index" do
-      expect(:get => "/<%= ns_table_name %>").to route_to("<%= ns_table_name %>#index")
+      expect(get: "/<%= ns_table_name %>").to route_to("<%= ns_table_name %>#index")
     end
 
 <% end -%>
 <% unless options[:api] -%>
     it "routes to #new" do
-      expect(:get => "/<%= ns_table_name %>/new").to route_to("<%= ns_table_name %>#new")
+      expect(get: "/<%= ns_table_name %>/new").to route_to("<%= ns_table_name %>#new")
     end
 
 <% end -%>
     it "routes to #show" do
-      expect(:get => "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#show", :id => "1")
+      expect(get: "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#show", id: "1")
     end
 
 <% unless options[:api] -%>
     it "routes to #edit" do
-      expect(:get => "/<%= ns_table_name %>/1/edit").to route_to("<%= ns_table_name %>#edit", :id => "1")
+      expect(get: "/<%= ns_table_name %>/1/edit").to route_to("<%= ns_table_name %>#edit", id: "1")
     end
 
 <% end -%>
 
     it "routes to #create" do
-      expect(:post => "/<%= ns_table_name %>").to route_to("<%= ns_table_name %>#create")
+      expect(post: "/<%= ns_table_name %>").to route_to("<%= ns_table_name %>#create")
     end
 
     it "routes to #update via PUT" do
-      expect(:put => "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#update", :id => "1")
+      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")
+      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")
+      expect(delete: "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#destroy", id: "1")
     end
   end
 end

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

@@ -5,7 +5,7 @@ RSpec.describe "<%= ns_table_name %>/show", <%= type_metatag(:view) %> do
   before(:each) do
     @<%= ns_file_name %> = assign(:<%= ns_file_name %>, <%= class_name %>.create!(<%= '))' if output_attributes.empty? %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
-      :<%= attribute.name %> => <%= value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+      <%= attribute.name %>: <%= value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <% if !output_attributes.empty? -%>
     ))

data/lib/generators/rspec/system/system_generator.rb

@@ -5,7 +5,7 @@ if ::Rails::VERSION::STRING >= '5.1'
     module Generators
       # @private
       class SystemGenerator < Base
-        class_option :system_specs, :type => :boolean, :default => true,  :desc => "Generate system specs"
+        class_option :system_specs, type: :boolean, default: true,  desc: "Generate system specs"
 
         def generate_system_spec
           return unless options[:system_specs]

data/lib/generators/rspec/view/view_generator.rb

@@ -4,9 +4,9 @@ module Rspec
   module Generators
     # @private
     class ViewGenerator < Base
-      argument :actions, :type => :array, :default => [], :banner => "action action"
+      argument :actions, type: :array, default: [], banner: "action action"
 
-      class_option :template_engine, :desc => "Template engine to generate view files"
+      class_option :template_engine, desc: "Template engine to generate view files"
 
       def create_view_specs
         empty_directory File.join("spec", "views", file_path)

data/lib/rspec-rails.rb

@@ -15,8 +15,7 @@ module RSpec
           SourceAnnotationExtractor::Annotation.register_directories("spec")
         end
       end
-      # Rails-3.0.1 requires config.app_generators instead of 3.0.0's config.generators
-      generators = config.respond_to?(:app_generators) ? config.app_generators : config.generators
+      generators = config.app_generators
       generators.integration_tool :rspec
       generators.test_framework :rspec
 
@@ -31,7 +30,7 @@ module RSpec
       # This is called after the environment has been loaded but before Rails
       # sets the default for the `preview_path`
       initializer "rspec_rails.action_mailer",
-                  :before => "action_mailer.set_configs" do |app|
+                  before: "action_mailer.set_configs" do |app|
         setup_preview_path(app)
       end
 
@@ -47,9 +46,7 @@ module RSpec
       def config_preview_path?(options)
         # We cannot use `respond_to?(:show_previews)` here as it will always
         # return `true`.
-        if ::Rails::VERSION::STRING < '4.2'
-          ::Rails.env.development?
-        elsif options.show_previews.nil?
+        if options.show_previews.nil?
           options.show_previews = ::Rails.env.development?
         else
           options.show_previews
@@ -74,7 +71,7 @@ module RSpec
         # not respond to the method. However, we cannot use
         # `config.action_mailer.respond_to?(:preview_path)` here as it will
         # always return `true`.
-        config.respond_to?(:action_mailer) && ::Rails::VERSION::STRING > '4.1'
+        config.respond_to?(:action_mailer)
       end
     end
   end

data/lib/rspec/rails/adapters.rb

@@ -19,68 +19,15 @@ module RSpec
     end
     private_class_method :disable_testunit_autorun
 
-    if ::Rails::VERSION::STRING >= '4.1.0'
-      if defined?(Kernel.gem)
-        gem 'minitest'
-      else
-        require 'minitest'
-      end
-      require 'minitest/assertions'
-      # Constant aliased to either Minitest or TestUnit, depending on what is
-      # loaded.
-      Assertions = Minitest::Assertions
-    elsif RUBY_VERSION >= '2.2.0'
-      # Minitest / TestUnit has been removed from ruby core. However, we are
-      # on an old Rails version and must load the appropriate gem
-      if ::Rails::VERSION::STRING >= '4.0.0'
-        # ActiveSupport 4.0.x has the minitest '~> 4.2' gem as a dependency
-        # This gem has no `lib/minitest.rb` file.
-        gem 'minitest' if defined?(Kernel.gem)
-        require 'minitest/unit'
-        Assertions = MiniTest::Assertions
-      elsif ::Rails::VERSION::STRING >= '3.2.21'
-        # TODO: Change the above check to >= '3.2.22' once it's released
-        begin
-          # Test::Unit "helpfully" sets up autoload for its `AutoRunner`.
-          # While we do not reference it directly, when we load the `TestCase`
-          # classes from AS (ActiveSupport), AS kindly references `AutoRunner`
-          # for everyone.
-          #
-          # To handle this we need to pre-emptively load 'test/unit' and make
-          # sure the version installed has `AutoRunner` (the 3.x line does to
-          # date). If so, we turn the auto runner off.
-          require 'test/unit'
-          require 'test/unit/assertions'
-          disable_testunit_autorun
-        rescue LoadError => e
-          raise LoadError, <<-ERR.squish, e.backtrace
-            Ruby 2.2+ has removed test/unit from the core library. Rails
-            requires this as a dependency. Please add test-unit gem to your
-            Gemfile: `gem 'test-unit', '~> 3.0'` (#{e.message})"
-          ERR
-        end
-        Assertions = Test::Unit::Assertions
-      else
-        abort <<-MSG.squish
-          Ruby 2.2+ is not supported on Rails #{::Rails::VERSION::STRING}.
-          Check the Rails release notes for the appropriate update with
-          support.
-        MSG
-      end
+    if defined?(Kernel.gem)
+      gem 'minitest'
     else
-      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
-      # Turn off test unit's auto runner for those using the gem
-      disable_testunit_autorun
-      # Constant aliased to either Minitest or TestUnit, depending on what is
-      # loaded.
-      Assertions = Test::Unit::Assertions
+      require 'minitest'
     end
+    require 'minitest/assertions'
+    # Constant aliased to either Minitest or TestUnit, depending on what is
+    # loaded.
+    Assertions = Minitest::Assertions
 
     # @private
     class AssertionDelegator < Module
@@ -199,12 +146,11 @@ module RSpec
         # examples without exposing non-assertion methods in Test::Unit or
         # Minitest.
         def assertion_method_names
-          methods = ::RSpec::Rails::Assertions.
+          ::RSpec::Rails::Assertions.
             public_instance_methods.
             select do |m|
               m.to_s =~ /^(assert|flunk|refute)/
             end
-          methods + test_unit_specific_methods
         end
 
         def define_assertion_delegators
@@ -214,18 +160,6 @@ module RSpec
             end
           end
         end
-
-        # Starting on Rails 4, Minitest is the default testing framework so no
-        # need to add TestUnit specific methods.
-        if ::Rails::VERSION::STRING >= '4.0.0'
-          def test_unit_specific_methods
-            []
-          end
-        else
-          def test_unit_specific_methods
-            [:build_message]
-          end
-        end
       end
 
       class AssertionDelegator

data/lib/rspec/rails/configuration.rb

@@ -25,33 +25,33 @@ module RSpec
     #
     # @api private
     DIRECTORY_MAPPINGS = {
-      :channel    => %w[spec channels],
-      :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)],
-      :routing    => %w[spec routing],
-      :view       => %w[spec views],
-      :feature    => %w[spec features],
-      :system     => %w[spec system],
-      :mailbox    => %w[spec mailboxes]
+      channel:    %w[spec channels],
+      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)],
+      routing:    %w[spec routing],
+      view:       %w[spec views],
+      feature:    %w[spec features],
+      system:     %w[spec system],
+      mailbox:    %w[spec mailboxes]
     }
 
     # Sets up the different example group modules for the different spec types
     #
     # @api private
     def self.add_test_type_configurations(config)
-      config.include RSpec::Rails::ControllerExampleGroup, :type => :controller
-      config.include RSpec::Rails::HelperExampleGroup,     :type => :helper
-      config.include RSpec::Rails::ModelExampleGroup,      :type => :model
-      config.include RSpec::Rails::RequestExampleGroup,    :type => :request
-      config.include RSpec::Rails::RoutingExampleGroup,    :type => :routing
-      config.include RSpec::Rails::ViewExampleGroup,       :type => :view
-      config.include RSpec::Rails::FeatureExampleGroup,    :type => :feature
+      config.include RSpec::Rails::ControllerExampleGroup, type: :controller
+      config.include RSpec::Rails::HelperExampleGroup,     type: :helper
+      config.include RSpec::Rails::ModelExampleGroup,      type: :model
+      config.include RSpec::Rails::RequestExampleGroup,    type: :request
+      config.include RSpec::Rails::RoutingExampleGroup,    type: :routing
+      config.include RSpec::Rails::ViewExampleGroup,       type: :view
+      config.include RSpec::Rails::FeatureExampleGroup,    type: :feature
       config.include RSpec::Rails::Matchers
-      config.include RSpec::Rails::SystemExampleGroup, :type => :system
+      config.include RSpec::Rails::SystemExampleGroup, type: :system
     end
 
     # @private
@@ -61,10 +61,10 @@ module RSpec
       config.backtrace_exclusion_patterns << %r{lib/rspec/rails}
 
       # controller settings
-      config.add_setting :infer_base_class_for_anonymous_controllers, :default => true
+      config.add_setting :infer_base_class_for_anonymous_controllers, default: true
 
       # fixture support
-      config.add_setting :use_transactional_fixtures, :alias_with => :use_transactional_examples
+      config.add_setting :use_transactional_fixtures, alias_with: :use_transactional_examples
       config.add_setting :use_instantiated_fixtures
       config.add_setting :global_fixtures
       config.add_setting :fixture_path
@@ -80,7 +80,7 @@ module RSpec
       config.include RSpec::Rails::FixtureSupport
 
       if ::Rails::VERSION::STRING > '5'
-        config.add_setting :file_fixture_path, :default => 'spec/fixtures/files'
+        config.add_setting :file_fixture_path, default: 'spec/fixtures/files'
         config.include RSpec::Rails::FileFixtureSupport
       end
 
@@ -93,7 +93,7 @@ module RSpec
       # as a getter. This makes it easier for rspec-rails users because we use
       # `render_views` directly in example groups, so this aligns the two APIs,
       # but requires this workaround:
-      config.add_setting :rendering_views, :default => false
+      config.add_setting :rendering_views, default: false
 
       config.instance_exec do
         def render_views=(val)
@@ -111,7 +111,7 @@ module RSpec
         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|
+            define_derived_metadata(file_path: escaped_path) do |metadata|
               metadata[:type] ||= type
             end
           end
@@ -129,26 +129,26 @@ module RSpec
 
       if defined?(::Rails::Controller::Testing)
         [:controller, :view, :request].each do |type|
-          config.include ::Rails::Controller::Testing::TestProcess, :type => type
-          config.include ::Rails::Controller::Testing::TemplateAssertions, :type => type
-          config.include ::Rails::Controller::Testing::Integration, :type => type
+          config.include ::Rails::Controller::Testing::TestProcess, type: type
+          config.include ::Rails::Controller::Testing::TemplateAssertions, type: type
+          config.include ::Rails::Controller::Testing::Integration, type: type
         end
       end
 
       if RSpec::Rails::FeatureCheck.has_action_mailer?
-        config.include RSpec::Rails::MailerExampleGroup, :type => :mailer
+        config.include RSpec::Rails::MailerExampleGroup, type: :mailer
       end
 
       if RSpec::Rails::FeatureCheck.has_active_job?
-        config.include RSpec::Rails::JobExampleGroup, :type => :job
+        config.include RSpec::Rails::JobExampleGroup, type: :job
       end
 
       if RSpec::Rails::FeatureCheck.has_action_cable_testing?
-        config.include RSpec::Rails::ChannelExampleGroup, :type => :channel
+        config.include RSpec::Rails::ChannelExampleGroup, type: :channel
       end
 
       if RSpec::Rails::FeatureCheck.has_action_mailbox?
-        config.include RSpec::Rails::MailboxExampleGroup, :type => :mailbox
+        config.include RSpec::Rails::MailboxExampleGroup, type: :mailbox
       end
     end
     # rubocop:enable Metrics/MethodLength