cavalle-rspec-rails 1.2.2.0.2 → 1.2.3.1

data/History.rdoc

@@ -1,3 +1,5 @@
+=== Version 1.2.3 (in git)
+
 === 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 = 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/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,72 +7,41 @@ 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 %>)
@@ -83,12 +52,10 @@ 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 %>)
@@ -99,22 +66,20 @@ 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 %>)
@@ -125,18 +90,16 @@ 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 %>)
@@ -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/spec_server.rb

@@ -102,11 +102,7 @@ module Spec
           )
         )
 
-        if ::ActionController::Dispatcher.respond_to?(:cleanup_application)
-          ::ActionController::Dispatcher.cleanup_application
-        else
-          dispatcher.cleanup_application
-        end
+        dispatcher.cleanup_application if dispatcher.respond_to?(:cleanup_application)
       end
 
       def in_memory_database?

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: cavalle-rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.2.2.0.2
+  version: 1.2.3.1
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-13 00:00:00 -07:00
+date: 2009-04-12 00:00:00 -07: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
@@ -140,7 +140,6 @@ files:
 - lib/spec/rails/spec_server.rb
 - lib/spec/rails/story_adapter.rb
 - lib/spec/rails/version.rb
-- rspec-rails.gemspec
 - spec/autotest/mappings_spec.rb
 - spec/rails_suite.rb
 - spec/resources/controllers/action_view_base_spec_controller.rb
@@ -237,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:
@@ -272,6 +271,6 @@ rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: rspec-rails 1.2.2
+summary: rspec-rails 1.2.3
 test_files: []
 

data/rspec-rails.gemspec

