rspec-rails 1.2.2 → 1.2.3

data/History.rdoc

@@ -1,3 +1,7 @@
+=== Version 1.2.3 / 2009-03-13
+
+No changes in this release, but aligns with the rspec-1.2.3 release.
+
 === Version 1.2.2 / 2009-03-22
 
 No changes in this release, but aligns with the rspec-1.2.2 release.

data/Rakefile

@@ -13,8 +13,8 @@ Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p|
   p.description = "Behaviour Driven Development for Ruby on Rails."
   p.rubyforge_name = 'rspec'
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
-  p.extra_deps = [["rspec","1.2.2"],["rack",">=0.4.0"]]
-  p.extra_dev_deps = [["cucumber",">= 0.1.16"]]
+  p.extra_deps = [["rspec","1.2.3"],["rack",">=0.4.0"]]
+  p.extra_dev_deps = [["cucumber",">= 0.2.2"]]
   p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
   p.history_file = 'History.rdoc'
   p.readme_file  = 'README.rdoc'

data/Upgrade.rdoc

@@ -1,4 +1,4 @@
-= Upgrade to 1.2
+= Upgrade to 1.2.0-1.2.3
 
 == What's changed
 
@@ -9,7 +9,7 @@ This release supports the following versions of rails:
 * 2.0.5
 * 2.1.2
 * 2.2.2
-* 2.3.1
+* 2.3.2
 
 === update generated files
 

data/generators/rspec/templates/script/spec

@@ -4,7 +4,7 @@ if ARGV.any? {|arg| %w[--drb -X --generate-options -G --help -h --version -v].in
 else
   gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
   ENV["RAILS_ENV"] ||= 'test'
-  require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
+  require File.expand_path(File.dirname(__FILE__) + "/../config/environment") unless defined?(RAILS_ROOT)
 end
 require 'spec/autorun'
 exit ::Spec::Runner::CommandLine.run

data/generators/rspec/templates/script/spec_server

@@ -3,7 +3,7 @@ gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
 
 puts "Loading Rails environment"
 ENV["RAILS_ENV"] ||= 'test'
-require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment") unless defined?(RAILS_ROOT)
 
 require 'optparse'
 require 'spec/rails/spec_server'

data/generators/rspec_scaffold/templates/controller_spec.rb

@@ -7,75 +7,44 @@ describe <%= controller_class_name %>Controller do
   end
   
   describe "GET index" do
-
-    it "exposes all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
+    it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
       <%= class_name %>.should_receive(:find).with(:all).and_return([mock_<%= file_name %>])
       get :index
       assigns[:<%= table_name %>].should == [mock_<%= file_name %>]
     end
-
-    describe "with mime type of xml" do
-  
-      it "renders all <%= table_name.pluralize %> as xml" do
-        <%= class_name %>.should_receive(:find).with(:all).and_return(<%= file_name.pluralize %> = mock("Array of <%= class_name.pluralize %>"))
-        <%= file_name.pluralize %>.should_receive(:to_xml).and_return("generated XML")
-        get :index, :format => 'xml'
-        response.body.should == "generated XML"
-      end
-    
-    end
-
   end
 
   describe "GET show" do
-
-    it "exposes the requested <%= file_name %> as @<%= file_name %>" do
+    it "assigns the requested <%= file_name %> as @<%= file_name %>" do
       <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
       get :show, :id => "37"
       assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
     end
-    
-    describe "with mime type of xml" do
-
-      it "renders the requested <%= file_name %> as xml" do
-        <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
-        mock_<%= file_name %>.should_receive(:to_xml).and_return("generated XML")
-        get :show, :id => "37", :format => 'xml'
-        response.body.should == "generated XML"
-      end
-
-    end
-    
   end
 
   describe "GET new" do
-  
-    it "exposes a new <%= file_name %> as @<%= file_name %>" do
+    it "assigns a new <%= file_name %> as @<%= file_name %>" do
       <%= class_name %>.should_receive(:new).and_return(mock_<%= file_name %>)
       get :new
       assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
     end
-
   end
 
   describe "GET edit" do
-  
-    it "exposes the requested <%= file_name %> as @<%= file_name %>" do
+    it "assigns the requested <%= file_name %> as @<%= file_name %>" do
       <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
       get :edit, :id => "37"
       assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
     end
-
   end
 
   describe "POST create" do
-
+    
     describe "with valid params" do
-      
-      it "exposes a newly created <%= file_name %> as @<%= file_name %>" do
+      it "assigns a newly created <%= file_name %> as @<%= file_name %>" do
         <%= class_name %>.should_receive(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => true))
         post :create, :<%= file_name %> => {:these => 'params'}
