rspec-rails 2.11.4 → 2.12.0

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

@@ -18,13 +18,14 @@ require 'spec_helper'
 # Message expectations are only used when there is no simpler way to specify
 # that an instance is receiving a specific message.
 
+<% module_namespacing do -%>
 describe <%= controller_class_name %>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
   # update the return value of this method accordingly.
   def valid_attributes
-    {}
+    <%= formatted_hash(example_valid_attributes) %>
   end
 
   # This should return the minimal set of values that should be in the session
@@ -91,14 +92,14 @@ describe <%= controller_class_name %>Controller do
       it "assigns a newly created but unsaved <%= ns_file_name %> as @<%= ns_file_name %>" do
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
-        post :create, {:<%= ns_file_name %> => {}}, valid_session
+        post :create, {:<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
         assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
-        post :create, {:<%= ns_file_name %> => {}}, valid_session
+        post :create, {:<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
         response.should render_template("new")
       end
     end
@@ -112,8 +113,8 @@ describe <%= controller_class_name %>Controller do
         # specifies that the <%= class_name %> created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        <%= class_name %>.any_instance.should_receive(:update_attributes).with(<%= params %>)
-        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= params %>}, valid_session
+        <%= class_name %>.any_instance.should_receive(:update_attributes).with(<%= formatted_hash(example_params_for_update) %>)
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_params_for_update) %>}, valid_session
       end
 
       it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
@@ -134,7 +135,7 @@ describe <%= controller_class_name %>Controller do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
-        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => {}}, valid_session
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
         assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
       end
 
@@ -142,7 +143,7 @@ describe <%= controller_class_name %>Controller do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
-        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => {}}, valid_session
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
         response.should render_template("edit")
       end
     end
@@ -164,3 +165,4 @@ describe <%= controller_class_name %>Controller do
   end
 
 end
+<% end -%>

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

@@ -1,5 +1,6 @@
 require "spec_helper"
 
+<% module_namespacing do -%>
 describe <%= controller_class_name %>Controller do
   describe "routing" do
 
@@ -35,3 +36,4 @@ describe <%= controller_class_name %>Controller do
 
   end
 end
+<% end -%>

data/lib/rspec/rails/example.rb

@@ -6,6 +6,7 @@ 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/feature_example_group'
 
 RSpec::configure do |c|
   def c.escaped_path(*parts)