@@ -1,57 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{rspec-rails}
-  s.version = "1.2.2.0.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["RSpec Development Team"]
-  s.date = %q{2009-04-13}
-  s.description = %q{Behaviour Driven Development for Ruby on Rails.}
-  s.email = ["rspec-devel@rubyforge.org"]
-  s.extra_rdoc_files = ["License.txt", "Manifest.txt", "TODO.txt", "generators/rspec/templates/previous_failures.txt"]
-  s.files = [".document", "History.rdoc", "License.txt", "Manifest.txt", "README.rdoc", "Rakefile", "TODO.txt", "Upgrade.rdoc", "features/step_definitions/people.rb", "features/support/env.rb", "features/transactions/transactions_should_rollback.feature", "generators/rspec/CHANGES", "generators/rspec/rspec_generator.rb", "generators/rspec/templates/previous_failures.txt", "generators/rspec/templates/rcov.opts", "generators/rspec/templates/rspec.rake", "generators/rspec/templates/script/autospec", "generators/rspec/templates/script/spec", "generators/rspec/templates/script/spec_server", "generators/rspec/templates/spec.opts", "generators/rspec/templates/spec_helper.rb", "generators/rspec_controller/USAGE", "generators/rspec_controller/rspec_controller_generator.rb", "generators/rspec_controller/templates/controller_spec.rb", "generators/rspec_controller/templates/helper_spec.rb", "generators/rspec_controller/templates/view_spec.rb", "generators/rspec_default_values.rb", "generators/rspec_model/USAGE", "generators/rspec_model/rspec_model_generator.rb", "generators/rspec_model/templates/model_spec.rb", "generators/rspec_scaffold/rspec_scaffold_generator.rb", "generators/rspec_scaffold/templates/controller_spec.rb", "generators/rspec_scaffold/templates/edit_erb_spec.rb", "generators/rspec_scaffold/templates/helper_spec.rb", "generators/rspec_scaffold/templates/index_erb_spec.rb", "generators/rspec_scaffold/templates/new_erb_spec.rb", "generators/rspec_scaffold/templates/routing_spec.rb", "generators/rspec_scaffold/templates/show_erb_spec.rb", "init.rb", "lib/autotest/discover.rb", "lib/autotest/rails_rspec.rb", "lib/spec/rails.rb", "lib/spec/rails/example.rb", "lib/spec/rails/example/assigns_hash_proxy.rb", "lib/spec/rails/example/controller_example_group.rb", "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/model_example_group.rb", "lib/spec/rails/example/render_observer.rb", "lib/spec/rails/example/routing_example_group.rb", "lib/spec/rails/example/routing_helpers.rb", "lib/spec/rails/example/view_example_group.rb", "lib/spec/rails/extensions.rb", "lib/spec/rails/extensions/action_controller/rescue.rb", "lib/spec/rails/extensions/action_controller/test_case.rb", "lib/spec/rails/extensions/action_controller/test_response.rb", "lib/spec/rails/extensions/action_view/base.rb", "lib/spec/rails/extensions/active_record/base.rb", "lib/spec/rails/extensions/active_support/test_case.rb", "lib/spec/rails/extensions/spec/matchers/have.rb", "lib/spec/rails/extensions/spec/runner/configuration.rb", "lib/spec/rails/interop/testcase.rb", "lib/spec/rails/matchers.rb", "lib/spec/rails/matchers/ar_be_valid.rb", "lib/spec/rails/matchers/assert_select.rb", "lib/spec/rails/matchers/change.rb", "lib/spec/rails/matchers/have_text.rb", "lib/spec/rails/matchers/include_text.rb", "lib/spec/rails/matchers/redirect_to.rb", "lib/spec/rails/matchers/render_template.rb", "lib/spec/rails/mocks.rb", "lib/spec/rails/spec_server.rb", "lib/spec/rails/story_adapter.rb", "lib/spec/rails/version.rb", "rspec-rails.gemspec", "spec/autotest/mappings_spec.rb", "spec/rails_suite.rb", "spec/resources/controllers/action_view_base_spec_controller.rb", "spec/resources/controllers/application.rb", "spec/resources/controllers/controller_spec_controller.rb", "spec/resources/controllers/example.txt", "spec/resources/controllers/redirect_spec_controller.rb", "spec/resources/controllers/render_spec_controller.rb", "spec/resources/controllers/rjs_spec_controller.rb", "spec/resources/helpers/addition_helper.rb", "spec/resources/helpers/explicit_helper.rb", "spec/resources/helpers/more_explicit_helper.rb", "spec/resources/helpers/plugin_application_helper.rb", "spec/resources/helpers/view_spec_helper.rb", "spec/resources/models/animal.rb", "spec/resources/models/person.rb", "spec/resources/models/thing.rb", "spec/resources/views/controller_spec/_partial.html.erb", "spec/resources/views/controller_spec/action_setting_flash_after_session_reset.html.erb", "spec/resources/views/controller_spec/action_setting_flash_before_session_reset.html.erb", "spec/resources/views/controller_spec/action_setting_the_assigns_hash.html.erb", "spec/resources/views/controller_spec/action_with_errors_in_template.html.erb", "spec/resources/views/controller_spec/action_with_template.html.erb", "spec/resources/views/layouts/application.html.erb", "spec/resources/views/layouts/simple.html.erb", "spec/resources/views/objects/_object.html.erb", "spec/resources/views/render_spec/_a_partial.html.erb", "spec/resources/views/render_spec/action_with_alternate_layout.html.erb", "spec/resources/views/render_spec/some_action.html.erb", "spec/resources/views/render_spec/some_action.js.rjs", "spec/resources/views/rjs_spec/_replacement_partial.html.erb", "spec/resources/views/rjs_spec/hide_div.js.rjs", "spec/resources/views/rjs_spec/hide_page_element.js.rjs", "spec/resources/views/rjs_spec/insert_html.js.rjs", "spec/resources/views/rjs_spec/replace.js.rjs", "spec/resources/views/rjs_spec/replace_html.js.rjs", "spec/resources/views/rjs_spec/replace_html_with_partial.js.rjs", "spec/resources/views/rjs_spec/visual_effect.js.rjs", "spec/resources/views/rjs_spec/visual_toggle_effect.js.rjs", "spec/resources/views/tag_spec/no_tags.html.erb", "spec/resources/views/tag_spec/single_div_with_no_attributes.html.erb", "spec/resources/views/tag_spec/single_div_with_one_attribute.html.erb", "spec/resources/views/view_spec/_partial.html.erb", "spec/resources/views/view_spec/_partial_used_twice.html.erb", "spec/resources/views/view_spec/_partial_with_local_variable.html.erb", "spec/resources/views/view_spec/_partial_with_sub_partial.html.erb", "spec/resources/views/view_spec/_spacer.html.erb", "spec/resources/views/view_spec/accessor.html.erb", "spec/resources/views/view_spec/block_helper.html.erb", "spec/resources/views/view_spec/entry_form.html.erb", "spec/resources/views/view_spec/explicit_helper.html.erb", "spec/resources/views/view_spec/foo/show.html.erb", "spec/resources/views/view_spec/implicit_helper.html.erb", "spec/resources/views/view_spec/multiple_helpers.html.erb", "spec/resources/views/view_spec/path_params.html.erb", "spec/resources/views/view_spec/should_not_receive.html.erb", "spec/resources/views/view_spec/template_with_partial.html.erb", "spec/resources/views/view_spec/template_with_partial_using_collection.html.erb", "spec/resources/views/view_spec/template_with_partial_with_array.html.erb", "spec/spec/rails/example/assigns_hash_proxy_spec.rb", "spec/spec/rails/example/configuration_spec.rb", "spec/spec/rails/example/controller_example_group_spec.rb", "spec/spec/rails/example/controller_isolation_spec.rb", "spec/spec/rails/example/cookies_proxy_spec.rb", "spec/spec/rails/example/error_handling_spec.rb", "spec/spec/rails/example/example_group_factory_spec.rb", "spec/spec/rails/example/helper_example_group_spec.rb", "spec/spec/rails/example/model_example_group_spec.rb", "spec/spec/rails/example/routing_example_group_spec.rb", "spec/spec/rails/example/shared_routing_example_group_examples.rb", "spec/spec/rails/example/test_unit_assertion_accessibility_spec.rb", "spec/spec/rails/example/view_example_group_spec.rb", "spec/spec/rails/extensions/action_view_base_spec.rb", "spec/spec/rails/extensions/active_record_spec.rb", "spec/spec/rails/interop/testcase_spec.rb", "spec/spec/rails/matchers/ar_be_valid_spec.rb", "spec/spec/rails/matchers/assert_select_spec.rb", "spec/spec/rails/matchers/errors_on_spec.rb", "spec/spec/rails/matchers/have_text_spec.rb", "spec/spec/rails/matchers/include_text_spec.rb", "spec/spec/rails/matchers/redirect_to_spec.rb", "spec/spec/rails/matchers/render_template_spec.rb", "spec/spec/rails/matchers/should_change_spec.rb", "spec/spec/rails/mocks/ar_classes.rb", "spec/spec/rails/mocks/mock_model_spec.rb", "spec/spec/rails/mocks/stub_model_spec.rb", "spec/spec/rails/sample_modified_fixture.rb", "spec/spec/rails/sample_spec.rb", "spec/spec/rails/spec_server_spec.rb", "spec/spec/rails/spec_spec.rb", "spec/spec_helper.rb"]
-  s.has_rdoc = true
-  s.homepage = %q{http://rspec.info}
-  s.post_install_message = %q{**************************************************
-
-  Thank you for installing rspec-rails-1.2.2
-  
-  If you are upgrading, do this in each of your rails apps
-  that you want to upgrade:
-
-    $ ruby script/generate rspec
-
-  Please be sure to read History.rdoc and Upgrade.rdoc
-  for useful information about this release.
-
-**************************************************
-}
-  s.rdoc_options = ["--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{rspec}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{rspec-rails 1.2.2}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, ["= 1.2.2"])
-      s.add_runtime_dependency(%q<rack>, [">= 0.4.0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0.1.16"])
-      s.add_development_dependency(%q<hoe>, [">= 1.12.1"])
-    else
-      s.add_dependency(%q<rspec>, ["= 1.2.2"])
-      s.add_dependency(%q<rack>, [">= 0.4.0"])
-      s.add_dependency(%q<cucumber>, [">= 0.1.16"])
-      s.add_dependency(%q<hoe>, [">= 1.12.1"])
-    end
-  else
-    s.add_dependency(%q<rspec>, ["= 1.2.2"])
-    s.add_dependency(%q<rack>, [">= 0.4.0"])
-    s.add_dependency(%q<cucumber>, [">= 0.1.16"])
-    s.add_dependency(%q<hoe>, [">= 1.12.1"])
-  end
-end