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

data/.gitignore

@@ -2,6 +2,7 @@ tmp
 pkg
 .bundle
 rspec-rails-
-Gemfile.lock
 doc
 vendor
+.bundle
+Gemfile.lock

data/Gemfile

@@ -14,3 +14,10 @@ gem 'aruba', ">= 0.2.0", :require => nil
 gem 'jeweler'
 gem 'webrat', ">= 0.7.2.beta.1"
 gem 'sqlite3-ruby', :require => 'sqlite3'
+
+case RUBY_VERSION
+when /^1\.9/
+  gem 'ruby-debug19'
+when /^1\.8/
+  gem 'ruby-debug'
+end

data/Gotchas.markdown

@@ -0,0 +1,14 @@
+# Gotchas
+
+## Name conflicts with upstream dependencies
+
+Examples in rspec-rails mix in Rails' assertion modules, which mix in assertion
+libraries from Minitest (if available) or Test::Unit. This makes it easy to
+accidentally override a method defined in one of those upstream modules in an
+example.
+
+For example, if you have a model named `Message`, and you define a `message`
+method (using `def message` or `let(:message)` in an example group, it will
+override Minitest's `message` method, which is used internally by Minitest, and
+is also a public API of Minitest. In this case, you would need to use a
+different method name or work with instance variables instead of methods.

data/README.markdown

@@ -18,19 +18,35 @@ This installs the following gems:
 
 ## Configure:
 
-Add this line to the Gemfile:
+Add `rspec-rails` to the `:test` and `:development` groups in the Gemfile:
 
-    gem "rspec-rails", ">= 2.0.0.beta.17"
+    group :test, :development do
+      gem "rspec-rails", ">= 2.0.0.beta.19"
+    end
+
+It needs to be in the `:development` group to expose generators and rake
+tasks without having to type `RAILS_ENV=test`.
 
-This will expose generators, including rspec:install. Now you can run: 
+Now you can run: 
 
-    script/rails g rspec:install
+    script/rails generate rspec:install
 
 This adds the spec directory and some skeleton files, including
-the "rake spec" task.
+the "rake spec" task. Note that this is the only rspec generator you'll
+actually see. That's because RSpec is registered with Rails as the test
+framework, so whenever you generate application components like models,
+controllers, etc, RSpec specs are generated instead of Test::Unit tests.
+
+### Webrat and Capybara
+
+You can choose between webrat or capybara for simulating a browser, automating
+a browser, or setting expectations using the matchers they supply. Just add
+your preference to the Gemfile:
 
-Note that things are in flux, so some generators generate code that
-doesn't work all that well yet.
+    gem "webrat"
+    gem "capybara"
+
+Note that Capybara matchers are not available in view or helper specs.
 
 ## Living on edge
 
@@ -59,6 +75,8 @@ not send you to the doctor with a migraine.
 
 See http://github.com/rspec/rspec-rails/issues
 
+Also see [Gotchas.markdown](http://github.com/rspec/rspec-rails/blob/master/Gotchas.markdown)
+
 # Request Specs
 
 Request specs live in spec/requests.
@@ -129,17 +147,39 @@ View specs live in spec/views, and mix in ActionView::TestCase::Behavior.
         rendered.should contain("Chicago")
       end
     end
-    
+
+View specs infer the controller name and path from the path to the view
+template. e.g. if the template is "events/index.html.erb" then:
+
+    controller.controller_path == "events"
+    controller.request.path_parameters[:controller] == "events"
+
+This means that most of the time you don't need to set these values. When
+spec'ing a partial that is included across different controllers, you _may_
+need to override these values before rendering the view.
+
 ## `assign(key, val)`
 
 Use this to assign values to instance variables in the view:
 
     assign(:widget, stub_model(Widget))
     render
-    
+
 The code above assigns `stub_model(Widget)` to the `@widget` variable in the view, and then
 renders the view.
 
+Note that because view specs mix in `ActionView::TestCase` behavior, any
+instance variables you set will be transparently propagated into your views
+(similar to how instance variables you set in controller actions are made
+available in views). For example:
+
+    @widget = stub_model(Widget)
+    render # @widget is available inside the view
+
+RSpec doesn't officially support this pattern, which only works as a
+side-effect of the inclusion of `ActionView::TestCase`. Be aware that it may be
+made unavailable in the future.
+
 ### * Upgrade note
 
 `assign(key, value)` replaces `assigns[key] = value` from rspec-rails-1.3

data/Rakefile

@@ -44,7 +44,6 @@ begin
     gem.authors = ["David Chelimsky", "Chad Humphries"]
     gem.rubyforge_project = "rspec"
     gem.add_dependency "rspec", RSpec::Rails::Version::STRING
-    gem.add_dependency "webrat", ">= 0.7.2.beta.1"
     gem.post_install_message = <<-EOM
 #{"*"*50}
 
@@ -97,7 +96,7 @@ namespace :generate do
   task :app do |t|
     unless File.directory?('./tmp/example_app')
       sh "bundle exec rails new ./tmp/example_app"
-      sh "cp ./templates/Gemfile ./tmp/example_app/" 
+      sh "cp ./templates/Gemfile ./tmp/example_app/"
     end
   end
 

data/Upgrade.markdown

@@ -1,3 +1,10 @@
+# Changes in beta.20
+
+### Webrat or Capybara
+
+rspec-rails-2.0.0.beta.20 removes the dependency and offers you a choice of
+using webrat or capybara. Just add the library of your choice to your Gemfile.
+
 # Upgrade to rspec-rails-2
 
 ## Controller specs

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.19
+2.0.0.beta.20

data/features/controller_specs/anonymous_controller.feature

@@ -6,35 +6,73 @@ Feature: anonymous controller
 
   Scenario: specify error handling in ApplicationController
     Given a file named "spec/controllers/application_controller_spec.rb" with:
-      """
-      require "spec_helper"
+    """
+    require "spec_helper"
 
-      class ApplicationController < ActionController::Base
-        class AccessDenied < StandardError; end
+    class ApplicationController < ActionController::Base
+      class AccessDenied < StandardError; end
 
-        rescue_from AccessDenied, :with => :access_denied
+      rescue_from AccessDenied, :with => :access_denied
 
-      private
+    private
+
+      def access_denied
+        redirect_to "/401.html"
+      end
+    end
 
-        def access_denied
-          redirect_to "/401.html"
+    describe ApplicationController do
+      controller do
+        def index
+          raise ApplicationController::AccessDenied
         end
       end
 
-      describe ApplicationController do
-        controller do
-          def index
-            raise ApplicationController::AccessDenied
-          end
+      describe "handling AccessDenied exceptions" do
+        it "redirects to the /401.html page" do
+          get :index
+          response.should redirect_to("/401.html")
         end
+      end
+    end
+    """
+    When I run "rspec spec"
+    Then the output should contain "1 example, 0 failures"
+
+  Scenario: specify error handling in subclass of ApplicationController
+    Given a file named "spec/controllers/application_controller_subclass_spec.rb" with:
+    """
+    require "spec_helper"
+
+    class ApplicationController < ActionController::Base
+      class AccessDenied < StandardError; end
+    end
+
+    class ApplicationControllerSubclass < ApplicationController
+
+      rescue_from ApplicationController::AccessDenied, :with => :access_denied
+
+      private
+
+      def access_denied
+        redirect_to "/401.html"
+      end
+    end
+
+    describe ApplicationControllerSubclass do
+      controller(ApplicationControllerSubclass) do
+        def index
+          raise ApplicationController::AccessDenied
+        end
+      end
 
-        describe "handling AccessDenied exceptions" do
-          it "redirects to the /401.html page" do
-            get :index
-            response.should redirect_to("/401.html")
-          end
+      describe "handling AccessDenied exceptions" do
+        it "redirects to the /401.html page" do
+          get :index
+          response.should redirect_to("/401.html")
         end
       end
-      """
+    end
+    """
     When I run "rspec spec"
     Then the output should contain "1 example, 0 failures"

data/features/controller_specs/isolation_from_views.feature

@@ -9,7 +9,7 @@ Feature: do not render views
   Scenario: expect template that is rendered by controller action (passes)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
       """
-      require "spec_helper.rb"
+      require "spec_helper"
 
       describe WidgetsController do
         describe "index" do
@@ -32,7 +32,7 @@ Feature: do not render views
   Scenario: expect template that is not rendered by controller action (fails)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
       """
-      require "spec_helper.rb"
+      require "spec_helper"
 
       describe WidgetsController do
         describe "index" do

data/features/controller_specs/readers.feature

@@ -6,7 +6,7 @@ Feature: controller spec readers
   Scenario: access controller
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
       """
-      require "spec_helper.rb"
+      require "spec_helper"
 
       describe WidgetsController do
         it "is available before an action" do

data/features/controller_specs/render_views.feature

@@ -6,7 +6,7 @@ Feature: render views
   Scenario: expect template that exists and is rendered by controller (passes)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
       """
-      require "spec_helper.rb"
+      require "spec_helper"
 
       describe WidgetsController do
         render_views
@@ -30,14 +30,14 @@ Feature: render views
   Scenario: expect template that does not exist and is rendered by controller (fails)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
       """
-      require "spec_helper.rb"
+      require "spec_helper"
 
       describe WidgetsController do
         render_views
 
         before do
           def controller.index
-            render "other"
+            render :template => "other"
           end
         end
 
@@ -55,7 +55,7 @@ Feature: render views
   Scenario: render_views on and off in diff contexts
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
       """
-      require "spec_helper.rb"
+      require "spec_helper"
 
       describe WidgetsController do
         context "with render_views" do

data/features/helper_specs/helper_spec.feature

@@ -0,0 +1,53 @@
+Feature: helper spec
+  
+  Helper specs live in spec/helpers. In order to access
+  the helper methods you can call them on the "helper" object.
+  
+  Scenario: helper method that returns true
+    Given a file named "spec/helpers/application_helper_spec.rb" with:
+      """
+      require "spec_helper"
+      
+      describe ApplicationHelper do
+        describe "#page_title" do
+          it "returns true" do
+            helper.page_title.should be_true
+          end
+        end
+      end
+      """
+    And a file named "app/helpers/application_helper.rb" with:
+      """
+      module ApplicationHelper
+        def page_title
+          true
+        end
+      end
+      """
+    When I run "rspec spec/helpers/application_helper_spec.rb"
+    Then the output should contain "1 example, 0 failures"
+    
+  Scenario: helper method that accesses an instance variable
+    Given a file named "spec/helpers/application_helper_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe ApplicationHelper do
+        describe "#page_title" do
+          it "returns the instance variable" do
+            assign(:title, "My Title")
+            helper.page_title.should eql("My Title")
+          end
+        end
+      end
+      """
+    And a file named "app/helpers/application_helper.rb" with:
+      """
+      module ApplicationHelper
+        def page_title
+          @title || nil
+        end
+      end
+      """
+    When I run "rspec spec/helpers/application_helper_spec.rb"
+    Then the output should contain "1 example, 0 failures"

data/features/mailer_specs/url_helpers.feature

@@ -7,7 +7,7 @@ Feature: URL helpers in mailer examples
       """
     And a file named "spec/mailers/notifications_spec.rb" with:
       """
-      require 'spec_helper.rb'
+      require 'spec_helper'
 
       describe Notifications do
         it 'should have access to URL helpers' do
@@ -25,7 +25,7 @@ Feature: URL helpers in mailer examples
       """
     And a file named "spec/mailers/notifications_spec.rb" with:
       """
-      require 'spec_helper.rb'
+      require 'spec_helper'
 
       describe Notifications do
         it 'should have access to URL helpers' do

data/features/matchers/new_record_matcher.feature

@@ -3,7 +3,10 @@ Feature: be_a_new matcher
   The be_a_new matcher accepts a class and passes if the subject is an instance
   of that class that returns true to new_record?
 
-  Scenario: example spec with four possibilities 
+  You can also call "with" on be_a_new with a hash of attributes to specify the
+  subject has equal attributes.
+
+  Scenario: example spec with four be_a_new possibilities 
     Given a file named "spec/models/widget_spec.rb" with:
       """
       require "spec_helper"
@@ -23,3 +26,45 @@ Feature: be_a_new matcher
       """
     When I run "rspec spec/models/widget_spec.rb"
     Then the output should contain "4 examples, 0 failures"
+
+  Scenario: example spec using be_a_new.with
+    Given a file named "spec/models/widget_spec.rb" with:
+      """
+      require "spec_helper"
+
+      class Widget < ActiveRecord::Base
+        establish_connection :adapter => 'sqlite3',
+                             :database => ':memory:'
+
+        connection.execute <<-eosql
+          CREATE TABLE widgets (
+            foo_id integer,
+            number integer
+          )
+        eosql
+      end
+
+      describe Widget do
+        context "when initialized with attributes" do
+          subject { Widget.new(:foo_id => 1, :number => 1) }
+
+          it "has all of the attributes" do
+            should be_a_new(Widget).with(:foo_id => 1, :number => 1)
+          end
+
+          it "has one of the attributes" do
+            should be_a_new(Widget).with(:foo_id => 1)
+          end
+
+          it "has none of the attributes" do
+            should_not be_a_new(Widget).with(:blah => 'blah')
+          end
+
+          it "has one of the attribute values not the same" do
+            should_not be_a_new(Widget).with(:foo_id => 2)
+          end
+        end
+      end
+      """
+    When I run "rspec spec/models/widget_spec.rb"
+    Then the output should contain "4 examples, 0 failures"