rspec-rails 3.0.0.beta2 → 3.0.0.rc1

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% module_namespacing do -%>
-describe <%= class_name %>Controller do
+describe <%= class_name %>Controller, :type => :controller do
 
 <% for action in actions -%>
   describe "GET '<%= action %>'" do

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

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe "<%= file_name %>/<%= @action %>.html.<%= options[:template_engine] %>" do
+describe "<%= file_name %>/<%= @action %>.html.<%= options[:template_engine] %>", :type => :view do
   pending "add some examples to (or delete) #{__FILE__}"
 end

data/lib/generators/rspec/feature/templates/feature_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-feature "<%= class_name.pluralize %>" do
+feature "<%= class_name.pluralize %>", :type => :feature do
   pending "add some scenarios (or delete) #{__FILE__}"
 end

data/lib/generators/rspec/helper/templates/helper_spec.rb

@@ -11,7 +11,7 @@ require 'spec_helper'
 #   end
 # end
 <% module_namespacing do -%>
-describe <%= class_name %>Helper do
+describe <%= class_name %>Helper, :type => :helper do
   pending "add some examples to (or delete) #{__FILE__}"
 end
 <% end -%>

data/lib/generators/rspec/install/templates/spec/spec_helper.rb.tt

@@ -12,7 +12,12 @@ require 'rspec/rails'
 # option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
 Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 
-<% if ::Rails::VERSION::STRING >= '4' -%>
+<% if ::Rails::VERSION::STRING >= '4.1' -%>
+# Checks for pending migrations before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.maintain_test_schema!
+
+<% elsif ::Rails::VERSION::STRING >= '4' -%>
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
@@ -40,4 +45,19 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = "random"
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explictly tag your specs with their type, e.g.:
+  #
+  #     describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/v/3-0/docs
+  config.infer_spec_type_from_file_location!
 end

data/lib/generators/rspec/integration/templates/request_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "<%= class_name.pluralize %>" do
+describe "<%= class_name.pluralize %>", :type => :request do
   describe "GET /<%= table_name %>" do
     it "works! (now write some real specs)" do
       get <%= index_helper %>_path

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 <% module_namespacing do -%>
-describe <%= class_name %> do
+describe <%= class_name %>, :type => :mailer do
 <% for action in actions -%>
   describe "<%= action %>" do
     let(:mail) { <%= class_name %>.<%= action %> }

data/lib/generators/rspec/model/templates/model_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% module_namespacing do -%>
-describe <%= class_name %> do
+describe <%= class_name %>, :type => :model do
   pending "add some examples to (or delete) #{__FILE__}"
 end
 <% end -%>

data/lib/generators/rspec/observer/templates/observer_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% module_namespacing do -%>
-describe <%= class_name %>Observer do
+describe <%= class_name %>Observer, :type => :observer do
   pending "add some examples to (or delete) #{__FILE__}"
 end
 <% end -%>

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

@@ -19,7 +19,7 @@ require 'spec_helper'
 # that an instance is receiving a specific message.
 
 <% module_namespacing do -%>
-describe <%= controller_class_name %>Controller do
+describe <%= controller_class_name %>Controller, :type => :controller do
 
   # This should return the minimal set of attributes required to create a valid
   # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
@@ -134,7 +134,11 @@ describe <%= controller_class_name %>Controller do
       it "assigns the <%= ns_file_name %> as @<%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
-        allow_any_instance_of(<%= class_name %>).to receive(:save).and_return(false)
+        <%- if ::Rails::VERSION::STRING >= '4' -%>
+        allow_any_instance_of(<%= class_name %>).to receive(:update).and_return(false)
+        <%- else -%>
+        allow_any_instance_of(<%= class_name %>).to receive(:update_attributes).and_return(false)
+        <%- end -%>
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
         expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
       end
@@ -142,7 +146,11 @@ describe <%= controller_class_name %>Controller do
       it "re-renders the 'edit' template" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
