rspec-rails 2.2.0 → 2.2.1

data/Gemfile

@@ -1,13 +1,13 @@
 source "http://rubygems.org"
 
+gem "rails", :path => File.expand_path("../vendor/rails", __FILE__)
 gem "rack", :git => "git://github.com/rack/rack.git"
-gem 'rails', :path => File.expand_path("../vendor/rails", __FILE__)
 
 %w[rspec-rails rspec rspec-core rspec-expectations rspec-mocks].each do |lib|
   gem lib, :path => File.expand_path("../../#{lib}", __FILE__)
 end
 
-gem "cucumber", "0.9.4"
+gem "cucumber", :git => "git://github.com/dchelimsky/cucumber", :branch => "update-gemspec"
 gem "aruba", "0.2.2"
 gem 'webrat', "0.7.2"
 gem 'sqlite3-ruby', :require => 'sqlite3'

data/History.md

@@ -1,4 +1,16 @@
-## rspec-rails-2 release history (incomplete)
+## rspec-rails-2 release history
+
+### 2.2.1 / 2010-12-01
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.2.0...v2.2.1)
+
+* Bug fixes
+  * Depend on railties, activesupport, and actionpack instead of rails (Piotr
+    Solnica)
+  * Got webrat integration working properly across different types of specs
+
+* Deprecations
+  * --webrat-matchers flag for generators is deprecated. use --webrat instead.
 
 ### 2.2.0 / 2010-11-28
 

data/README.md

@@ -6,10 +6,10 @@ NOTE: rspec-2 does _not_ support rails-2. Use rspec-rails-1.3.x for rails-2.
 
 ## Documentation
 
