rspec-rails 2.14.2 → 3.9.1

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

@@ -1,9 +1,9 @@
-require 'spec_helper'
+require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/edit" do
+RSpec.describe "<%= ns_table_name %>/edit", <%= type_metatag(:view) %> do
   before(:each) do
-    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
+    @<%= 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 ? '' : ','%>
 <% end -%>
@@ -13,19 +13,15 @@ describe "<%= ns_table_name %>/edit" do
   it "renders the edit <%= ns_file_name %> form" do
     render
 
-<% if webrat? -%>
-    rendered.should have_selector("form", :action => <%= ns_file_name %>_path(@<%= ns_file_name %>), :method => "post") do |form|
-<% for attribute in output_attributes -%>
-      form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
-<% end -%>
-    end
-<% else -%>
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "form[action=?][method=?]", <%= ns_file_name %>_path(@<%= ns_file_name %>), "post" do
 <% for attribute in output_attributes -%>
-      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>[name=?]", "<%= ns_file_name %>[<%= attribute.name %>]"
+      <%- name = attribute.respond_to?(:column_name) ? attribute.column_name : attribute.name %>
+<% if Rails.version.to_f >= 5.1 -%>
+      assert_select "<%= attribute.input_type -%>[name=?]", "<%= ns_file_name %>[<%= name %>]"
+<% else -%>
+      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= name %>[name=?]", "<%= ns_file_name %>[<%= name %>]"
 <% end -%>
-    end
 <% end -%>
+    end
   end
 end

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

@@ -1,11 +1,11 @@
-require 'spec_helper'
+require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/index" do
+RSpec.describe "<%= ns_table_name %>/index", <%= type_metatag(:view) %> do
   before(:each) do
     assign(:<%= table_name %>, [
 <% [1,2].each_with_index do |id, model_index| -%>
-      stub_model(<%= class_name %><%= output_attributes.empty? ? (model_index == 1 ? ')' : '),') : ',' %>
+      <%= 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 ? '' : ','%>
 <% end -%>
@@ -18,15 +18,8 @@ describe "<%= ns_table_name %>/index" do
 
   it "renders a list of <%= ns_table_name %>" do
     render
-<% unless webrat? -%>
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-<% end -%>
 <% for attribute in output_attributes -%>
-<% if webrat? -%>
-    rendered.should have_selector("tr>td", :content => <%= value_for(attribute) %>.to_s, :count => 2)
-<% else -%>
     assert_select "tr>td", :text => <%= value_for(attribute) %>.to_s, :count => 2
-<% end -%>
 <% end -%>
   end
 end

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

@@ -1,30 +1,26 @@
-require 'spec_helper'
+require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/new" do
+RSpec.describe "<%= ns_table_name %>/new", <%= type_metatag(:view) %> do
   before(:each) do
-    assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? ').as_new_record)' : ',' %>
+    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 ? '' : ','%>
 <% end -%>
-<%= !output_attributes.empty? ? "    ).as_new_record)\n  end" : "  end" %>
+<%= !output_attributes.empty? ? "    ))\n  end" : "  end" %>
 
   it "renders new <%= ns_file_name %> form" do
     render
 
-<% if webrat? -%>
-    rendered.should have_selector("form", :action => <%= table_name %>_path, :method => "post") do |form|
-<% for attribute in output_attributes -%>
-      form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
-<% end -%>
-    end
-<% else -%>
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "form[action=?][method=?]", <%= index_helper %>_path, "post" do
 <% for attribute in output_attributes -%>
-      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>[name=?]", "<%= ns_file_name %>[<%= attribute.name %>]"
+      <%- name = attribute.respond_to?(:column_name) ? attribute.column_name : attribute.name %>
+<% if Rails.version.to_f >= 5.1 -%>
+      assert_select "<%= attribute.input_type -%>[name=?]", "<%= ns_file_name %>[<%= name %>]"
+<% else -%>
+      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= name %>[name=?]", "<%= ns_file_name %>[<%= name %>]"
 <% end -%>
-    end
 <% end -%>
+    end
   end
 end

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

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

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

@@ -1,9 +1,9 @@
-require 'spec_helper'
+require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/show" do
+RSpec.describe "<%= ns_table_name %>/show", <%= type_metatag(:view) %> do
   before(:each) do
-    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
+    @<%= 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 ? '' : ','%>
 <% end -%>
@@ -14,15 +14,8 @@ describe "<%= ns_table_name %>/show" do
 
   it "renders attributes in <p>" do
     render
-<% unless webrat? -%>
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-<% end -%>
 <% for attribute in output_attributes -%>
-<% if webrat? -%>
-    rendered.should contain(<%= value_for(attribute) %>.to_s)
-<% else -%>
-    rendered.should match(/<%= eval(value_for(attribute)) %>/)
-<% end -%>
+    expect(rendered).to match(/<%= raw_value_for(attribute) %>/)
 <% end -%>
   end
 end

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

@@ -0,0 +1,26 @@
+require 'generators/rspec'
+
+if ::Rails::VERSION::STRING >= '5.1'
+  module Rspec
+    module Generators
+      # @private
+      class SystemGenerator < Base
+        class_option :system_specs, :type => :boolean, :default => true,  :desc => "Generate system specs"
+
+        def generate_system_spec
+          return unless options[:system_specs]
+
+          template template_name, File.join('spec/system', class_path, filename)
+        end
+
+        def template_name
+          'system_spec.rb'
+        end
+
+        def filename
+          "#{table_name}_spec.rb"
+        end
+      end
+    end
+  end
+end

data/lib/generators/rspec/system/templates/system_spec.rb

@@ -0,0 +1,9 @@
+require 'rails_helper'
+
+RSpec.describe "<%= class_name.pluralize %>", <%= type_metatag(:system) %> do
+  before do
+    driven_by(:rack_test)
+  end
+
+  pending "add some scenarios (or delete) #{__FILE__}"
+end

data/lib/generators/rspec/view/templates/view_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe "<%= file_path %>/<%= @action %>" do
+RSpec.describe "<%= file_path %>/<%= @action %>", <%= type_metatag(:view) %> do
   pending "add some examples to (or delete) #{__FILE__}"
 end

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

@@ -2,6 +2,7 @@ require 'generators/rspec'
 
 module Rspec
   module Generators
+    # @private
     class ViewGenerator < Base
       argument :actions, :type => :array, :default => [], :banner => "action action"
 

data/lib/generators/rspec.rb

@@ -1,10 +1,22 @@
 require 'rails/generators/named_base'
+require 'rspec/rails/feature_check'
 
+# @private
+# Weirdly named generators namespace (should be `RSpec`) for compatability with
+# rails loading.
 module Rspec
+  # @private
   module Generators
+    # @private
     class Base < ::Rails::Generators::NamedBase
-      def self.source_root
-        @_rspec_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'rspec', generator_name, 'templates'))
+      include RSpec::Rails::FeatureCheck
+
+      def self.source_root(path = nil)
+        if path
+          @_rspec_source_root = path
+        else
+          @_rspec_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'rspec', generator_name, 'templates'))
+        end
       end
 
       if ::Rails::VERSION::STRING < '3.1'
