rspec-rails 2.0.0.beta.19 → 2.0.0.beta.20

data/features/matchers/redirect_to_matcher.feature

@@ -0,0 +1,41 @@
+Feature: redirect_to matcher
+
+  The redirect_to matcher is used to specify that the redirect called
+  in the latest action ended with the intended behaviour. Essentially,
+  it delegates to "assert_redirect". For more info, please check out
+  the Rails documentation on this method.
+
+  It is available in controller specs (spec/controllers) and request
+  specs (spec/requests).
+
+  Scenario: redirect_to with four possible options
+    Given a file named "spec/controllers/widgets_controller_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe WidgetsController do
+
+        describe "#create" do
+          subject { post :create, :widget => { :name => "Foo" } }
+
+          it "redirects to widget_url(@widget)" do
+            subject.should redirect_to(widget_url(assigns(:widget)))
+          end
+
+          it "redirects_to :action => :show" do
+            subject.should redirect_to :action => :show,
+                                       :id => assigns(:widget).id
+          end
+
+          it "redirects_to(@widget)" do
+            subject.should redirect_to(assigns(:widget))
+          end
+
+          it "redirects_to /widgets/:id" do
+            subject.should redirect_to("/widgets/#{assigns(:widget).id}")
+          end
+        end
+      end
+      """
+    When I run "rspec spec/controllers/widgets_controller_spec.rb"
+    Then the output should contain "4 examples, 0 failures"

data/features/matchers/render_template_matcher.feature

@@ -0,0 +1,25 @@
+Feature: render_template matcher
+
+  This matcher just delegates to the Rails assertion method
+  "assert_template". For complete info on the available options,
+  please take a look at the Rails documentation.
+
+  This method is available in spec/controllers and spec/requests.
+
+  Scenario: render_template with three possible options
+    Given a file named "spec/controllers/gadgets_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe GadgetsController do
+        describe "#index" do
+          subject { get :index }
+
+          specify { should render_template(:index) }
+          specify { should render_template("index") }
+          specify { should render_template("gadgets/index") }
+        end
+      end
+      """
+    When I run "rspec spec/controllers/gadgets_spec.rb"
+    Then the output should contain "3 examples, 0 failures"

data/features/mocks/mock_model.feature

