rspec-rails 3.0.0.beta1 → 3.0.0.beta2

data/lib/generators/rspec/feature/feature_generator.rb

@@ -0,0 +1,15 @@
+require 'generators/rspec'
+
+module Rspec
+  module Generators
+    class FeatureGenerator < Base
+      class_option :feature_specs, :type => :boolean, :default => true, :desc => "Generate feature specs"
+
+      def generate_feature_spec
+        return unless options[:feature_specs]
+
+        template 'feature_spec.rb', File.join('spec/features', class_path, "#{table_name}_spec.rb") # file_name?
+      end
+    end
+  end
+end

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

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

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

@@ -2,7 +2,6 @@
 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. Files matching `spec/**/*_spec.rb` are
@@ -36,11 +35,6 @@ RSpec.configure do |config|
   # 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
-
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.

data/lib/generators/rspec/integration/integration_generator.rb

@@ -4,8 +4,6 @@ module Rspec
   module Generators
     class IntegrationGenerator < Base
       class_option :request_specs,   :type => :boolean, :default => true,  :desc => "Generate request specs"
-      class_option :webrat,          :type => :boolean, :default => false, :desc => "Use webrat methods/matchers"
-      class_option :webrat_matchers, :type => :boolean, :default => false, :desc => "Use webrat methods/matchers (deprecated - use --webrat)"
 
       def generate_request_spec
         return unless options[:request_specs]
@@ -13,15 +11,6 @@ module Rspec
         template 'request_spec.rb',
                  File.join('spec/requests', class_path, "#{table_name}_spec.rb")
       end
-
-    protected
-
-      # @deprecated Use `--webrat` instead.
-      def webrat?
-        RSpec.deprecate("the --webrat-matchers option", :replacement => "--webrat") if options[:webrat_matchers]
-        options[:webrat] || options[:webrat_matchers]
-      end
-
     end
   end
 end

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

@@ -3,12 +3,7 @@ require 'spec_helper'
 describe "<%= class_name.pluralize %>" do
   describe "GET /<%= table_name %>" do
     it "works! (now write some real specs)" do
-<% if webrat? -%>
-      visit <%= index_helper %>_path
-<% else -%>
-      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
       get <%= index_helper %>_path
-<% end -%>
       expect(response.status).to be(200)
     end
   end

data/lib/generators/rspec/model/templates/fixtures.yml

@@ -1,4 +1,4 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 <% unless attributes.empty? -%>
 one:

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -14,8 +14,6 @@ module Rspec
 
       class_option :controller_specs, :type => :boolean, :default => true,  :desc => "Generate controller specs"
       class_option :view_specs,       :type => :boolean, :default => true,  :desc => "Generate view specs"
-      class_option :webrat,           :type => :boolean, :default => false, :desc => "Use webrat methods/matchers"
-      class_option :webrat_matchers,  :type => :boolean, :default => false, :desc => "Use webrat methods/matchers (deprecated - use --webrat)"
       class_option :helper_specs,     :type => :boolean, :default => true,  :desc => "Generate helper specs"
       class_option :routing_specs,    :type => :boolean, :default => true,  :desc => "Generate routing specs"
 
@@ -46,12 +44,6 @@ module Rspec
 
       protected
 
-        # @deprecated Use `--webrat` instead.
-        def webrat?
-          RSpec.deprecate("--webrat-matchers", :replacement => "--webrat") if options[:webrat_matchers]
-          options[:webrat] || options[:webrat_matchers]
-        end
-
         def copy_view(view)
           template "#{view}_spec.rb",
                    File.join("spec/views", controller_file_path, "#{view}.html.#{options[:template_engine]}_spec.rb")

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

@@ -87,14 +87,14 @@ describe <%= controller_class_name %>Controller do
     describe "with invalid params" 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)
+        allow_any_instance_of(<%= class_name %>).to receive(:save).and_return(false)
         post :create, {:<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
         expect(assigns(:<%= ns_file_name %>)).to 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)
+        allow_any_instance_of(<%= class_name %>).to receive(:save).and_return(false)
         post :create, {:<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
         expect(response).to render_template("new")
       end
@@ -134,7 +134,7 @@ 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
-        <%= class_name %>.any_instance.stub(:save).and_return(false)
+        allow_any_instance_of(<%= class_name %>).to receive(:save).and_return(false)
         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 +142,7 @@ 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
-        <%= class_name %>.any_instance.stub(:save).and_return(false)
+        allow_any_instance_of(<%= class_name %>).to receive(:save).and_return(false)
         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

@@ -13,19 +13,10 @@ describe "<%= ns_table_name %>/edit" do
   it "renders the edit <%= ns_file_name %> form" do
     render
 
-<% if webrat? -%>
-    expect(rendered).to have_selector("form", :action => <%= ns_file_name %>_path(@<%= ns_file_name %>), :method => "post") do |form|
-<% for attribute in output_attributes -%>
-      expect(form).to 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 %>]"
 <% end -%>
     end
-<% end -%>
   end
 end

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

@@ -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? -%>
-    expect(rendered).to 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

@@ -12,19 +12,10 @@ describe "<%= ns_table_name %>/new" do
   it "renders new <%= ns_file_name %> form" do
     render
 
-<% if webrat? -%>
-    expect(rendered).to have_selector("form", :action => <%= table_name %>_path, :method => "post") do |form|
-<% for attribute in output_attributes -%>
-      expect(form).to 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 %>]"
 <% end -%>
     end
-<% end -%>
   end
 end

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

@@ -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? -%>
-    expect(rendered).to contain(<%= value_for(attribute) %>.to_s)
-<% else -%>
     expect(rendered).to match(/<%= eval(value_for(attribute)) %>/)
-<% end -%>
 <% end -%>
   end
 end