@@ -27,7 +28,7 @@ RSpec::configure do |c|
     :file_path => c.escaped_path(%w[spec models])
   }
   c.include RSpec::Rails::RequestExampleGroup, :type => :request, :example_group => {
-    :file_path => c.escaped_path(%w[spec (requests|integration)])
+    :file_path => c.escaped_path(%w[spec (requests|integration|api)])
   }
   c.include RSpec::Rails::RoutingExampleGroup, :type => :routing, :example_group => {
     :file_path => c.escaped_path(%w[spec routing])
@@ -35,4 +36,7 @@ RSpec::configure do |c|
   c.include RSpec::Rails::ViewExampleGroup, :type => :view, :example_group => {
     :file_path => c.escaped_path(%w[spec views])
   }
+  c.include RSpec::Rails::FeatureExampleGroup, :type => :feature, :example_group => {
+    :file_path => c.escaped_path(%w[spec features])
+  }
 end

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

@@ -0,0 +1,30 @@
+module RSpec::Rails
+  module FeatureExampleGroup
+    extend ActiveSupport::Concern
+    include RSpec::Rails::RailsExampleGroup
+
+    DEFAULT_HOST = "www.example.com"
+
+    included do
+      metadata[:type] = :feature
+
+      app = ::Rails.application
+      if app.respond_to?(:routes)
+        include app.routes.url_helpers     if app.routes.respond_to?(:url_helpers)
+        include app.routes.mounted_helpers if app.routes.respond_to?(:mounted_helpers)
+
+        if respond_to?(:default_url_options)
+          default_url_options[:host] ||= ::RSpec::Rails::FeatureExampleGroup::DEFAULT_HOST
+        end
+      end
+    end
+
+    def visit(*)
+      if defined?(super)
+        super
+      else
+        raise "Capybara not loaded, please add it to your Gemfile:\n\ngem \"capybara\""
+      end
+    end
+  end
+end

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

@@ -88,7 +88,15 @@ module RSpec::Rails
 
       # @deprecated Use `rendered` instead.
       def response
-        RSpec.deprecate("response", "rendered")
+        # `assert_template` expects `response` to implement a #body method
+        # like an `ActionDispatch::Response` does to force the view to render.
+        # For backwards compatibility, we use #response as an alias for
+        # #rendered, but it needs to implement #body to avoid `assert_template`
+        # raising a `NoMethodError`.
+        unless rendered.respond_to?(:body)
+          def rendered.body; self; end;
+        end
+
         rendered
       end
 
@@ -99,16 +107,20 @@ module RSpec::Rails
       end
 
       def _default_render_options
-        # pluck the handler, format, and locale out of, eg, posts/index.de.html.haml
-        template, *components = _default_file_to_render.split('.')
-        handler, format, locale = *components.reverse
+        if ::Rails.version >= "3.2"
+          # pluck the handler, format, and locale out of, eg, posts/index.de.html.haml
+          template, *components   = _default_file_to_render.split('.')
+          handler, format, locale = *components.reverse
 
-        render_options = {:template => template}
-        render_options[:handlers] = [handler] if handler
-        render_options[:formats] = [format] if format
-        render_options[:locales] = [locale] if locale
+          render_options = {:template => template}
+          render_options[:handlers] = [handler] if handler
+          render_options[:formats] = [format] if format
+          render_options[:locales] = [locale] if locale
 
-        render_options
+          render_options
+        else
+          {:template => _default_file_to_render}
+        end
       end
 
       def _path_parts
@@ -142,10 +154,9 @@ module RSpec::Rails
         if view.lookup_context.respond_to?(:prefixes)
           # rails 3.1
           view.lookup_context.prefixes << _controller_path
-        else
-          # rails 3.0
-          controller.controller_path = _controller_path
         end
+
+        controller.controller_path = _controller_path
         controller.request.path_parameters[:controller] = _controller_path
         controller.request.path_parameters[:action]     = _inferred_action unless _inferred_action =~ /^_/
       end

data/lib/rspec/rails/extensions.rb

@@ -1 +1,2 @@
 require 'rspec/rails/extensions/active_record/base'
+require 'rspec/rails/extensions/active_record/proxy'

data/lib/rspec/rails/extensions/active_record/base.rb

@@ -26,7 +26,8 @@ end
 
 module ::ActiveModel::Validations
   # Extension to enhance `should have` on AR Model instances.  Calls
-  # model.valid? in order to prepare the object's errors object. 
+  # model.valid? in order to prepare the object's errors object. Accepts
+  # a :context option to specify the validation context.
   #
   # You can also use this to specify the content of the error messages.
   #
@@ -35,10 +36,11 @@ module ::ActiveModel::Validations
   #     model.should have(:no).errors_on(:attribute)
   #     model.should have(1).error_on(:attribute)
   #     model.should have(n).errors_on(:attribute)
+  #     model.should have(n).errors_on(:attribute, :context => :create)
   #
   #     model.errors_on(:attribute).should include("can't be blank")
-  def errors_on(attribute)
-    self.valid?
+  def errors_on(attribute, options = {})
+    self.valid?(options[:context])
     [self.errors[attribute]].flatten.compact
   end
   alias :error_on :errors_on

data/lib/rspec/rails/extensions/active_record/proxy.rb

@@ -0,0 +1,17 @@
+RSpec.configure do |rspec|
+  # Delay this in order to give users a chance to configure `expect_with`...
+  rspec.before(:suite) do
+    if defined?(RSpec::Matchers) && RSpec::Matchers.configuration.syntax.include?(:should) && defined?(ActiveRecord)
+      # In Rails 3.0, it was AssociationProxy.
+      # In 3.1+, it's CollectionProxy.
+      const_name = [:CollectionProxy, :AssociationProxy].find do |const|
+        ActiveRecord::Associations.const_defined?(const)
+      end
+
+      proxy_class = ActiveRecord::Associations.const_get(const_name)
+
+      RSpec::Matchers.configuration.add_should_and_should_not_to proxy_class
+    end
+  end
+end
+

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

@@ -5,6 +5,14 @@ module RSpec::Rails::Matchers
     def matches?(actual)
       !actual.persisted?
     end
+
+    def failure_message_for_should
+      "expected #{actual.inspect} to be a new record, but was persisted"
+    end
+
+    def failure_message_for_should_not
+      "expected #{actual.inspect} to be persisted, but was a new record"
+    end
   end
 
   # Passes if actual returns `false` for `persisted?`.

data/lib/rspec/rails/tasks/rspec.rake

@@ -1,4 +1,3 @@
-require 'rspec/core'
 require 'rspec/core/rake_task'
 if default = Rake.application.instance_variable_get('@tasks')['default']
   default.prerequisites.delete('test')
@@ -8,7 +7,7 @@ orm_setting = Rails.configuration.generators.options[:rails][:orm]
 spec_prereq = if(orm_setting == :active_record)
   Rails.configuration.active_record[:schema_format] == :sql ? "db:test:clone_structure" : "db:test:prepare"
 else
-  :noop	
+  :noop
 end
 task :noop do; end
 task :default => :spec

data/lib/rspec/rails/vendor/capybara.rb

@@ -12,9 +12,7 @@ if defined?(Capybara)
   RSpec.configure do |c|
     if defined?(Capybara::DSL)
       c.include Capybara::DSL, :type => :controller
-      c.include Capybara::DSL, :example_group => {
-        :file_path => c.escaped_path(%w[spec features])
-      }
+      c.include Capybara::DSL, :type => :feature
     end
 
     if defined?(Capybara::RSpecMatchers)
@@ -27,11 +25,7 @@ if defined?(Capybara)
       }
     end
 
