rspec-rails 2.6.1 → 2.7.0.rc1

data/features/matchers/relation_match_array.feature

@@ -0,0 +1,20 @@
+Feature: ActiveRecord::Relation match array
+
+  The `=~` matcher can be used with an `ActiveRecord::Relation` (scope). The
+  assertion will pass if the scope would return all of the elements specified
+  in the array on the right hand side.
+
+  Scenario: example spec with relation =~ matcher
+    Given a file named "spec/models/widget_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe Widget do
+        let!(:widgets) { Array.new(3) { Widget.create } }
+        subject { Widget.scoped }
+
+        it { should =~ widgets }
+      end
+      """
+    When I run `rspec spec/models/widget_spec.rb`
+    Then the examples should all pass

data/features/mocks/mock_model.feature

@@ -1,13 +1,13 @@
 Feature: mock_model
 
-  The mock_model method generates a test double that acts like an Active Model
-  model. This is different from the stub_model method which generates an
-  instance of a real ActiveModel class.
+  The `mock_model` method generates a test double that acts like an instance of
+  `ActiveModel`. This is different from the `stub_model` method which generates
+  an instance of a real model class.
 
-  The benefit of mock_model over stub_model is that its a true double, so the
-  examples are not dependent on the behaviour (or mis-behaviour), or even the
+  The benefit of `mock_model` over `stub_model` is that it is a true double, so
+  the examples are not dependent on the behavior (or mis-behavior), or even the
   existence of any other code. If you're working on a controller spec and you
-  need a model that doesn't exist, you can pass mock_model a string and the
+  need a model that doesn't exist, you can pass `mock_model` a string and the
   generated object will act as though its an instance of the class named by
   that string.
    

data/features/support/env.rb

@@ -2,14 +2,14 @@ require 'aruba/cucumber'
 
 module ArubaExt
   def run(cmd)
-    super(cmd =~ /^rspec/ ? "bundle exec #{cmd}" : cmd)
+    super(cmd =~ /^rspec/ ? "bin/#{cmd}" : cmd)
   end
 end
 
 World(ArubaExt)
 
 Before do
-  @aruba_timeout_seconds = 10
+  @aruba_timeout_seconds = 15
 end
 
 unless File.directory?('./tmp/example_app')

data/features/view_specs/view_spec.feature

@@ -134,7 +134,7 @@ Feature: view spec
     When I run `rspec spec/views`
     Then the examples should all pass
 
-  Scenario: spec with view that accesses helper_method helpers
+  Scenario: passing view spec that stubs a helper method
     Given a file named "app/views/secrets/index.html.erb" with:
       """
       <%- if admin? %>
@@ -147,13 +147,7 @@ Feature: view spec
 
       describe 'secrets/index.html.erb' do
         before do
-          controller.singleton_class.class_eval do
-            protected
-              def admin?
-                true
-              end
-              helper_method :admin?
-          end
+          view.stub(:admin?).and_return(true)
         end
 
         it 'checks for admin access' do

data/lib/autotest/rails_rspec2.rb

