rspec-rails 1.2.6 → 1.2.7

data/lib/spec/rails/version.rb

@@ -4,9 +4,10 @@ module Spec # :nodoc:
       unless defined? MAJOR
         MAJOR  = 1
         MINOR  = 2
-        TINY   = 6
-
-        STRING = [MAJOR, MINOR, TINY].compact.join('.')
+        TINY   = 7
+        PRE    = nil
+      
+        STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
 
         SUMMARY = "rspec-rails #{STRING}"
       end

data/spec/resources/controllers/controller_spec_controller.rb

@@ -13,6 +13,9 @@ class ControllerSpecController < ActionController::Base
     render :template => "template/that/does/not/actually/exist"
   end
   
+  def some_action_with_implied_template
+  end
+  
   def action_with_template
     render :template => "controller_spec/action_with_template"
   end
@@ -105,11 +108,11 @@ class ControllerSpecController < ActionController::Base
   end
 
   def rescued_error_action
-    raise RescuedError
+    raise ControllerSpecController::RescuedError
   end
 
   def un_rescued_error_action
-    raise UnRescuedError
+    raise ControllerSpecController::UnRescuedError
   end
 end
 

data/spec/spec/rails/example/controller_isolation_spec.rb

@@ -4,12 +4,18 @@ require 'controller_spec_controller'
 describe "a controller spec running in isolation mode", :type => :controller do
   controller_name :controller_spec
 
-  it "should not care if the template doesn't exist" do
+  it "should not care if the specified template doesn't exist" do
     get 'some_action'
     response.should be_success
     response.should render_template("template/that/does/not/actually/exist")
   end
 
+  it "should not care if the implied template doesn't exist" do
+    get 'some_action_with_implied_template'
+    response.should be_success
+    response.should render_template("some_action_with_implied_template")
+  end
+
   it "should not care if the template has errors" do
     get 'action_with_errors_in_template'
     response.should be_success

data/spec/spec/rails/extensions/action_view_base_spec.rb

@@ -23,26 +23,52 @@ describe ActionView::Base, "with RSpec extensions:", :type => :view do
     end
   end
   
-  describe "stub!(:render)" do
-    it "should not raise when stubbing and render has been received" do
-      template.stub!(:render).with(:partial => "name")
-      template.render :partial => "name"
-    end
+  [:stub!, :stub].each do |method|
+    describe "#{method}(:render)" do
+      it "should not raise when stubbing and render has been received" do
+        template.send(method, :render).with(:partial => "name")
+        template.render :partial => "name"
+      end
   
-    it "should not raise when stubbing and render has NOT been received" do
-      template.stub!(:render).with(:partial => "name")
-    end
+      it "should not raise when stubbing and render has NOT been received" do
+        template.send(method, :render).with(:partial => "name")
+      end
   
-    it "should not raise when stubbing and render has been received with different options" do
-      template.stub!(:render).with(:partial => "name")
-      template.render :partial => "view_spec/spacer"
-    end
+      it "should not raise when stubbing and render has been received with different options" do
+        template.send(method, :render).with(:partial => "name")
+        template.render :partial => "view_spec/spacer"
+      end
 
-    it "should not raise when stubbing and expecting and render has been received" do
-      template.stub!(:render).with(:partial => "name")
-      template.should_receive(:render).with(:partial => "name")
-      template.render(:partial => "name")
+      it "should not raise when stubbing and expecting and render has been received" do
+        template.send(method, :render).with(:partial => "name")
+        template.should_receive(:render).with(:partial => "name")
+        template.render(:partial => "name")
+      end
     end