-        allow_any_instance_of(<%= class_name %>).to receive(:save).and_return(false)
+        <%- if ::Rails::VERSION::STRING >= '4' -%>
+        allow_any_instance_of(<%= class_name %>).to receive(:update).and_return(false)
+        <%- else -%>
+        allow_any_instance_of(<%= class_name %>).to receive(:update_attributes).and_return(false)
+        <%- end -%>
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
         expect(response).to render_template("edit")
       end

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

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/edit" do
+describe "<%= ns_table_name %>/edit", :type => :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 -%>
@@ -15,7 +15,8 @@ describe "<%= ns_table_name %>/edit" do
 
     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 %>
+      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= name %>[name=?]", "<%= ns_file_name %>[<%= name %>]"
 <% end -%>
     end
   end

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

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/index" do
+describe "<%= ns_table_name %>/index", :type => :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 -%>

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

@@ -1,20 +1,21 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/new" do
+describe "<%= ns_table_name %>/new", :type => :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
 
     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 %>
+      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= name %>[name=?]", "<%= ns_file_name %>[<%= name %>]"
 <% end -%>
     end
   end

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 <% module_namespacing do -%>
-describe <%= controller_class_name %>Controller do
+describe <%= controller_class_name %>Controller, :type => :routing do
   describe "routing" do
 
 <% unless options[:singleton] -%>

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

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/show" do
+describe "<%= ns_table_name %>/show", :type => :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 -%>

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

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

data/lib/rspec/rails.rb

@@ -1,17 +1,10 @@
 require 'rspec/core'
-require 'rspec/collection_matchers'
-
-RSpec::configure do |c|
-  c.backtrace_exclusion_patterns << /vendor\//
-  c.backtrace_exclusion_patterns << /lib\/rspec\/rails/
-end
-
 require 'rails/version'
 require 'rspec/rails/extensions'
 require 'rspec/rails/view_rendering'
 require 'rspec/rails/adapters'
 require 'rspec/rails/matchers'
 require 'rspec/rails/fixture_support'
-require 'rspec/rails/mocks'
 require 'rspec/rails/example'
 require 'rspec/rails/vendor/capybara'
+require 'rspec/rails/configuration'

data/lib/rspec/rails/configuration.rb

@@ -0,0 +1,72 @@
+module RSpec
+  module Rails
+    # @private
+    def self.initialize_configuration(config)
+      config.backtrace_exclusion_patterns << /vendor\//
+      config.backtrace_exclusion_patterns << /lib\/rspec\/rails/
+
+      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
+
+      if defined?(RSpec::Rails::MailerExampleGroup)
+        config.include RSpec::Rails::MailerExampleGroup, :type => :mailer
+      end
+
+      # controller settings
+      config.add_setting :infer_base_class_for_anonymous_controllers, :default => true
+
+      # fixture support
+      config.include     RSpec::Rails::FixtureSupport
+      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
+
+      # view rendering settings
+      # This allows us to expose `render_views` as a config option even though it
+      # breaks the convention of other options by using `render_views` as a
+      # command (i.e. render_views = true), where it would normally be used 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
+
+      def config.render_views=(val)
+        self.rendering_views = val
+      end
+
+      def config.render_views
+        self.rendering_views = true
+      end
+
+      def config.render_views?
+        rendering_views
+      end
+
+      def config.infer_spec_type_from_file_location!
+        {
+          :controller => %w[spec controllers],
+          :helper     => %w[spec helpers],
+          :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]
+        }.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
+
+    initialize_configuration RSpec.configuration
+  end
+end

data/lib/rspec/rails/example.rb

