rspec-rails 2.0.0 → 2.0.1

data/History.md

@@ -1,4 +1,17 @@
-## rspec-rails release history (incomplete)
+## rspec-rails-2 release history (incomplete)
+
+### 2.0.1 / 2010-10-15
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0...v2.0.1)
+
+* Enhancements
+  * Add option to not generate request spec (--skip-request-specs)
+
+* Bug fixes
+  * Updated the mock_[model] method generated in controller specs so it adds
+    any stubs submitted each time it is called.
+  * Fixed bug where view assigns weren't making it to the view in view specs in Rails-3.0.1.
+    (Emanuele Vicentini)
 
 ### 2.0.0 / 2010-10-10
 

data/Thorfile

@@ -1,13 +1,15 @@
 class Rails < Thor
   VERSIONS = {
     :rails => {
-      "3.0.0" => "v3.0.0",
       "master" => "master",
+      "3.0.0" => "v3.0.0",
+      "3.0.1" => "v3.0.1",
       "3-0-stable" => "origin/3-0-stable"
     },
     :arel => {
-      "3.0.0" => "v1.0.0",
       "master" => "master",
+      "3.0.0" => "v1.0.0",
+      "3.0.1" => "v1.0.0",
       "3-0-stable" => "master"
     }
   }

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

@@ -9,14 +9,14 @@ module Rspec
       class_option :controller_specs, :type => :boolean, :default => true
       class_option :view_specs,       :type => :boolean, :default => true
 
-      def create_controller_files
+      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[:view_specs]
 

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

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

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

@@ -3,7 +3,11 @@ 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"
+
+      def generate_request_spec
+        return unless options[:request_specs]
+
         template 'request_spec.rb',
                  File.join('spec/requests', class_path, "#{table_name}_spec.rb")
       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

@@ -18,14 +18,14 @@ module Rspec
       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
@@ -39,7 +39,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',

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

@@ -3,7 +3,9 @@ require 'spec_helper'
 describe <%= controller_class_name %>Controller do
 
   def <%= mock_file_name %>(stubs={})
-    @<%= mock_file_name %> ||= mock_model(<%= class_name %>, stubs).as_null_object
+    (@<%= mock_file_name %> ||= mock_model(<%= class_name %>).as_null_object).tap do |<%= file_name %>|
+      <%= file_name %>.stub(stubs) unless stubs.empty?
+    end
   end
 
 <% unless options[:singleton] -%>

data/lib/generators/rspec/view/view_generator.rb

@@ -7,7 +7,7 @@ module Rspec
 
       class_option :template_engine, :desc => "Template engine to generate view files"
 
-      def create_view_files
+      def create_view_specs
         empty_directory File.join("spec", "views", file_path)
 
         actions.each do |action|

data/lib/rspec/rails.rb

@@ -8,12 +8,13 @@ module RSpec
   end
 end
 
+require 'rspec/core'
+
 RSpec::configure do |c|
   c.backtrace_clean_patterns << /vendor\//
   c.backtrace_clean_patterns << /lib\/rspec\/rails/
 end
 
-require 'rspec/core'
 require 'rspec/rails/extensions'
 require 'rspec/rails/view_rendering'
 require 'rspec/rails/adapters'
@@ -23,3 +24,5 @@ require 'rspec/rails/mocks'
 require 'rspec/rails/module_inclusion'
 require 'rspec/rails/browser_simulators'
 require 'rspec/rails/example'
+
+

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Rails # :nodoc:
     module Version # :nodoc:
-      STRING = '2.0.0'
+      STRING = '2.0.1'
     end
   end
 end

data/lib/rspec/rails/view_assigns.rb

@@ -13,17 +13,26 @@ module RSpec
           _encapsulated_assigns[key] = value
         end
 
-        if ::Rails::VERSION::STRING == "3.0.0"
-          def _assigns
+        def view_assigns
+          begin
+            # TODO: _assigns was deprecated in favor of view_assigns after
+            # Rails-3.0.0 was released. Since we are not able to predict when
+            # the _assigns/view_assigns patch will be released (I thought it
+            # would have been in 3.0.1, but 3.0.1 bypassed this change for a
+            # security fix), this bit ensures that we do the right thing without
+            # knowing anything about the Rails version we are dealing with.
+            #
+            # Once that change _is_ released, this can be changed to something
+            # that checks for the Rails version when the module is being
+            # interpreted, as it was before commit dd0095.
             super.merge(_encapsulated_assigns)
-          end
-          def view_assigns
+          rescue
             _assigns
           end
-        else # >= 3.0.1
-          def view_assigns
-            super.merge(_encapsulated_assigns)
-          end
+        end
+
+        def _assigns
+          super.merge(_encapsulated_assigns)
         end
 
       private
@@ -32,6 +41,7 @@ module RSpec
           @_encapsulated_assigns ||= {}
         end
       end
+
     end
   end
 end

data/rspec-rails.gemspec

@@ -57,6 +57,6 @@ Gem::Specification.new do |s|
 **************************************************
 }
 
-  s.add_runtime_dependency "rspec", RSpec::Rails::Version::STRING
+  s.add_runtime_dependency "rspec", "~> 2.0.0"
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - David Chelimsky
@@ -15,24 +16,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 -05:00
+date: 2010-10-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
         version: 2.0.0
+  requirement: *id001
   type: :runtime
+  name: rspec
   prerelease: false
-  version_requirements: *id001
 description: RSpec-2 for Rails-3
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -165,7 +167,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0!
+    Thank you for installing rspec-rails-2.0.1!
   
     This version of rspec-rails only works with versions of rails >= 3.0.0
   
@@ -175,7 +177,7 @@ post_install_message: |
     can access its generators and rake tasks.
   
       group :development, :test do
-        gem "rspec-rails", ">= 2.0.0"
+        gem "rspec-rails", ">= 2.0.1"
       end
   
     Be sure to run the following command in each of your Rails apps if you're
@@ -206,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4170741284803000716
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -215,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4170741284803000716
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -225,7 +227,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0
+summary: rspec-rails-2.0.1
 test_files: 
 - features/README.markdown
 - features/controller_specs/anonymous_controller.feature