rspec-rails 2.8.0.rc2 → 2.8.0

data/README.md

@@ -100,21 +100,59 @@ See http://github.com/rspec/rspec-rails/issues
 
 # Request Specs
 
-Request specs live in spec/requests.
+Request specs live in spec/requests, and mix in behavior
+[ActionDispatch::Integration::Runner](http://api.rubyonrails.org/classes/ActionDispatch/Integration/Runner.html),
+which is the basis for [Rails' integration
+tests](http://guides.rubyonrails.org/testing.html#integration-testing).  The
+intent is to specify one or more request/response cycles from end to end using
+a black box approach.
 
 ```ruby
-describe "widgets resource" do
-  describe "GET index" do
-    it "contains the widgets header" do
-      get "/widgets/index"
-      response.should have_selector("h1", :content => "Widgets")
+describe "home page" do
+  it "diplays the user's username after successful login" do
+    user = User.create!(:username => "jdoe", :password => "secret")
+    get "/login"
+    assert_select "form.login" do
+      assert_select "input[name=?]", "username"
+      assert_select "input[name=?]", "password"
+      assert_select "input[type=?]", "submit"
     end
+
+    post "/login", :username => "jdoe", :password => "secret"
+    assert_select ".header .username", :text => "jdoe"
+  end
+end
+```
+
+This example uses only standard Rails and RSpec API's, but many RSpec/Rails
+users like to use extension libraries like FactoryGirl and Capybara:
+
+```ruby
+describe "home page" do
+  it "diplays the user's username after successful login" do
+    user = Factory(:user, :username => "jdoe", :password => "secret")
+    visit "/login"
+    fill_in "Username", :with => "jdoe"
+    fill_in "Password", :with => "secret"
+    click_buton "Log in"
+
+    page.should have_selector(".header .username", :content => "jdoe")
   end
 end
 ```
 
-Request specs mix in behavior from Rails' integration tests. See the
-docs for ActionDispatch::Integration::Runner for more information.
+FactoryGirl decouples this example from changes to validation requirements,
+which can be encoded into the underlying factory definition without requiring
+changes to this example.
+
+Among other benefits, Capybara binds the form post to the generated HTML, which
+means we don't need to specify them separately.
+
+There are several other Ruby libs that implement the factory pattern or provide
+a DSL for request specs (a.k.a. acceptance or integration specs), but
+FactoryGirl and Capybara seem to be the most widely used. Whether you choose
+these or other libs, we strongly recommend using something for each of these
+roles.
 
 # Controller Specs
 

data/features/controller_specs/anonymous_controller.feature

@@ -150,3 +150,181 @@ Feature: anonymous controller
       """
     When I run `rspec spec`
     Then the examples should all pass
+
+  Scenario: anonymous controllers only create resource routes
+    Given a file named "spec/controllers/application_controller_spec.rb" with:
+    """
+    require "spec_helper"
+
+    describe ApplicationController do
+      controller do
+        def index
+          render :text => "index called"
+        end
+
+        def create
+          render :text => "create called"
+        end
+
+        def new
+          render :text => "new called"
+        end
+
+        def show
+          render :text => "show called"
+        end
+
+        def edit
+          render :text => "edit called"
+        end
+
+        def update
+          render :text => "update called"
+        end
+
+        def destroy
+          render :text => "destroy called"
+        end
+
+        def willerror
+          render :text => "will not render"
+        end
+      end
+
+      describe "#index" do
+        it "responds to GET" do
+          get :index
+          response.body.should == "index called"
+        end
+
+        it "also responds to POST" do
+          post :index
+          response.body.should == "index called"
+        end
+
+        it "also responds to PUT" do
+          put :index
+          response.body.should == "index called"
+        end
+
+        it "also responds to DELETE" do
+          delete :index
+          response.body.should == "index called"
+        end
+      end
+
+      describe "#create" do
+        it "responds to POST" do
+          post :create
+          response.body.should == "create called"
+        end
+
+        # And the rest...
+        %w{get post put delete}.each do |calltype|
+          it "responds to #{calltype}" do
+            send(calltype, :create)
+            response.body.should == "create called"
+          end
+        end
+      end
+
+      describe "#new" do
+        it "responds to GET" do
+          get :new
+          response.body.should == "new called"
+        end
+
+        # And the rest...
+        %w{get post put delete}.each do |calltype|
+          it "responds to #{calltype}" do
+            send(calltype, :new)
+            response.body.should == "new called"
+          end
+        end
+      end
+
+      describe "#edit" do
+        it "responds to GET" do
+          get :edit, :id => "anyid"
+          response.body.should == "edit called"
+        end
+
+        it "requires the :id parameter" do
+          expect { get :edit }.to raise_error(ActionController::RoutingError)
+        end
+
+        # And the rest...
+        %w{get post put delete}.each do |calltype|
+          it "responds to #{calltype}" do
+            send(calltype, :edit, {:id => "anyid"})
+            response.body.should == "edit called"
+          end
+        end
+      end
+
+      describe "#show" do
+        it "responds to GET" do
+          get :show, :id => "anyid"
+          response.body.should == "show called"
+        end
+
+        it "requires the :id parameter" do
+          expect { get :show }.to raise_error(ActionController::RoutingError)
+        end
+
+        # And the rest...
+        %w{get post put delete}.each do |calltype|
+          it "responds to #{calltype}" do
+            send(calltype, :show, {:id => "anyid"})
+            response.body.should == "show called"
+          end
+        end
+      end
+
+      describe "#update" do
+        it "responds to PUT" do
+          put :update, :id => "anyid"
+          response.body.should == "update called"
+        end
+
+        it "requires the :id parameter" do
+          expect { put :update }.to raise_error(ActionController::RoutingError)
+        end
+
+        # And the rest...
+        %w{get post put delete}.each do |calltype|
+          it "responds to #{calltype}" do
+            send(calltype, :update, {:id => "anyid"})
+            response.body.should == "update called"
+          end
+        end
+      end
+
+      describe "#destroy" do
+        it "responds to DELETE" do
+          delete :destroy, :id => "anyid"
+          response.body.should == "destroy called"
+        end
+
+        it "requires the :id parameter" do
+          expect { delete :destroy }.to raise_error(ActionController::RoutingError)
+        end
+
+        # And the rest...
+        %w{get post put delete}.each do |calltype|
+          it "responds to #{calltype}" do
+            send(calltype, :destroy, {:id => "anyid"})
+            response.body.should == "destroy called"
+          end
+        end
+      end
+
+      describe "#willerror" do
+        it "cannot be called" do
+          expect { get :willerror }.to raise_error(ActionController::RoutingError)
+        end
+      end
+    end
+    """
+    When I run `rspec spec`
+    Then the examples should all pass

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/edit.html.<%= options[:template_engine] %>" do
+describe "<%= ns_table_name %>/edit" do
   before(:each) do
     @<%= ns_file_name %> = assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/index.html.<%= options[:template_engine] %>" do
+describe "<%= ns_table_name %>/index" do
   before(:each) do
     assign(:<%= table_name %>, [
 <% [1,2].each_with_index do |id, model_index| -%>

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/new.html.<%= options[:template_engine] %>" do
+describe "<%= ns_table_name %>/new" do
   before(:each) do
     assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? ').as_new_record)' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/show.html.<%= options[:template_engine] %>" do
+describe "<%= ns_table_name %>/show" do
   before(:each) do
     @<%= ns_file_name %> = assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>

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

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

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

@@ -10,7 +10,7 @@ module RSpec::Rails
 
     module ClassMethods
       def _default_helper
-        base = metadata[:example_group][:description].split('/').first
+        base = metadata[:example_group][:description].split('/')[0..-2].join('/')
         (base.camelize + 'Helper').constantize if base
       rescue NameError
         nil

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Rails
     module Version
-      STRING = '2.8.0.rc2'
+      STRING = '2.8.0'
     end
   end
 end

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

@@ -35,7 +35,7 @@ describe Rspec::Generators::ScaffoldGenerator do
         subject { file("spec/views/posts/edit.html.erb_spec.rb") }
         it { should exist }
         it { should contain /require 'spec_helper'/ }
-        it { should contain /describe "(.*)\/edit.html.erb"/ }
+        it { should contain /describe "(.*)\/edit"/ }
         it { should contain /it "renders the edit (.*) form"/ }
       end
 
@@ -43,7 +43,7 @@ describe Rspec::Generators::ScaffoldGenerator do
         subject { file("spec/views/posts/index.html.erb_spec.rb") }
         it { should exist }
         it { should contain /require 'spec_helper'/ }
-        it { should contain /describe "(.*)\/index.html.erb"/ }
+        it { should contain /describe "(.*)\/index"/ }
         it { should contain /it "renders a list of (.*)"/ }
       end
 
@@ -51,7 +51,7 @@ describe Rspec::Generators::ScaffoldGenerator do
         subject { file("spec/views/posts/new.html.erb_spec.rb") }
         it { should exist }
         it { should contain /require 'spec_helper'/ }
-        it { should contain /describe "(.*)\/new.html.erb"/ }
+        it { should contain /describe "(.*)\/new"/ }
         it { should contain /it "renders new (.*) form"/ }
       end
 
@@ -59,7 +59,7 @@ describe Rspec::Generators::ScaffoldGenerator do
         subject { file("spec/views/posts/show.html.erb_spec.rb") }
         it { should exist }
         it { should contain /require 'spec_helper'/ }
-        it { should contain /describe "(.*)\/show.html.erb"/ }
+        it { should contain /describe "(.*)\/show"/ }
         it { should contain /it "renders attributes in <p>"/ }
       end
     end

data/spec/generators/rspec/view/view_generator_spec.rb

@@ -14,7 +14,7 @@ describe Rspec::Generators::ViewGenerator do
       run_generator %w(posts index)
       file('spec/views/posts/index.html.erb_spec.rb').tap do |f|
         f.should contain /require 'spec_helper'/
-        f.should contain /describe "posts\/index.html.erb"/
+        f.should contain /describe "posts\/index"/
       end
     end
 
@@ -23,18 +23,18 @@ describe Rspec::Generators::ViewGenerator do
         run_generator %w(admin/posts index)
         file('spec/views/admin/posts/index.html.erb_spec.rb').tap do |f|
           f.should contain /require 'spec_helper'/
-          f.should contain /describe "admin\/posts\/index.html.erb"/
+          f.should contain /describe "admin\/posts\/index"/
         end
       end
     end
   end
 
-  describe 'haml' do
+  describe 'with a specified template engine' do
     it 'generates a spec for the supplied action' do
       run_generator %w(posts index --template_engine haml)
       file('spec/views/posts/index.html.haml_spec.rb').tap do |f|
         f.should contain /require 'spec_helper'/
-        f.should contain /describe "posts\/index.html.haml"/
+        f.should contain /describe "posts\/index"/
       end
     end
   end

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

@@ -14,6 +14,7 @@ module RSpec::Rails
 
     describe 'automatic inclusion of helpers' do
       module ::ThingsHelper; end
+      module ::Namespaced; module ThingsHelper; end; end
 
       it 'includes the helper with the same name' do
         group = RSpec::Core::ExampleGroup.describe 'things/show.html.erb'
@@ -23,6 +24,14 @@ module RSpec::Rails
         end
       end
 
+      it 'includes the namespaced helper with the same name' do
+        group = RSpec::Core::ExampleGroup.describe 'namespaced/things/show.html.erb'
+        group.should_receive(:helper).with(Namespaced::ThingsHelper)
+        group.class_eval do
+          include ViewExampleGroup
+        end
+      end
+
       it 'operates normally when no helper with the same name exists' do
         raise 'unexpected constant found' if Object.const_defined?('ClocksHelper')
         lambda {

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 15424209
-  prerelease: 6
+  hash: 47
+  prerelease: 
   segments: 
   - 2
   - 8
   - 0
-  - rc
-  - 2
-  version: 2.8.0.rc2
+  version: 2.8.0
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,13 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-20 00:00:00 Z
+date: 2012-01-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -38,7 +36,7 @@ dependencies:
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -53,7 +51,7 @@ dependencies:
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -68,21 +66,19 @@ dependencies:
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424209
+        hash: 47
         segments: 
         - 2
         - 8
         - 0
-        - rc
-        - 2
-        version: 2.8.0.rc2
+        version: 2.8.0
   prerelease: false
   requirement: *id004
   name: rspec
   type: :runtime
-description: RSpec-2 for Rails-3
+description: RSpec for Rails
 email: rspec-users@rubyforge.org
 executables: []
 
@@ -249,21 +245,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: rspec
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.8.0.rc2
+summary: rspec-rails-2.8.0
 test_files: 
 - features/Autotest.md
 - features/Generators.md