rspec-rails 2.0.0.beta.22 → 2.6.0

data/features/view_specs/stub_template.feature

@@ -0,0 +1,51 @@
+Feature: stub template
+
+  In order to isolate view specs from the partials rendered by the primary
+  view, rspec-rails (since 2.2) provides the stub_template method.
+
+  Scenario: stub template that does not exist
+    Given a file named "spec/views/gadgets/list.html.erb_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "gadgets/list.html.erb" do
+        it "renders the gadget partial for each gadget" do
+          assign(:gadgets, [
+            mock_model(Gadget, :id => 1, :name => "First"),
+            mock_model(Gadget, :id => 2, :name => "Second")
+          ])
+          stub_template "gadgets/_gadget.html.erb" => "<%= gadget.name %><br/>"
+          render
+          rendered.should =~ /First/
+          rendered.should =~ /Second/
+        end
+      end
+      """
+
+    And a file named "app/views/gadgets/list.html.erb" with:
+      """
+      <%= render :partial => "gadget", :collection => @gadgets %>
+      """
+    When I run `rspec spec/views/gadgets/list.html.erb_spec.rb`
+    Then the examples should all pass
+
+  Scenario: stub template that exists
+    Given a file named "spec/views/gadgets/edit.html.erb_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "gadgets/edit.html.erb" do
+        before(:each) do
+          @gadget = assign(:gadget, stub_model(Gadget))
+        end
+
+        it "renders the form partial" do
+          stub_template "gadgets/_form.html.erb" => "This content"
+          render
+          rendered.should =~ /This content/
+        end
+      end
+      """
+    When I run `rspec spec/views/gadgets/edit.html.erb_spec.rb`
+    Then the examples should all pass
+

data/features/view_specs/view_spec.feature

@@ -16,13 +16,13 @@ Feature: view spec
 
           render
 
-          rendered.should contain("slicer")
-          rendered.should contain("dicer")
+          rendered.should =~ /slicer/
+          rendered.should =~ /dicer/
         end
       end
       """
-    When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    When I run `rspec spec/views`
+    Then the examples should all pass
 
   Scenario: passing spec with before and nesting
     Given a file named "spec/views/widgets/index.html.erb_spec.rb" with:
@@ -42,14 +42,14 @@ Feature: view spec
           it "displays both widgets" do
             render
 
-            rendered.should contain("slicer")
-            rendered.should contain("dicer")
+            rendered.should =~ /slicer/
+            rendered.should =~ /dicer/
           end
         end
       end
       """
-    When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    When I run `rspec spec/views`
+    Then the examples should all pass
 
   Scenario: passing spec with explicit template rendering
     Given a file named "spec/views/widgets/widget.html.erb_spec.rb" with:
@@ -62,7 +62,7 @@ Feature: view spec
 
           render :template => "widgets/widget.html.erb"
 
-          rendered.should contain("slicer")
+          rendered.should =~ /slicer/
         end
       end
       """
@@ -70,8 +70,8 @@ Feature: view spec
       """
       <h2><%= @widget.name %></h2>
       """
-    When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    When I run `rspec spec/views`
+    Then the examples should all pass
 
   Scenario: passing spec with rendering of locals in a partial
     Given a file named "spec/views/widgets/_widget.html.erb_spec.rb" with:
@@ -84,7 +84,7 @@ Feature: view spec
 
           render :partial => "widgets/widget.html.erb", :locals => {:widget => widget}
 
-          rendered.should contain("slicer")
+          rendered.should =~ /slicer/
         end
       end
       """
@@ -92,8 +92,8 @@ Feature: view spec
       """
       <h3><%= widget.name %></h3>
       """
-    When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    When I run `rspec spec/views`
+    Then the examples should all pass
 
   Scenario: passing spec with rendering of locals in an implicit partial
     Given a file named "spec/views/widgets/_widget.html.erb_spec.rb" with:
@@ -106,7 +106,7 @@ Feature: view spec
 
           render "widgets/widget", :widget => widget
 