@@ -16,15 +28,17 @@ module Rspec
   end
 end
 
+# @private
 module Rails
   module Generators
+    # @private
     class GeneratedAttribute
       def input_type
         @input_type ||= if type == :text
-          "textarea"
-        else
-          "input"
-        end
+                          "textarea"
+                        else
+                          "input"
+                        end
       end
     end
   end

data/lib/rspec/rails/active_record.rb

@@ -0,0 +1,25 @@
+module RSpec
+  module Rails
+    # Fake class to document RSpec ActiveRecord configuration options. In practice,
+    # these are dynamically added to the normal RSpec configuration object.
+    class ActiveRecordConfiguration
+      # @private
+      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) && (::RSpec::Mocks.respond_to?(:configuration))
+            ::RSpec::Mocks.configuration.when_declaring_verifying_double do |possible_model|
+              target = possible_model.target
+
+              if Class === target && ActiveRecord::Base > target && !target.abstract_class?
+                target.define_attribute_methods
+              end
+            end
+          end
+        end
+      end
+
+      initialize_activerecord_configuration RSpec.configuration
+    end
+  end
+end

data/lib/rspec/rails/adapters.rb

@@ -1,13 +1,72 @@
 require 'delegate'
 require 'active_support'
 require 'active_support/concern'
+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
+      # used. The implementation of test-unit included with Ruby has neither
+      # method.
+      if defined?(Test::Unit::AutoRunner.need_auto_run = ())
+        Test::Unit::AutoRunner.need_auto_run = false
+      elsif defined?(Test::Unit.run = ())
+        Test::Unit.run = false
+      end
+    end
+    private_class_method :disable_testunit_autorun
+
     if ::Rails::VERSION::STRING >= '4.1.0'