@@ -0,0 +1,131 @@
+Feature: mock_model
+
+  The mock_model method generates a test double object 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 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
+  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
+  generated object will act as though its an instance of the class named by
+  that string.
+   
+  Scenario: passing a string that represents a non-existent constant
+    Given a file named "spec/models/car_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "mock_model('Car') with no Car constant in existence" do
+        it "generates a constant" do
+          Object.const_defined?(:Car).should be_false
+          mock_model("Car")
+          Object.const_defined?(:Car).should be_true
+        end
+
+        describe "generates an object that ..." do
+          it "returns the correct name" do
+            car = mock_model("Car")
+            car.class.name.should eq("Car")
+          end
+
+          it "says it is a Car" do
+            car = mock_model("Car")
+            car.should be_a(Car)
+          end
+        end
+      end
+      """
+    When I run "rspec spec/models/car_spec.rb"
+    Then the output should contain "3 examples, 0 failures"
+
+  Scenario: passing a string that represents an existing constant
+    Given a file named "spec/models/widget_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe Widget do
+        it "uses the existing constant" do
+          widget = mock_model("Widget")
+          widget.should be_a(Widget)
+        end
+      end
+      """
+    When I run "rspec spec/models/widget_spec.rb"
+    Then the output should contain "1 example, 0 failures"
+
+  Scenario: passing a class that does not extend ActiveModel::Naming
+    Given a file named "spec/models/string_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe String do
+        it "raises" do
+          expect { mock_model(String) }.to raise_exception
+        end
+      end
+      """
+    When I run "rspec spec/models/string_spec.rb"
+    Then the output should contain "1 example, 0 failures"
+
+  Scenario: passing an Active Record constant
+    Given a file named "spec/models/widget_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe Widget do
+        let(:widget) { mock_model(Widget) }
+
+        it "is valid by default" do
+          widget.should be_valid
+        end
+
+        it "is not a new record by default" do
+          widget.should_not be_new_record
+        end
+
+        it "can be converted to a new record" do
+          widget.as_new_record.should be_new_record
+        end
+
+        it "sets :id to nil upon destroy" do
+          widget.destroy
+          widget.id.should be_nil
+        end
+      end
+      """
+    When I run "rspec spec/models/widget_spec.rb"
+    Then the output should contain "4 examples, 0 failures"
+
+  Scenario: passing an Active Record constant with method stubs
+    Given a file named "spec/models/widget_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "mock_model(Widget) with stubs" do
+        let(:widget) do
+          mock_model Widget, :foo => "bar",
+                             :save => true,
+                             :update_attributes => false
+        end
+
+        it "supports stubs for methods that don't exist in ActiveModel or ActiveRecord" do
+          widget.foo.should eq("bar")
+        end
+
+        it "supports stubs for methods that do exist" do
+          widget.save.should eq(true)
+          widget.update_attributes.should be_false
+        end
+
+        describe "#errors" do
+          context "with update_attributes => false" do
+            it "is not empty" do
+              widget.errors.should_not be_empty
+            end
+          end
+        end
+      end
+      """
+    When I run "rspec spec/models/widget_spec.rb"
+    Then the output should contain "3 examples, 0 failures"

data/features/mocks/stub_model.feature

@@ -0,0 +1,58 @@
+Feature: stub_model
+  
+  The stub_model method generates an instance of a Active Model model.
+  
+  While you can use stub_model in any example (model, view, controller,
+  helper), it is especially useful in view examples, which are inherently
+  more state-based than interaction-based.
+   
+  Scenario: passing an Active Record constant with a hash of stubs
+    Given a file named "spec/models/widget_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "stub_model(Widget) with a hash of stubs" do
+        let(:widget) do
+          stub_model Widget, :id => 5, :random_attribute => true
+        end
+        
+        it "stubs :id" do
+          widget.id.should eql(5)
+        end
+        
+        it "stubs :random_attribute" do
+          widget.random_attribute.should be_true
+        end
+        
+        it "returns false for new_record? if :id is set" do
+          widget.should_not be_new_record
+        end
+        
+        it "can be converted to a new record" do
+          widget.as_new_record
+          widget.should be_new_record
+        end
+      end
+      """
+    When I run "rspec spec/models/widget_spec.rb"
+    Then the output should contain "4 examples, 0 failures"
+    
+  Scenario: passing an Active Record constant with a block of stubs
+    Given a file named "spec/models/widget_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "stub_model(Widget) with a block of stubs" do
+        let(:widget) do
+          stub_model Widget do |widget|
+            widget.id = 5
+          end
+        end
+        
+        it "stubs :id" do
+          widget.id.should eql(5)
+        end
+      end
+      """
+    When I run "rspec spec/models/widget_spec.rb"
+    Then the output should contain "1 example, 0 failures"

data/features/routing_specs/access_to_named_routes.feature

@@ -0,0 +1,15 @@
+Feature: access to named routes in routing specs
+
+  Scenario: access existing named route
+    Given a file named "spec/routing/widget_routes_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "routes to the widgets controller" do
+        it "routes a named route" do
+          {:get => new_widget_path}.should route_to(:controller => "widgets", :action => "new")
+        end
+      end
+      """
+    When I run "rspec spec"
+    Then the output should contain "1 example, 0 failures"

data/features/support/env.rb

@@ -1,4 +1,5 @@
 require 'aruba'
+require 'webrat'
 
 unless File.directory?('./tmp/example_app')
   system "rake generate:app generate:stuff"

data/features/view_specs/inferred_controller_path.feature