-          rendered.should contain("slicer")
+          rendered.should =~ /slicer/
         end
       end
       """
@@ -114,8 +114,8 @@ Feature: view spec
       """
       <h3><%= widget.name %></h3>
       """
-    When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    When I run `rspec spec/views`
+    Then the examples should all pass
 
   Scenario: passing spec with rendering of text
     Given a file named "spec/views/widgets/direct.html.erb_spec.rb" with:
@@ -127,31 +127,12 @@ Feature: view spec
 
           render :text => "This is directly rendered"
 
-          rendered.should contain("directly rendered")
+          rendered.should =~ /directly rendered/
         end
       end
       """
-    When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
-
-  Scenario: passing spec with rendering of Prototype helper update
-    Given a file named "spec/views/widgets/prototype_update.html.erb_spec.rb" with:
-      """
-      require "spec_helper"
-
-      describe "render a Prototype helper update" do
-        it "hides the status indicator" do
-
-          render :update do |page|
-            page.hide 'status-indicator'
-          end
-
-          rendered.should contain("Element.hide(\"status-indicator\")")
-        end
-      end
-      """
-    When I run "rspec spec/views"
-    Then the output should contain "1 example, 0 failures"
+    When I run `rspec spec/views`
+    Then the examples should all pass
 
   Scenario: spec with view that accesses helper_method helpers
     Given a file named "app/views/secrets/index.html.erb" with:
@@ -177,9 +158,9 @@ Feature: view spec
 
         it 'checks for admin access' do
           render