@@ -42,7 +42,7 @@ class Autotest::RailsRspec2 < Autotest::Rspec2
     add_mapping(%r%^(test|spec)/fixtures/(.*).yml$%) { |_, m|
       ["spec/models/#{m[2].singularize}_spec.rb"] + files_matching(%r%^spec\/views\/#{m[2]}/.*_spec\.rb$%)
     }
-    add_mapping(%r%^spec/(models|controllers|routing|views|helpers|mailers|requests|lib)/.*rb$%) { |filename, _|
+    add_mapping(%r%^spec/.*_spec\.rb$%) { |filename, _|
       filename
     }
     add_mapping(%r%^app/models/(.*)\.rb$%) { |_, m|

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

@@ -4,7 +4,7 @@ describe <%= class_name %>Controller do
 
 <% for action in actions -%>
   describe "GET '<%= action %>'" do
-    it "should be successful" do
+    it "returns http success" do
       get '<%= action %>'
       response.should be_success
     end

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

@@ -2,6 +2,7 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
+require 'rspec/autorun'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -24,4 +25,9 @@ RSpec.configure do |config|
   # examples within a transaction, remove the following line or assign false
   # instead of true.
   config.use_transactional_fixtures = true
+
+  # If true, the base class of anonymous controllers will be inferred
+  # automatically. This will be the default behavior in future versions of
+  # rspec-rails.
+  config.infer_base_class_for_anonymous_controllers = false
 end

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

@@ -40,7 +40,7 @@ describe <%= controller_class_name %>Controller do
   describe "GET show" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
-      get :show, :id => <%= file_name %>.id.to_s
+      get :show, :id => <%= file_name %>.id
       assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
     end
   end
@@ -55,7 +55,7 @@ describe <%= controller_class_name %>Controller do
   describe "GET edit" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
-      get :edit, :id => <%= file_name %>.id.to_s
+      get :edit, :id => <%= file_name %>.id
       assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
     end
   end
@@ -127,7 +127,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 %>.id.to_s, :<%= ns_file_name %> => {}
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => {}
         assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
       end
 
@@ -135,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 %>.id.to_s, :<%= ns_file_name %> => {}
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => {}
         response.should render_template("edit")
       end
     end
@@ -145,13 +145,13 @@ describe <%= controller_class_name %>Controller do
     it "destroys the requested <%= ns_file_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       expect {
-        delete :destroy, :id => <%= file_name %>.id.to_s
+        delete :destroy, :id => <%= file_name %>.id
       }.to change(<%= class_name %>, :count).by(-1)
     end
 
     it "redirects to the <%= table_name %> list" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
-      delete :destroy, :id => <%= file_name %>.id.to_s
+      delete :destroy, :id => <%= file_name %>.id
       response.should redirect_to(<%= index_helper %>_url)
     end
   end

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

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

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

@@ -1,3 +1,7 @@
+RSpec.configure do |config|
+  config.add_setting :infer_base_class_for_anonymous_controllers, :default => false
+end
+
 module RSpec::Rails
   # Extends ActionController::TestCase::Behavior to work with RSpec.
   #
@@ -124,7 +128,11 @@ module RSpec::Rails
       # +controller+ method. Any instance methods, filters, etc, that are
       # defined in +ApplicationController+, however, are accessible from within
       # the block.
-      def controller(base_class = ApplicationController, &body)
+      def controller(base_class = nil, &body)
+        base_class ||= RSpec.configuration.infer_base_class_for_anonymous_controllers? ?
+                         controller_class :
+                         ApplicationController
+
         metadata[:example_group][:describes] = Class.new(base_class, &body)
         metadata[:example_group][:describes].singleton_class.class_eval do
           def name; "AnonymousController" end
@@ -144,6 +152,16 @@ module RSpec::Rails
     module InstanceMethods
       attr_reader :controller, :routes
 
+      module BypassRescue
+        def rescue_with_handler(exception)
+          raise exception
+        end
+      end
+
+      def bypass_rescue
+        controller.extend(BypassRescue)
+      end
+
       def method_missing(method, *args, &block)
         if @orig_routes && @orig_routes.named_routes.helpers.include?(method)
           controller.send(method, *args, &block)

data/lib/rspec/rails/fixture_support.rb

@@ -9,6 +9,17 @@ module RSpec
         include ActiveRecord::TestFixtures
 
         included do
+          # TODO (DC 2011-06-25) this is necessary because fixture_file_upload
+          # accesses fixture_path directly on ActiveSupport::TestCase. This is
+          # fixed in rails by https://github.com/rails/rails/pull/1861, which
+          # should be part of the 3.1 release, at which point we can include
+          # these lines for rails < 3.1.
+          ActiveSupport::TestCase.class_eval do
+            include ActiveRecord::TestFixtures
+            self.fixture_path = RSpec.configuration.fixture_path
+          end
+          # /TODO
+
           self.fixture_path = RSpec.configuration.fixture_path
           self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
           self.use_instantiated_fixtures  = RSpec.configuration.use_instantiated_fixtures

data/lib/rspec/rails/matchers.rb

@@ -23,3 +23,4 @@ require 'rspec/rails/matchers/routing_matchers'
 require 'rspec/rails/matchers/be_new_record'
 require 'rspec/rails/matchers/be_a_new'
 require 'rspec/rails/matchers/have_extension'
+require 'rspec/rails/matchers/relation_match_array'

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

@@ -0,0 +1,3 @@
+if defined?(ActiveRecord)
+  RSpec::Matchers::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::MatchArray)
+end

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

@@ -2,26 +2,28 @@ module RSpec::Rails::Matchers
   module RoutingMatchers
     extend RSpec::Matchers::DSL
 
-    matcher :route_to do |*route_options|
-      match_unless_raises ActiveSupport::TestCase::Assertion do |path|
-        assertion_path = { :method => path.keys.first, :path => path.values.first }
-
-        path, options = *route_options
-
-        if path.is_a?(String)
-          controller, action = path.split("#")
-          options ||= {}
-          options.merge!(:controller => controller, :action => action)
-        else
-          options = path
-        end
+    matcher :route_to do |*expected|
+      expected_options = expected[1] || {}
+      if Hash === expected[0]
+        expected_options.merge!(expected[0])
+      else
+        controller, action = expected[0].split('#')
+        expected_options.merge!(:controller => controller, :action => action)
+      end
 
-        assert_recognizes(options, assertion_path)
+      match_unless_raises ActiveSupport::TestCase::Assertion do |verb_to_path_map|
+        path, query = *verb_to_path_map.values.first.split('?')
+        assert_recognizes(
+          expected_options,
+          {:method => verb_to_path_map.keys.first, :path => path},
+          Rack::Utils::parse_query(query)
+        )
       end
 
       failure_message_for_should do
         rescued_exception.message
       end
+
     end
 
     matcher :be_routable do

data/lib/rspec/rails/mocks.rb

@@ -63,6 +63,7 @@ module RSpec
           else
             model_class = Object.const_set(string_or_model_class, Class.new do
               extend ActiveModel::Naming
+              def self.primary_key; :id; end
             end)
           end
         else
@@ -101,22 +102,27 @@ EOM
           m.__send__(:__mock_proxy).instance_eval(<<-CODE, __FILE__, __LINE__)
             def @object.is_a?(other)
               #{model_class}.ancestors.include?(other)
-            end
+            end unless #{stubs.has_key?(:is_a?)}
+            
             def @object.kind_of?(other)
               #{model_class}.ancestors.include?(other)
-            end
+            end unless #{stubs.has_key?(:kind_of?)}
+            
             def @object.instance_of?(other)
               other == #{model_class}
-            end
+            end unless #{stubs.has_key?(:instance_of?)}
+            
             def @object.respond_to?(method_name, include_private=false)
               #{model_class}.respond_to?(:column_names) && #{model_class}.column_names.include?(method_name.to_s) || super
-            end
+            end unless #{stubs.has_key?(:respond_to?)}
+            
             def @object.class
               #{model_class}
-            end
+            end unless #{stubs.has_key?(:class)}
+            
             def @object.to_s
               "#{model_class.name}_#{to_param}"
-            end
+            end unless #{stubs.has_key?(:to_s)}
           CODE
           yield m if block_given?
         end
@@ -153,7 +159,6 @@ EOM
       #   stub_model(Model)
       #   stub_model(Model).as_new_record
       #   stub_model(Model, hash_of_stubs)
-      #   stub_model(Model, instance_variable_name, hash_of_stubs)
       #
       # Creates an instance of +Model+ with +to_param+ stubbed using a
       # generated value that is unique to each object.. If +Model+ is an

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Rails # :nodoc:
     module Version # :nodoc:
-      STRING = '2.6.1'
+      STRING = '2.7.0.rc1'
     end
   end
 end

data/spec/generators/rspec/controller/controller_generator_spec.rb

@@ -0,0 +1,86 @@
+require 'spec_helper'
+
+# Generators are not automatically loaded by Rails
+require 'generators/rspec/controller/controller_generator'
+
+describe Rspec::Generators::ControllerGenerator do
+  # Tell the generator where to put its output (what it thinks of as Rails.root)
+  destination File.expand_path("../../../../../tmp", __FILE__)
+
+  before { prepare_destination }
+
+  describe 'controller specs' do
+    subject { file('spec/controllers/posts_controller_spec.rb') }
+    describe 'generated by default' do
+      before do
+        run_generator %w(posts)
+      end
+
+      describe 'the spec' do
+        it { should exist }
+        it { should contain /require 'spec_helper'/ }
+        it { should contain /describe PostsController/ }
+      end
+    end
+    describe 'skipped with a flag' do
+      before do
+        run_generator %w(posts --no-controller_specs)
+      end
+      it { should_not exist }
+    end
+  end
+
+  describe 'view specs' do
+    describe 'are not generated' do
+      describe 'with no-view-spec flag' do
+        before do
+          run_generator %w(posts index show --no-view-specs)
+        end
+        describe 'index.html.erb' do
+          subject { file('spec/views/posts/index.html.erb_spec.rb') }
+          it { should_not exist }
+        end
+      end
+      describe 'with no actions' do
+        before do
+          run_generator %w(posts)
+        end
+        describe 'index.html.erb' do
+          subject { file('spec/views/posts/index.html.erb_spec.rb') }
+          it { should_not exist }
+        end
+      end
+    end
+
+    describe 'are generated' do
+      describe 'with default template engine' do
+        before do
+          run_generator %w(posts index show)
+        end
+        describe 'index.html.erb' do
+          subject { file('spec/views/posts/index.html.erb_spec.rb') }
+          it { should exist }
+          it { should contain /require 'spec_helper'/ }
+          it { should contain /describe "posts\/index.html.erb"/ }
+        end
+        describe 'show.html.erb' do
+          subject { file('spec/views/posts/show.html.erb_spec.rb') }
+          it { should exist }
+          it { should contain /require 'spec_helper'/ }
+          it { should contain /describe "posts\/show.html.erb"/ }
+        end
+      end
+      describe 'with haml' do
+        before do
+          run_generator %w(posts index --template_engine haml)
+        end
+        describe 'index.html.haml' do
+          subject { file('spec/views/posts/index.html.haml_spec.rb') }
+          it { should exist }
+          it { should contain /require 'spec_helper'/ }
+          it { should contain /describe "posts\/index.html.haml"/ }
+        end
+      end
+    end
+  end
+end

data/spec/generators/rspec/helper/helper_generator_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+# Generators are not automatically loaded by Rails
+require 'generators/rspec/helper/helper_generator'
+
+describe Rspec::Generators::HelperGenerator do
+  # Tell the generator where to put its output (what it thinks of as Rails.root)
+  destination File.expand_path("../../../../../tmp", __FILE__)
+
+  before { prepare_destination }
+
+  subject { file('spec/helpers/posts_helper_spec.rb') }
+  describe 'generated by default' do
+    before do
+      run_generator %w(posts)
+    end
+
+    describe 'the spec' do
+      it { should exist }
+      it { should contain /require 'spec_helper'/ }
+      it { should contain /describe PostsHelper/ }
+    end
+  end
+  describe 'skipped with a flag' do
+    before do
+      run_generator %w(posts --no-helper_specs)
+    end
+    it { should_not exist }
+  end
+end