@@ -0,0 +1,44 @@
+Feature: view spec infers controller path and action
+
+  Scenario: infer controller path
+    Given a file named "spec/views/widgets/new.html.erb_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "widgets/new.html.erb" do
+        it "infers the controller path" do
+          controller.request.path_parameters["controller"].should eq("widgets")
+        end
+      end
+      """
+    When I run "rspec spec/views"
+    Then the output should contain "1 example, 0 failures"
+
+  Scenario: infer action
+    Given a file named "spec/views/widgets/new.html.erb_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "widgets/new.html.erb" do
+        it "infers the controller path" do
+          controller.request.path_parameters["action"].should eq("new")
+        end
+      end
+      """
+    When I run "rspec spec/views"
+    Then the output should contain "1 example, 0 failures"
+
+  Scenario: do not infer action in a partial
+    Given a file named "spec/views/widgets/_form.html.erb_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "widgets/_form.html.erb" do
+        it "includes a link to new" do
+          controller.request.path_parameters["action"].should be_nil
+        end
+      end
+      """
+    When I run "rspec spec/views"
+    Then the output should contain "1 example, 0 failures"
+

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

@@ -1,12 +1,11 @@
-# This file is copied to ~/spec when you run 'ruby script/generate rspec'
-# from the project root directory.
+# This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
 RSpec.configure do |config|
   # == Mock Framework

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

@@ -3,12 +3,12 @@ require "spec_helper"
 describe <%= controller_class_name %>Controller do
   describe "routing" do
 
-    <% unless options[:singleton] -%>
+<% unless options[:singleton] -%>
     it "recognizes and generates #index" do
       { :get => "/<%= table_name %>" }.should route_to(:controller => "<%= table_name %>", :action => "index")
     end
 
-    <% end -%>
+<% end -%>
     it "recognizes and generates #new" do
       { :get => "/<%= table_name %>/new" }.should route_to(:controller => "<%= table_name %>", :action => "new")
     end

data/lib/rspec/rails.rb

@@ -1,7 +1,4 @@
-require 'webrat'
-
 require 'rspec/core'
-require 'rspec/rails/monkey'
 require 'rspec/rails/extensions'
 require 'rspec/rails/view_rendering'
 require 'rspec/rails/adapters'
@@ -9,5 +6,5 @@ require 'rspec/rails/matchers'
 require 'rspec/rails/fixture_support'
 require 'rspec/rails/mocks'
 require 'rspec/rails/module_inclusion'
+require 'rspec/rails/browser_simulators'
 require 'rspec/rails/example'
-

data/lib/rspec/rails/adapters.rb

@@ -15,21 +15,47 @@ module RSpec
           methods.each {|method| after { send method } }
         end
       end
+
+      module InstanceMethods
+        def method_name
+          @example
+        end
+      end
     end
 
     module TestUnitAssertionAdapter
       extend ActiveSupport::Concern
-      def method_name
-        @example
+
+      class AssertionDelegate
+        include Test::Unit::Assertions
       end
 
-      include Test::Unit::Assertions
+      module ClassMethods
+        def assertion_method_names
+          Test::Unit::Assertions.public_instance_methods.select{|m| m.to_s =~ /^assert/} +
+            [:build_message]
+        end
 
-      included do
-        before do
-          @_result = Struct.new(:add_assertion).new
+        def define_assertion_delegators
+          assertion_method_names.each do |m|
+            class_eval <<-CODE
+              def #{m}(*args, &block)
+                assertion_delegate.send :#{m}, *args, &block
+              end
+            CODE
+          end
         end
       end
+
+      module InstanceMethods
+        def assertion_delegate
+          @assertion_delegate ||= AssertionDelegate.new
+        end
+      end
+
+      included do
+        define_assertion_delegators
+      end
     end
   end
 end

data/lib/rspec/rails/browser_simulators.rb

@@ -0,0 +1,30 @@
+begin
+  require 'capybara/rails'
+rescue LoadError
+end
+
+begin
+  require 'webrat'
+rescue LoadError
+end
+
+module RSpec
+  module Rails
+    module BrowserSimulators
+      extend ActiveSupport::Concern
+
+      def self.included(mod)
+        mod.instance_eval do
+          def webrat(&block)
+            block.call if defined?(Webrat)
+          end
+
+          def capybara(&block)
+            block.call if defined?(Capybara)
+          end
+        end
+      end
+
+    end
+  end
+end