-    if defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)
-      c.include RSpec::Rails::RailsExampleGroup, :example_group => {
-        :file_path => c.escaped_path(%w[spec features])
-      }
-    else
+    unless defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)
       c.include Capybara, :type => :request
       c.include Capybara, :type => :controller
     end

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Rails
     module Version
-      STRING = '2.11.4'
+      STRING = '2.12.0'
     end
   end
 end

data/spec/autotest/rails_rspec2_spec.rb

@@ -8,19 +8,19 @@ describe Autotest::RailsRspec2 do
   describe 'exceptions' do
     let(:exceptions_regexp) { rails_rspec2_autotest.exceptions }
 
-    it "should match './log/test.log'" do
+    it "matches './log/test.log'" do
       exceptions_regexp.should match('./log/test.log')
     end
 
-    it "should match 'log/test.log'" do
+    it "matches 'log/test.log'" do
       exceptions_regexp.should match('log/test.log')
     end
 
-    it "should not match './spec/models/user_spec.rb'" do
+    it "does not match './spec/models/user_spec.rb'" do
       exceptions_regexp.should_not match('./spec/models/user_spec.rb')
     end
 
-    it "should not match 'spec/models/user_spec.rb'" do
+    it "does not match 'spec/models/user_spec.rb'" do
       exceptions_regexp.should_not match('spec/models/user_spec.rb')
     end
   end

data/spec/generators/rspec/model/model_generator_spec.rb

@@ -9,7 +9,7 @@ describe Rspec::Generators::ModelGenerator do
 
   before { prepare_destination }
 
-  it 'should run both the model and fixture tasks' do
+  it 'runs both the model and fixture tasks' do
     gen = generator %w(posts)
     gen.should_receive :create_model_spec
     gen.should_receive :create_fixture_file

data/spec/generators/rspec/scaffold/scaffold_generator_spec.rb

@@ -14,6 +14,7 @@ describe Rspec::Generators::ScaffoldGenerator do
       before { run_generator %w(posts) }
       it { should contain(/require 'spec_helper'/) }
       it { should contain(/describe PostsController/) }
+      it { should contain(%({ "these" => "params" })) }
     end
 
     describe 'with --no-controller_specs' do