-        assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
+        assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
       end
 
       it "redirects to the created <%= file_name %>" do
@@ -83,15 +52,13 @@ describe <%= controller_class_name %>Controller do
         post :create, :<%= file_name %> => {}
         response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>))
       end
-      
     end
     
     describe "with invalid params" do
-
-      it "exposes a newly created but unsaved <%= file_name %> as @<%= file_name %>" do
+      it "assigns a newly created but unsaved <%= file_name %> as @<%= file_name %>" do
         <%= class_name %>.stub!(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => false))
         post :create, :<%= file_name %> => {:these => 'params'}
-        assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
+        assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
       end
 
       it "re-renders the 'new' template" do
@@ -99,25 +66,23 @@ describe <%= controller_class_name %>Controller do
         post :create, :<%= file_name %> => {}
         response.should render_template('new')
       end
-      
     end
     
   end
 
   describe "PUT udpate" do
-
+    
     describe "with valid params" do
-
       it "updates the requested <%= file_name %>" do
         <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
         mock_<%= file_name %>.should_receive(:update_attributes).with({'these' => 'params'})
         put :update, :id => "37", :<%= file_name %> => {:these => 'params'}
       end
 
-      it "exposes the requested <%= file_name %> as @<%= file_name %>" do
+      it "assigns the requested <%= file_name %> as @<%= file_name %>" do
         <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => true))
         put :update, :id => "1"
-        assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
+        assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
       end
 
       it "redirects to the <%= file_name %>" do
@@ -125,21 +90,19 @@ describe <%= controller_class_name %>Controller do
         put :update, :id => "1"
         response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>))
       end
-
     end
     
     describe "with invalid params" do
-
       it "updates the requested <%= file_name %>" do
         <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
         mock_<%= file_name %>.should_receive(:update_attributes).with({'these' => 'params'})
         put :update, :id => "37", :<%= file_name %> => {:these => 'params'}
       end
 
-      it "exposes the <%= file_name %> as @<%= file_name %>" do
+      it "assigns the <%= file_name %> as @<%= file_name %>" do
         <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => false))
         put :update, :id => "1"
-        assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
+        assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
       end
 
       it "re-renders the 'edit' template" do
@@ -147,13 +110,11 @@ describe <%= controller_class_name %>Controller do
         put :update, :id => "1"
         response.should render_template('edit')
       end
-
     end
-
+    
   end
 
   describe "DELETE destroy" do
-
     it "destroys the requested <%= file_name %>" do
       <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
       mock_<%= file_name %>.should_receive(:destroy)
@@ -165,7 +126,6 @@ describe <%= controller_class_name %>Controller do
       delete :destroy, :id => "1"
       response.should redirect_to(<%= table_name %>_url)
     end
-
   end
 
 end

data/lib/spec/rails/version.rb

@@ -4,7 +4,7 @@ module Spec # :nodoc:
       unless defined? MAJOR
         MAJOR  = 1
         MINOR  = 2
-        TINY   = 2
+        TINY   = 3
 
         STRING = [MAJOR, MINOR, TINY].compact.join('.')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-23 00:00:00 -05:00
+date: 2009-04-13 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: 1.2.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.16
+        version: 0.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.11.0
+        version: 1.12.1
     version: 
 description: Behaviour Driven Development for Ruby on Rails.
 email: 
@@ -236,7 +236,7 @@ homepage: http://rspec.info
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-1.2.2
+    Thank you for installing rspec-rails-1.2.3
     
     If you are upgrading, do this in each of your rails apps
     that you want to upgrade:
@@ -271,6 +271,6 @@ rubyforge_project: rspec
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: rspec-rails 1.2.2
+summary: rspec-rails 1.2.3
 test_files: []