-      gem 'minitest'
+      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
     else
       begin
         require 'test/unit/assertions'
@@ -16,12 +75,15 @@ module RSpec
         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
     end
 
-    # @api private
+    # @private
     class AssertionDelegator < Module
-      # @api private
       def initialize(*assertion_modules)
         assertion_class = Class.new(SimpleDelegator) do
           include ::RSpec::Rails::Assertions
@@ -30,12 +92,10 @@ module RSpec
         end
 
         super() do
-          # @api private
           define_method :build_assertion_instance do
             assertion_class.new(self)
           end
 
-          # @api private
           def assertion_instance
             @assertion_instance ||= build_assertion_instance
           end
@@ -43,11 +103,9 @@ module RSpec
           assertion_modules.each do |mod|
             mod.public_instance_methods.each do |method|
               next if method == :method_missing || method == "method_missing"
-              class_eval <<-EOM, __FILE__, __LINE__ + 1
-                def #{method}(*args, &block)
-                  assertion_instance.send(:#{method}, *args, &block)
-                end
-              EOM
+              define_method(method.to_sym) do |*args, &block|
+                assertion_instance.send(method.to_sym, *args, &block)
+              end
             end
           end
         end
@@ -56,7 +114,7 @@ module RSpec
 
     # Adapts example groups for `Minitest::Test::LifecycleHooks`
     #
-    # @api private
+    # @private
     module MinitestLifecycleAdapter
       extend ActiveSupport::Concern
 
@@ -84,29 +142,22 @@ module RSpec
       end
     end
 
-    # @api private
+    # @private
     module MinitestCounters
-      # @api private
+      attr_writer :assertions
       def assertions
         @assertions ||= 0
       end
-
-      # @api private
-      def assertions=(assertions)
-        @assertions = assertions
-      end
     end
 
-    # @api private
+    # @private
     module SetupAndTeardownAdapter
       extend ActiveSupport::Concern
 
       module ClassMethods
-        # @api private
-        #
         # Wraps `setup` calls from within Rails' testing framework in `before`
         # hooks.
-        def setup(*methods)
+        def setup(*methods, &block)
           methods.each do |method|
             if method.to_s =~ /^setup_(with_controller|fixtures|controller_request_and_response)$/
               prepend_before { __send__ method }
@@ -114,18 +165,24 @@ module RSpec
               before         { __send__ method }
             end
           end
+          before(&block) if block
         end
 
         # @api private
         #
         # Wraps `teardown` calls from within Rails' testing framework in
         # `after` hooks.
-        def teardown(*methods)
+        def teardown(*methods, &block)
           methods.each { |method| after { __send__ method } }
+          after(&block) if block
         end
       end
 
-      # @api private
+      def initialize(*args)
+        super
+        @example = nil
+      end
+
       def method_name
         @example
       end
@@ -135,36 +192,46 @@ module RSpec
     module MinitestAssertionAdapter
       extend ActiveSupport::Concern
 
+      # @private
       module ClassMethods
-        # @api private
-        #
         # Returns the names of assertion methods that we want to expose to
         # examples without exposing non-assertion methods in Test::Unit or
         # Minitest.
         def assertion_method_names
-          ::RSpec::Rails::Assertions.public_instance_methods.select{|m| m.to_s =~ /^(assert|flunk|refute)/} +
-            [:build_message]
+          methods = ::RSpec::Rails::Assertions.
+            public_instance_methods.
+            select do |m|
+              m.to_s =~ /^(assert|flunk|refute)/
+            end
+          methods + test_unit_specific_methods
         end
 
-        # @api private
         def define_assertion_delegators
           assertion_method_names.each do |m|
-            class_eval <<-CODE, __FILE__, __LINE__ + 1
-              def #{m}(*args, &block)
-                assertion_delegator.send :#{m}, *args, &block
-              end
-            CODE
+            define_method(m.to_sym) do |*args, &block|
+              assertion_delegator.send(m.to_sym, *args, &block)
+            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
 
-      # @api private
       class AssertionDelegator
         include ::RSpec::Rails::Assertions
         include ::RSpec::Rails::MinitestCounters
       end
 
-      # @api private
       def assertion_delegator
         @assertion_delegator ||= AssertionDelegator.new
       end
@@ -177,7 +244,7 @@ module RSpec
     # Backwards compatibility. It's unlikely that anyone is using this
     # constant, but we had forgotten to mark it as `@private` earlier
     #
-    # @api private
+    # @private
     TestUnitAssertionAdapter = MinitestAssertionAdapter
   end
 end