@@ -7,67 +7,3 @@ 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/feature_example_group'
-
-RSpec::configure do |c|
-  def c.escaped_path(*parts)
-    Regexp.compile(parts.join('[\\\/]') + '[\\\/]')
-  end
-
-  controller_path_regex = c.escaped_path(%w[spec controllers])
-  c.include RSpec::Rails::ControllerExampleGroup,
-    :type          => :controller,
-    :example_group => lambda { |example_group, metadata|
-      metadata[:type].nil? && controller_path_regex =~ example_group[:file_path]
-    }
-
-  helper_path_regex = c.escaped_path(%w[spec helpers])
-  c.include RSpec::Rails::HelperExampleGroup,
-    :type          => :helper,
-    :example_group => lambda { |example_group, metadata|
-      metadata[:type].nil? && helper_path_regex =~ example_group[:file_path]
-    }
-
-  mailer_path_regex = c.escaped_path(%w[spec mailers])
-  if defined?(RSpec::Rails::MailerExampleGroup)
-    c.include RSpec::Rails::MailerExampleGroup,
-      :type          => :mailer,
-      :example_group => lambda { |example_group, metadata|
-        metadata[:type].nil? && mailer_path_regex =~ example_group[:file_path]
-      }
-  end
-
-  model_path_regex = c.escaped_path(%w[spec models])
-  c.include RSpec::Rails::ModelExampleGroup,
-    :type          => :model,
-    :example_group => lambda { |example_group, metadata|
-      metadata[:type].nil? && model_path_regex =~ example_group[:file_path]
-    }
-
-  request_path_regex = c.escaped_path(%w[spec (requests|integration|api)])
-  c.include RSpec::Rails::RequestExampleGroup,
-    :type          => :request,
-    :example_group => lambda { |example_group, metadata|
-      metadata[:type].nil? && request_path_regex =~ example_group[:file_path]
-    }
-
-  routing_path_regex = c.escaped_path(%w[spec routing])
-  c.include RSpec::Rails::RoutingExampleGroup,
-    :type          => :routing,
-    :example_group => lambda { |example_group, metadata|
-      metadata[:type].nil? && routing_path_regex =~ example_group[:file_path]
-    }
-
-  view_path_regex = c.escaped_path(%w[spec views])
-  c.include RSpec::Rails::ViewExampleGroup,
-    :type          => :view,
-    :example_group => lambda { |example_group, metadata|
-      metadata[:type].nil? && view_path_regex =~ example_group[:file_path]
-    }
-
-  feature_example_regex = c.escaped_path(%w[spec features])
-  c.include RSpec::Rails::FeatureExampleGroup,
-    :type          => :feature,
-    :example_group => lambda { |example_group, metadata|
-      metadata[:type].nil? && feature_example_regex =~ example_group[:file_path]
-    }
-end

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

@@ -1,7 +1,3 @@
-RSpec.configure do |config|
-  config.add_setting :infer_base_class_for_anonymous_controllers, :default => true
-end
-
 module RSpec::Rails
   module ControllerExampleGroup
     extend ActiveSupport::Concern
@@ -60,7 +56,7 @@ module RSpec::Rails
         end
         base_class ||= defined?(ApplicationController) ? ApplicationController : ActionController::Base
 
-        metadata[:example_group][:described_class] = Class.new(base_class) do
+        new_controller_class = Class.new(base_class) do
           def self.name
             root_controller = defined?(ApplicationController) ? ApplicationController : ActionController::Base
             if superclass == root_controller || superclass.abstract?
@@ -70,15 +66,25 @@ module RSpec::Rails
             end
           end
         end
-        metadata[:example_group][:described_class].class_eval(&body)
+        new_controller_class.class_eval(&body)
+        (class << self; self; end).__send__(:define_method, :controller_class) { new_controller_class }
 
         before do
           @orig_routes = self.routes
           resource_name = @controller.respond_to?(:controller_name) ?
             @controller.controller_name.to_sym : :anonymous
-          self.routes  = ActionDispatch::Routing::RouteSet.new.tap { |r|
-            r.draw { resources resource_name }
-          }
+          resource_path = @controller.respond_to?(:controller_path) ?
+            @controller.controller_path : resource_name.to_s
+          resource_module = resource_path.rpartition('/').first.presence
+          resource_as = 'anonymous_' + resource_path.tr('/', '_')
+          self.routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
+            r.draw do
+              resources resource_name,
+                :as => resource_as,
+                :module => resource_module,
+                :path => resource_path
+            end
+          end
         end
 
         after do
@@ -119,7 +125,7 @@ module RSpec::Rails
     end
 
     # Extends the controller with a module that overrides
-    # `rescue_with_handler` to raise the exception passed to it.  Use this to
+    # `rescue_with_handler` to raise the exception passed to it. Use this to
     # specify that an action _should_ raise an exception given appropriate
     # conditions.
     #
@@ -155,8 +161,6 @@ module RSpec::Rails
     included do
       subject { controller }
 
-      metadata[:type] = :controller
-
       before do
         self.routes = ::Rails.application.routes
       end