@@ -22,6 +23,13 @@ describe Rspec::Generators::ScaffoldGenerator do
     end
   end
 
+  describe 'controller spec with attributes specified' do
+    subject { file('spec/controllers/posts_controller_spec.rb') }
+    before { run_generator %w(posts title:string) }
+
+    it { should contain(%({ "title" => "MyString" })) }
+  end
+
   describe 'namespaced controller spec' do
     subject { file('spec/controllers/admin/posts_controller_spec.rb') }
     before  { run_generator %w(admin/posts) }

data/spec/rspec/rails/example/feature_example_group_spec.rb

@@ -0,0 +1,56 @@
+require "spec_helper"
+
+module RSpec::Rails
+  describe FeatureExampleGroup do
+    it { should be_included_in_files_in('./spec/features/') }
+    it { should be_included_in_files_in('.\\spec\\features\\') }
+
+    it "adds :type => :model to the metadata" do
+      group = RSpec::Core::ExampleGroup.describe do
+        include FeatureExampleGroup
+      end
+
+      expect(group.metadata[:type]).to eql(:feature)
+    end
+
+    it "includes Rails route helpers" do
+      Rails.application.routes.draw do
+        get "/foo", :as => :foo, :to => "foo#bar"
+      end
+
+      group = RSpec::Core::ExampleGroup.describe do
+        include FeatureExampleGroup
+      end
+
+      expect(group.new.foo_path).to eql("/foo")
+      expect(group.new.foo_url).to eql("http://www.example.com/foo")
+    end
+
+    describe "#visit" do
+      it "raises an error informing about missing Capybara" do
+        group = RSpec::Core::ExampleGroup.describe do
+          include FeatureExampleGroup
+        end
+
+        expect {
+          group.new.visit('/foobar')
+        }.to raise_error(/Capybara not loaded/)
+      end
+
+      it "is resistant to load order errors" do
+        capybara = Module.new do
+          def visit(url)
+            "success: #{url}"
+          end
+        end
+
+        group = RSpec::Core::ExampleGroup.describe do
+          include capybara
+          include FeatureExampleGroup
+        end
+
+        expect(group.new.visit("/foo")).to eql("success: /foo")
+      end
+    end
+  end
+end

data/spec/rspec/rails/example/view_example_group_spec.rb

@@ -113,10 +113,16 @@ module RSpec::Rails
           view_spec.render
           view_spec.received.first.should == [{:template => "widgets/new"},{}, nil]
         end
+
         it "converts the filename components into render options" do
           view_spec.stub(:_default_file_to_render) { "widgets/new.en.html.erb" }
           view_spec.render
-          view_spec.received.first.should == [{:template => "widgets/new", :locales=>['en'], :formats=>['html'], :handlers=>['erb']},{}, nil]
+
+          if ::Rails.version >= "3.2"
+            view_spec.received.first.should == [{:template => "widgets/new", :locales=>['en'], :formats=>['html'], :handlers=>['erb']}, {}, nil]
+          else
+            view_spec.received.first.should == [{:template => "widgets/new.en.html.erb"}, {}, nil]
+          end
         end
       end
 

data/spec/rspec/rails/matchers/be_new_record_spec.rb

@@ -4,16 +4,30 @@ describe "be_new_record" do
   include RSpec::Rails::Matchers
 
   context "un-persisted record" do
+    let(:record) { double('record', :persisted? => false) }
+
     it "passes" do
-      record = double('record', :persisted? => false)
       record.should be_new_record
     end
+
+    it "fails with custom failure message" do
+      expect {
+        expect(record).not_to be_new_record
+      }.to raise_exception(/expected .* to be persisted, but was a new record/)
+    end
   end
 
   context "persisted record" do
+    let(:record) { double('record', :persisted? => true) }
+
     it "fails" do
-      record = double('record', :persisted? => true)
       record.should_not be_new_record
     end
+
+    it "fails with custom failure message" do
+      expect {
+        expect(record).to be_new_record
+      }.to raise_exception(/expected .* to be a new record, but was persisted/)
+    end
   end
 end