-          rendered.should contain('Secret admin area')
+          rendered.should =~ /Secret admin area/
         end
       end
       """
-    When I run "rspec spec/views/secrets"
-    Then the output should contain "1 example, 0 failures"
+    When I run `rspec spec/views/secrets`
+    Then the examples should all pass

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_BIN: bin

data/gemfiles/base.rb

@@ -0,0 +1,58 @@
+module GemfileBase
+  def self.extended(host)
+    host.instance_eval do
+      source "http://rubygems.org"
+
+      %w[rspec rspec-core rspec-expectations rspec-mocks rspec-rails].each do |lib|
+        library_path = File.expand_path("../../../#{lib}", __FILE__)
+        if File.exist?(library_path)
+          gem lib, :path => library_path
+        elsif ENV["CI"] || ENV["USE_GIT_REPOS"]
+          gem lib, :git => "git://github.com/rspec/#{lib}.git"
+        else
+          gem lib
+        end
+      end
+
+      gem 'sqlite3-ruby', :require => 'sqlite3'
+      gem "cucumber", "~> 0.10.2"
+      gem "aruba", "~> 0.3.6"
+      gem "growl", "1.0.3"
+      gem "ZenTest", "~> 4.4.2"
+
+      # gem "webrat", "0.7.3"
+      # gem "capybara", "~> 0.4"
+      # gem "capybara", "1.0.0.beta1"
+
+      unless ENV['CI']
+        gem "rcov", "0.9.9"
+        gem "relish", "0.2.0"
+        gem "guard-rspec", "0.1.9"
+
+        if RUBY_PLATFORM =~ /darwin/
+          gem "autotest-fsevent", "~> 0.2.4"
+          gem "autotest-growl", "~> 0.2.9"
+        end
+
+        platforms :mri_18 do
+          gem 'ruby-debug'
+        end
+
+        platforms :mri_19 do
+          gem 'linecache19', '0.5.11' # 0.5.12 cannot install on 1.9.1, and 0.5.11 appears to work with both 1.9.1 & 1.9.2
+          gem 'ruby-debug19'
+          gem 'ruby-debug-base19', RUBY_VERSION == '1.9.1' ? '0.11.23' : '~> 0.11.24'
+        end
+
+        platforms :ruby_18, :ruby_19 do
+          gem "rb-fsevent", "~> 0.3.9"
+          gem "ruby-prof", "~> 0.9.2"
+        end
+      end
+
+      platforms :jruby do
+        gem "jruby-openssl"
+      end
+    end
+  end
+end

data/gemfiles/rails-3-0-stable

@@ -0,0 +1,6 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", :git => "git://github.com/rails/rails.git", :branch => "3-0-stable"
+gem "arel",  :git => "git://github.com/rails/arel.git", :branch => "2-0-stable"

data/gemfiles/rails-3.0.0

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.0"

data/gemfiles/rails-3.0.1

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.1"

data/gemfiles/rails-3.0.2

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.2"

data/gemfiles/rails-3.0.3

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.3"

data/gemfiles/rails-3.0.4

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.4"

data/gemfiles/rails-3.0.5

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.5"

data/gemfiles/rails-3.0.6

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.6"

data/gemfiles/rails-3.0.7

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.7"

data/gemfiles/rails-3.1.0.beta1

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.1.0.beta1"

data/gemfiles/rails-master

@@ -0,0 +1,7 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", :git => "git://github.com/rails/rails.git"
+gem "arel",  :git => "git://github.com/rails/arel.git"
+gem "rack",  :git => "git://github.com/rack/rack.git"

data/lib/autotest/rails_rspec2.rb

@@ -71,7 +71,7 @@ class Autotest::RailsRspec2 < Autotest::Rspec2
     add_mapping(%r%^config/database\.yml$%) { |_, m|
       files_matching %r%^spec/models/.*_spec\.rb$%
     }
-    add_mapping(%r%^(spec/(spec_helper|shared/.*)|config/(boot|environment(s/test)?))\.rb$%) {
+    add_mapping(%r%^(spec/(spec_helper|support/.*)|config/(boot|environment(s/test)?))\.rb$%) {
       files_matching %r%^spec/(models|controllers|routing|views|helpers)/.*_spec\.rb$%
     }
     add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|

data/lib/generators/rspec/controller/controller_generator.rb

@@ -9,16 +9,16 @@ module Rspec
       class_option :controller_specs, :type => :boolean, :default => true
       class_option :view_specs,       :type => :boolean, :default => true
 
-      def create_controller_files
-        return unless options[:controllers]
+      def generate_controller_spec
+        return unless options[:controller_specs]
 
         template 'controller_spec.rb',
                  File.join('spec/controllers', class_path, "#{file_name}_controller_spec.rb")
       end
 
-      def create_view_files
+      def generate_view_specs
         return if actions.empty?
-        return unless options[:views]
+        return unless options[:view_specs]
 
         empty_directory File.join("spec", "views", file_path)
 

data/lib/generators/rspec/helper/helper_generator.rb

@@ -3,10 +3,10 @@ require 'generators/rspec'
 module Rspec
   module Generators
     class HelperGenerator < Base
-      class_option :helpers, :type => :boolean, :default => true
+      class_option :helper_specs, :type => :boolean, :default => true
 
-      def create_helper_files
-        return unless options[:helpers]
+      def generate_helper_spec
+        return unless options[:helper_specs]
 
         template 'helper_spec.rb', File.join('spec/helpers', class_path, "#{file_name}_helper_spec.rb")
       end

data/lib/generators/rspec/install/install_generator.rb

@@ -19,14 +19,6 @@ DESC
         directory 'spec'
       end
 
-      def copy_autotest_files
-        directory 'autotest'
-      end
-
-      def app_name
-        Rails.application.class.name
-      end
-
     end
   end
 end

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

@@ -3,10 +3,24 @@ require 'generators/rspec'
 module Rspec
   module Generators
     class IntegrationGenerator < Base
-      def create_integration_file
+      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]
+
         template 'request_spec.rb',
                  File.join('spec/requests', class_path, "#{table_name}_spec.rb")
       end
+
+    protected
+
+      def webrat?
+        RSpec.deprecate("the --webrat-matchers option", "--webrat") if options[:webrat_matchers]
+        options[:webrat] || options[:webrat_matchers]
+      end
+
     end
   end
 end

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

@@ -3,7 +3,13 @@ require 'spec_helper'
 describe "<%= class_name.pluralize %>" do
   describe "GET /<%= table_name %>" do
     it "works! (now write some real specs)" do
-      get <%= table_name %>_path
+<% 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 -%>
+      response.status.should be(200)
     end
   end
 end

data/lib/generators/rspec/mailer/mailer_generator.rb

@@ -5,11 +5,11 @@ module Rspec
     class MailerGenerator < Base
       argument :actions, :type => :array, :default => [], :banner => "method method"
 
-      def create_spec_files
+      def generate_mailer_spec
         template "mailer_spec.rb", File.join('spec/mailers', class_path, "#{file_name}_spec.rb")
       end
 
-      def create_fixtures_files
+      def generate_fixtures_files
         actions.each do |action|
           @action, @path = action, File.join(file_path, action)
           template "fixture", File.join("spec/fixtures", @path)

data/lib/generators/rspec/model/model_generator.rb

@@ -6,7 +6,7 @@ module Rspec
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
       class_option :fixture, :type => :boolean
 
-      def create_test_file
+      def create_model_spec
         template 'model_spec.rb', File.join('spec/models', class_path, "#{file_name}_spec.rb")
       end
 

data/lib/generators/rspec/observer/observer_generator.rb

@@ -3,7 +3,7 @@ require 'generators/rspec'
 module Rspec
   module Generators
     class ObserverGenerator < Base
-      def create_observer_files
+      def generate_observer_spec
         template 'observer_spec.rb',
                  File.join('spec', 'models', class_path, "#{file_name}_observer_spec.rb")
       end

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

@@ -14,17 +14,19 @@ 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"
 
-      def copy_controller_files
+      def generate_controller_spec
         return unless options[:controller_specs]
 
         template 'controller_spec.rb',
                  File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
       end
 
-      def copy_view_files
+      def generate_view_specs
         return unless options[:view_specs]
 
         copy_view :edit
@@ -38,7 +40,7 @@ module Rspec
         invoke invoked, [ controller_name ]
       end
 
-      def copy_routing_files
+      def generate_routing_spec
         return unless options[:routing_specs]
 
         template 'routing_spec.rb',
@@ -49,6 +51,11 @@ module Rspec
 
       protected
 
+        def webrat?
+          RSpec.deprecate("--webrat-matchers", "--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")
@@ -58,6 +65,24 @@ module Rspec
           "{'these' => 'params'}"
         end
 
+        # support for namespaced-resources
+        def ns_file_name
+          if ARGV[0].match(/(\w+)\/(\w+)/)
+            "#{$1.underscore}_#{$2.singularize.underscore}"
+          else
+            file_name
+          end
+        end
+
+        # support for namespaced-resources
+        def ns_table_name
+          if ARGV[0].match(/(\w+)\/(\w+)/)
+            "#{$1.underscore}/#{$2.tableize}"
+          else
+            table_name
+          end
+        end
+
         # Returns the name of the mock. For example, if the file name is user,
         # it returns mock_user.
         #
@@ -74,9 +99,9 @@ module Rspec
           if hash
             method, and_return = hash.to_a.first
             method = orm_instance.send(method).split('.').last.gsub(/\(.*?\)/, '')
-            "mock_#{file_name}(:#{method} => #{and_return})"
+            "mock_#{ns_file_name}(:#{method} => #{and_return})"
           else
-            "mock_#{file_name}"
+            "mock_#{ns_file_name}"
           end
         end
 
@@ -90,21 +115,21 @@ module Rspec
         #   should! orm_class.find(User, "37")
         #   #=> User.should_receive(:get).with(37)
         #
-        def should_receive!(chain)
+        def should_receive(chain)
           stub_or_should_chain(:should_receive, chain)
         end
 
         # Receives the ORM chain and convert to stub. For ActiveRecord:
         #
-        #   stub! orm_class.find(User, "37")
-        #   #=> User.stub!(:find).with(37)
+        #   stub orm_class.find(User, "37")
+        #   #=> User.stub(:find).with(37)
         #
         # For Datamapper:
         #
-        #   stub! orm_class.find(User, "37")
-        #   #=> User.stub!(:get).with(37)
+        #   stub orm_class.find(User, "37")
+        #   #=> User.stub(:get).with(37)
         #
-        def stub!(chain)
+        def stub(chain)
           stub_or_should_chain(:stub, chain)
         end
 
@@ -126,6 +151,10 @@ module Rspec
           end
         end
 
+        def banner
+          self.class.banner
+        end
+
     end
   end
 end