+    
+    describe "#{method}(:helper_method)" do
+      it "should not raise when stubbing and helper_method has been received" do
+        template.send(method, :helper_method).with(:arg => "value")
+        template.helper_method :arg => "value"
+      end
+    
+      it "should not raise when stubbing and helper_method has NOT been received" do
+        template.send(method, :helper_method).with(:arg => "value")
+      end
+    
+      it "SHOULD raise when stubbing and helper_method has been received with different options" do
+        template.send(method, :helper_method).with(:arg => "value")
+        expect { template.helper_method :arg => "other_value" }.
+          to raise_error(/undefined .* `helper_method'/)
+      end
+    
+      it "should not raise when stubbing and expecting and helper_method has been received" do
+        template.send(method, :helper_method).with(:arg => "value")
+        template.should_receive(:helper_method).with(:arg => "value")
+        template.helper_method(:arg => "value")
+      end
+    end
+    
   end
 
 end

data/spec/spec/rails/matchers/errors_on_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "error_on" do
   it "should provide a description including the name of what the error is on" do
-    have(1).error_on(:whatever).description.should == "should have 1 error on :whatever"
+    have(1).error_on(:whatever).description.should == "have 1 error on :whatever"
   end
   
   it "should provide a failure message including the number actually given" do
@@ -14,7 +14,7 @@ end
 
 describe "errors_on" do
   it "should provide a description including the name of what the error is on" do
-    have(2).errors_on(:whatever).description.should == "should have 2 errors on :whatever"
+    have(2).errors_on(:whatever).description.should == "have 2 errors on :whatever"
   end
   
   it "should provide a failure message including the number actually given" do
@@ -22,4 +22,16 @@ describe "errors_on" do
       [1].should have(3).errors_on(:whatever)
     }.should fail_with("expected 3 errors on :whatever, got 1")
   end
+end
+
+describe "have something other than error_on or errors_on" do
+  it "has a standard rspec failure message" do
+    lambda {
+      [1,2,3].should have(2).elements
+    }.should fail_with("expected 2 elements, got 3")
+  end
+
+  it "has a standard rspec description" do
+    have(2).elements.description.should == "have 2 elements"
+  end
 end

data/spec/spec/rails/matchers/have_text_spec.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "have_text" do
-  
 
   it "should have a helpful description" do
     matcher = have_text("foo bar")

data/spec/spec/rails/matchers/render_template_spec.rb

@@ -16,11 +16,21 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
         should render_template('some_action')
       end
 
+      it "does not match an action that is a truncated version of the actual action" do
+        post 'some_action'
+        should_not render_template('some_actio')
+      end
+
       if ::Rails::VERSION::STRING >= '2.3'
-        it "matches an action with specified extenstions" do
+        it "matches an action with specified extenstions (implicit format)" do
           post 'some_action'
           should render_template('some_action.html.erb')
         end
+
+        it "matches an action with specified extenstions (explicit format)" do
+          post 'some_action', :format => 'js'
+          should render_template('some_action.js.rjs')
+        end
       end
 
       it "matches an action (using a symbol)" do

data/spec/spec/rails/spec_server_spec.rb

@@ -54,8 +54,9 @@ shared_examples_for "script/spec_server file" do
 
   def start_spec_server
     dir = File.dirname(__FILE__)
+    
     Thread.start do
-      system "cd #{RAILS_ROOT}; script/spec_server"
+      system "cd #{RAILS_ROOT}; CACHE_CLASSES=#{(Rails::VERSION::STRING < '2.2')} script/spec_server"
     end
 
     file_content = ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-30 00:00:00 -05:00
+date: 2009-06-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.6
+        version: 1.2.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.2
+        version: 0.3.11
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.12.1
+        version: 2.1.0
     version: 
 description: Behaviour Driven Development for Ruby on Rails.
 email: 
@@ -73,8 +73,8 @@ files:
 - Rakefile
 - TODO.txt
 - Upgrade.rdoc
-- features/step_definitions/people.rb
-- features/support/env.rb
+- generators/integration_spec/integration_spec_generator.rb
+- generators/integration_spec/templates/integration_spec.rb
 - generators/rspec/CHANGES
 - generators/rspec/rspec_generator.rb
 - generators/rspec/templates/previous_failures.txt
@@ -112,6 +112,7 @@ files:
 - lib/spec/rails/example/cookies_proxy.rb
 - lib/spec/rails/example/functional_example_group.rb
 - lib/spec/rails/example/helper_example_group.rb
+- lib/spec/rails/example/integration_example_group.rb
 - lib/spec/rails/example/model_example_group.rb
 - lib/spec/rails/example/render_observer.rb
 - lib/spec/rails/example/routing_example_group.rb
@@ -237,7 +238,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-1.2.6
+    Thank you for installing rspec-rails-1.2.7
     
     If you are upgrading, do this in each of your rails apps
     that you want to upgrade:
@@ -269,9 +270,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.3.2
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
-summary: rspec-rails 1.2.6
+summary: rspec-rails 1.2.7
 test_files: []
 

data/features/step_definitions/people.rb

@@ -1,6 +0,0 @@
-When "I add a Person" do
-  Person.create!(:name => "Foo")
-end
-Then "there should be one person" do
-  Person.count.should == 1
-end

data/features/support/env.rb

@@ -1,13 +0,0 @@
-# Sets up the Rails environment for Cucumber
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + '/../../../../../config/environment')
-require 'cucumber/rails/world'
-Cucumber::Rails.use_transactional_fixtures
-
-# require 'webrat/rails'
-
-# Comment out the next two lines if you're not using RSpec's matchers (should / should_not) in your steps.
-require 'cucumber/rails/rspec'
-# require 'webrat/rspec-rails'
-
-require File.join(File.dirname(__FILE__), "/../../spec/resources/models/person")