-The [Cucumber features](http://relishapp.com/rspec/rspec-rails/v/2-1) are the
+The [Cucumber features](http://relishapp.com/rspec/rspec-rails/v/2-2) are the
 most comprehensive and up-to-date docs for end-users.
 
-The [RDoc](http://rubydoc.info/gems/rspec-rails/2.1/frames) provides additional
+The [RDoc](http://rubydoc.info/gems/rspec-rails/2.2.1/frames) provides additional
 information for contributors and/or extenders.
 
 All of the documentation is open source and a work in progress. If you find it

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

@@ -3,7 +3,9 @@ require 'generators/rspec'
 module Rspec
   module Generators
     class IntegrationGenerator < Base
-      class_option :request_specs, :type => :boolean, :default => true,  :desc => "Generate request specs"
+      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]
@@ -11,6 +13,14 @@ module Rspec
         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
+<% if webrat? -%>
+      visit <%= table_name %>_path
+<% else -%>
+      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
       get <%= table_name %>_path
+<% end -%>
+      response.status.should be(200)
     end
   end
 end

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

@@ -14,7 +14,8 @@ 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_matchers,  :type => :boolean, :default => false, :desc => "Use webrat matchers in 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"
 
@@ -51,7 +52,8 @@ module Rspec
       protected
 
         def webrat?
-          options[:webrat_matchers] || @webrat_matchers_requested
+          RSpec.deprecate("--webrat-matchers", "--webrat") if options[:webrat_matchers]
+          options[:webrat] || options[:webrat_matchers]
         end
 
         def copy_view(view)

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

@@ -20,7 +20,7 @@ describe "<%= table_name %>/edit.html.<%= options[:template_engine] %>" do
 <% end -%>
     end
 <% else -%>
-    # Run the generator again with the --webrat-matchers flag if you want to use webrat matchers
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "form", :action => <%= file_name %>_path(@<%= file_name %>), :method => "post" do
 <% for attribute in output_attributes -%>
       assert_select "<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]"

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

@@ -22,7 +22,7 @@ describe "<%= table_name %>/index.html.<%= options[:template_engine] %>" do
 <% if webrat? -%>
     rendered.should have_selector("tr>td", :content => <%= value_for(attribute) %>.to_s, :count => 2)
 <% else -%>
-    # Run the generator again with the --webrat-matchers flag if you want to use webrat matchers
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "tr>td", :text => <%= value_for(attribute) %>.to_s, :count => 2
 <% end -%>
 <% end -%>

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

@@ -19,7 +19,7 @@ describe "<%= table_name %>/new.html.<%= options[:template_engine] %>" do
 <% end -%>
     end
 <% else -%>
-    # Run the generator again with the --webrat-matchers flag if you want to use webrat matchers
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "form", :action => <%= table_name %>_path, :method => "post" do
 <% for attribute in output_attributes -%>
       assert_select "<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]"

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

@@ -18,7 +18,7 @@ describe "<%= table_name %>/show.html.<%= options[:template_engine] %>" do
 <% if webrat? -%>
     rendered.should contain(<%= value_for(attribute) %>.to_s)
 <% else -%>
-    # Run the generator again with the --webrat-matchers flag if you want to use webrat matchers
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
     rendered.should match(/<%= eval(value_for(attribute)) %>/)
 <% end -%>
 <% end -%>

data/lib/rspec/rails/example/controller_example_group.rb

@@ -157,12 +157,20 @@ module RSpec::Rails
     end
 
     included do
+      subject { controller }
+
       metadata[:type] = :controller
+
       before do
         @routes = ::Rails.application.routes
         ActionController::Base.allow_forgery_protection = false
       end
-      subject { controller }
+
+      webrat do
+        before do
+          Webrat.configure {|c| c.mode = :rails}
+        end
+      end
     end
 
     RSpec.configure &include_self_when_dir_matches('spec','controllers')

data/lib/rspec/rails/example/helper_example_group.rb

@@ -61,6 +61,7 @@ module RSpec::Rails
 
     included do
       metadata[:type] = :helper
+
       before do
         controller.controller_path = _controller_path
       end

data/lib/rspec/rails/example/request_example_group.rb

@@ -21,12 +21,21 @@ module RSpec::Rails
     include ActionDispatch::Assertions
     include RSpec::Rails::BrowserSimulators
 
+    module InstanceMethods
+      def app
+        ::Rails.application
+      end
+    end
+
     webrat do
       include Webrat::Matchers
       include Webrat::Methods
 
-      def app
-        ::Rails.application
+      module InstanceMethods
+
+        def last_response
+          @response
+        end
       end
     end
 
@@ -44,6 +53,14 @@ module RSpec::Rails
       before do
         @router = ::Rails.application.routes
       end
+
+      webrat do
+        before do
+          Webrat.configure do |c|
+            c.mode = :rack
+          end
+        end
+      end
     end
 
     RSpec.configure &include_self_when_dir_matches('spec','requests')

data/lib/rspec/rails/version.rb

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

data/rspec-rails.gemspec

@@ -57,7 +57,9 @@ Gem::Specification.new do |s|
 **************************************************
 }
 
-  s.add_runtime_dependency "rails", "~> 3.0.0"
-  s.add_runtime_dependency "rspec", "~> #{RSpec::Rails::Version::STRING.split('.')[0..1].join('.')}"
+  s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
+  s.add_runtime_dependency(%q<actionpack>, ["~> 3.0"])
+  s.add_runtime_dependency(%q<railties>, ["~> 3.0"])
+  s.add_runtime_dependency "rspec", "~> #{RSpec::Rails::Version::STRING.split('.')[0..1].concat(['0']).join('.')}"
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 2
-  - 0
-  version: 2.2.0
+  - 1
+  version: 2.2.1
 platform: ruby
 authors: 
 - David Chelimsky
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-28 00:00:00 -06:00
+date: 2010-12-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: activesupport
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -27,14 +27,41 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        version: "3.0"
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: actionpack
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: railties
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -42,10 +69,11 @@ dependencies:
         segments: 
         - 2
         - 2
-        version: "2.2"
+        - 0
+        version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id004
 description: RSpec-2 for Rails-3
 email: dchelimsky@gmail.com
 executables: []
@@ -183,7 +211,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.2.0!
+    Thank you for installing rspec-rails-2.2.1!
   
     This version of rspec-rails only works with versions of rails >= 3.0.0
   
@@ -193,7 +221,7 @@ post_install_message: |
     can access its generators and rake tasks.
   
       group :development, :test do
-        gem "rspec-rails", ">= 2.2.0"
+        gem "rspec-rails", ">= 2.2.1"
       end
   
     Be sure to run the following command in each of your Rails apps if you're
@@ -224,7 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -949927593083894273
+      hash: 1117426161329304162
       segments: 
       - 0
       version: "0"
@@ -233,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -949927593083894273
+      hash: 1117426161329304162
       segments: 
       - 0
       version: "0"
@@ -243,7 +271,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.2.0
+summary: rspec-rails-2.2.1
 test_files: 
 - features/README.markdown
 - features/controller_specs/anonymous_controller.feature