data/lib/rspec/rails.rb

@@ -1,4 +1,5 @@
 require 'rspec/core'
+require 'rspec/collection_matchers'
 
 RSpec::configure do |c|
   c.backtrace_exclusion_patterns << /vendor\//
@@ -14,4 +15,3 @@ require 'rspec/rails/fixture_support'
 require 'rspec/rails/mocks'
 require 'rspec/rails/example'
 require 'rspec/rails/vendor/capybara'
-require 'rspec/rails/vendor/webrat'

data/lib/rspec/rails/adapters.rb

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'active_support'
 require 'active_support/concern'
 
 module RSpec
@@ -8,7 +9,13 @@ module RSpec
       require 'minitest/assertions'
       Assertions = Minitest::Assertions
     else
-      require 'test/unit/assertions'
+      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
       Assertions = Test::Unit::Assertions
     end
 
@@ -36,11 +43,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
@@ -101,10 +106,10 @@ module RSpec
         # hooks.
         def setup(*methods)
           methods.each do |method|
-            if method.to_s =~ /^setup_(fixtures|controller_request_and_response)$/
-              prepend_before { send method }
+            if method.to_s =~ /^setup_(with_controller|fixtures|controller_request_and_response)$/
+              prepend_before { __send__ method }
             else
-              before         { send method }
+              before         { __send__ method }
             end
           end
         end
@@ -114,7 +119,7 @@ module RSpec
         # Wraps `teardown` calls from within Rails' testing framework in
         # `after` hooks.
         def teardown(*methods)
-          methods.each { |method| after { send method } }
+          methods.each { |method| after { __send__ method } }
         end
       end
 
@@ -142,11 +147,9 @@ module RSpec
         # @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
       end

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

@@ -1,5 +1,5 @@
 RSpec.configure do |config|
-  config.add_setting :infer_base_class_for_anonymous_controllers, :default => false
+  config.add_setting :infer_base_class_for_anonymous_controllers, :default => true
 end
 
 module RSpec::Rails
@@ -55,25 +55,34 @@ module RSpec::Rails
       #       # ....
       #     end
       def controller(base_class = nil, &body)
-        base_class ||= RSpec.configuration.infer_base_class_for_anonymous_controllers? ?
-                         controller_class :
-                         ApplicationController
+        if RSpec.configuration.infer_base_class_for_anonymous_controllers?
+          base_class ||= controller_class
+        end
+        base_class ||= defined?(ApplicationController) ? ApplicationController : ActionController::Base
 
         metadata[:example_group][:described_class] = Class.new(base_class) do
-          def self.name; "AnonymousController"; end
+          def self.name
+            root_controller = defined?(ApplicationController) ? ApplicationController : ActionController::Base
+            if superclass == root_controller || superclass.abstract?
+              "AnonymousController"
+            else
+              superclass.to_s
+            end
+          end
         end
         metadata[:example_group][:described_class].class_eval(&body)
 
-        orig_routes = nil
         before do
-          orig_routes = self.routes
+          @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 :anonymous }
+            r.draw { resources resource_name }
           }
         end
 
         after do
-          self.routes  = orig_routes
+          self.routes  = @orig_routes
           @orig_routes = nil
         end
       end

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

@@ -152,6 +152,9 @@ module RSpec::Rails
           view.lookup_context.prefixes << _controller_path
         end
 
+        # fixes bug with differing formats
+        view.lookup_context.view_paths.each(&:clear_cache)
+
         controller.controller_path = _controller_path
         controller.request.path_parameters[:controller] = _controller_path
         controller.request.path_parameters[:action]     = _inferred_action unless _inferred_action =~ /^_/

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

@@ -25,7 +25,7 @@ module RSpec::Rails::Matchers
     end
 
     # @api private
-    def failure_message_for_should
+    def failure_message
       [].tap do |message|
         unless actual.is_a?(expected) && actual.new_record?
           message << "expected #{actual.inspect} to be a new #{expected.inspect}"

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

@@ -6,11 +6,11 @@ module RSpec::Rails::Matchers
       !actual.persisted?
     end
 
-    def failure_message_for_should
+    def failure_message
       "expected #{actual.inspect} to be a new record, but was persisted"
     end
 
-    def failure_message_for_should_not
+    def failure_message_when_negated
       "expected #{actual.inspect} to be persisted, but was a new record"
     end
   end

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

@@ -11,17 +11,24 @@ module RSpec::Rails::Matchers
     end
 
     # @api private
-    def failure_message_for_should
+    def failure_message
       message = "expected #{actual.inspect} to be valid"
+
       if actual.respond_to?(:errors)
-        message << ", but got errors: #{actual.errors.full_messages.join(', ')}"
+        errors = if actual.errors.respond_to?(:full_messages)
+          actual.errors.full_messages
+        else
+          actual.errors
+        end
+
+        message << ", but got errors: #{errors.map(&:to_s).join(', ')}"
       end
 
       message
     end
 
     # @api private
-    def failure_message_for_should_not
+    def failure_message_when_negated
       "expected #{actual.inspect} not to be valid"
     end
   end

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

@@ -16,12 +16,12 @@ module RSpec::Rails::Matchers
       end
 
       # @api private
-      def failure_message_for_should
+      def failure_message
         rescued_exception.message
       end
 
       # @api private
-      def failure_message_for_should_not
+      def failure_message_when_negated
         "expected not to render #{expected.inspect}, but did"
       end
     end

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

@@ -15,12 +15,12 @@ module RSpec::Rails::Matchers
       end
 
       # @api private
-      def failure_message_for_should
+      def failure_message
         rescued_exception.message
       end
 
       # @api private
-      def failure_message_for_should_not
+      def failure_message_when_negated
         "expected not to redirect to #{@expected.inspect}, but did"
       end
     end