rspec-rails 2.5.0 → 2.6.0.rc2

data/lib/rspec/rails/matchers/routing_matchers.rb

@@ -2,10 +2,21 @@ module RSpec::Rails::Matchers
   module RoutingMatchers
     extend RSpec::Matchers::DSL
 
-    matcher :route_to do |route_options|
+    matcher :route_to do |*route_options|
       match_unless_raises ActiveSupport::TestCase::Assertion do |path|
         assertion_path = { :method => path.keys.first, :path => path.values.first }
-        assert_recognizes(route_options, assertion_path)
+
+        path, options = *route_options
+
+        if path.is_a?(String)
+          controller, action = path.split("#")
+          options ||= {}
+          options.merge!(:controller => controller, :action => action)
+        else
+          options = path
+        end
+
+        assert_recognizes(options, assertion_path)
       end
 
       failure_message_for_should do
@@ -24,5 +35,15 @@ module RSpec::Rails::Matchers
         "expected #{path.inspect} not to be routable, but it routes to #{@routing_options.inspect}"
       end
     end
+
+    module RouteHelpers
+
+      %w(get post put delete options head).each do |method|
+        define_method method do |path|
+          { method.to_sym => path }
+        end
+      end
+
+    end
   end
 end

data/lib/rspec/rails/mocks.rb

@@ -1,3 +1,6 @@
+require 'active_support/core_ext'
+require 'active_model'
+
 module RSpec
   module Rails
 

data/lib/rspec/rails/tasks/rspec.rake

@@ -41,7 +41,7 @@ namespace :spec do
     ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
     ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
     ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
-    ::CodeStatistics::TEST_TYPES << "Mailer specs" if File.exist?('spec/mailer')
+    ::CodeStatistics::TEST_TYPES << "Mailer specs" if File.exist?('spec/mailers')
     ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing')
     ::CodeStatistics::TEST_TYPES << "Request specs" if File.exist?('spec/requests')
   end

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Rails # :nodoc:
     module Version # :nodoc:
-      STRING = '2.5.0'
+      STRING = '2.6.0.rc2'
     end
   end
 end

data/rspec-rails.gemspec

@@ -22,44 +22,13 @@ Gem::Specification.new do |s|
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
 
-  s.post_install_message = %Q{**************************************************
-
-  Thank you for installing #{s.summary}!
-
-  This version of rspec-rails only works with versions of rails >= 3.0.0
-
-  To configure your app to use rspec-rails, add a declaration to your Gemfile.
-  If you are using Bundler's grouping feature in your Gemfile, be sure to include
-  rspec-rails in the :development group as well as the :test group so that you
-  can access its generators and rake tasks.
-
-    group :development, :test do
-      gem "rspec-rails", ">= #{RSpec::Rails::Version::STRING}"
-    end
-
-  Be sure to run the following command in each of your Rails apps if you're
-  upgrading:
-
-    script/rails generate rspec:install
-
-  Even if you've run it before, this ensures that you have the latest updates
-  to spec/spec_helper.rb and any other support files.
-
-  Beta versions of rspec-rails-2 installed files that are no longer being used,
-  so please remove these files if you have them:
-
-    lib/tasks/rspec.rake
-    config/initializers/rspec_generator.rb
-
-  Lastly, be sure to look at Upgrade.markdown to see what might have changed
-  since the last release.
-
-**************************************************
-}
-
   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('.')}"
+  if RSpec::Rails::Version::STRING =~ /[a-zA-Z]+/
+    s.add_runtime_dependency "rspec", "= #{RSpec::Rails::Version::STRING}"
+  else
+    s.add_runtime_dependency "rspec", "~> #{RSpec::Rails::Version::STRING.split('.')[0..1].concat(['0']).join('.')}"
+  end
 end
 

data/spec/autotest/rails_rspec2_spec.rb

@@ -26,16 +26,11 @@ describe Autotest::RailsRspec2 do
   end
 
   describe 'mappings' do
-    before do
-      rails_rspec2_autotest.find_order = %w(
-        spec/models/user_spec.rb
-        spec/support/blueprints.rb
-      )
-    end
-
     it 'runs model specs when support files change' do
+      rails_rspec2_autotest.find_order = %w(spec/models/user_spec.rb spec/support/blueprints.rb)
       rails_rspec2_autotest.test_files_for('spec/support/blueprints.rb').should(
         include('spec/models/user_spec.rb'))
     end
   end
+
 end

data/spec/rspec/rails/example/controller_example_group_spec.rb

@@ -35,5 +35,30 @@ module RSpec::Rails
         example.subject.should == 'explicit'
       end
     end
+
+    describe "with anonymous controller" do
+      before do
+        group.class_eval do
+          controller(Class.new) { }
+        end
+      end
+
+      it "delegates named route helpers to the underlying controller" do
+        controller = double('controller')
+        controller.stub(:foos_url).and_return('http://test.host/foos')
+
+        example = group.new
+        example.stub(:controller => controller)
+
+        # As in the routing example spec, this is pretty invasive, but not sure
+        # how to do it any other way as the correct operation relies on before
+        # hooks
+        routes = ActionDispatch::Routing::RouteSet.new
+        routes.draw { resources :foos }
+        example.instance_variable_set(:@orig_routes, routes)
+
+        example.foos_url.should eq('http://test.host/foos')
+      end
+    end
   end
 end

data/spec/rspec/rails/matchers/route_to_spec.rb

@@ -2,12 +2,27 @@ require "spec_helper"
 
 describe "route_to" do
   include RSpec::Rails::Matchers::RoutingMatchers
+  include RSpec::Rails::Matchers::RoutingMatchers::RouteHelpers
 
   it "delegates to assert_recognizes" do
     self.should_receive(:assert_recognizes).with({ "these" => "options" }, { :method=> :get, :path=>"path" })
     {:get => "path"}.should route_to("these" => "options")
   end
 
+  context "with shortcut syntax" do
+
+    it "routes with extra options" do
+      self.should_receive(:assert_recognizes).with({ :controller => "controller", :action => "action", :extra => "options"}, { :method=> :get, :path=>"path" })
+      get("path").should route_to("controller#action", :extra => "options")
+    end
+
+    it "routes without extra options" do
+      self.should_receive(:assert_recognizes).with({ :controller => "controller", :action => "action"}, { :method=> :get, :path=>"path" })
+      get("path").should route_to("controller#action")
+    end
+
+  end
+
   context "with should" do
     context "when assert_recognizes passes" do
       it "passes" do

data/spec/rspec/rails/mocks/ar_classes.rb

@@ -1,7 +1,10 @@
+ActiveRecord::Base.establish_connection(
+  :adapter => 'sqlite3',
+  :database => ':memory:'
+)
+
 module Connections
   def self.extended(host)
-    host.establish_connection :adapter => 'sqlite3',
-                              :database => ':memory:'
 
     host.connection.execute <<-eosql
       CREATE TABLE #{host.table_name} (

data/spec/rspec/rails/view_rendering_spec.rb

@@ -2,12 +2,6 @@ require "spec_helper"
 
 module RSpec::Rails
   describe ViewRendering do
-    let(:controller) do
-      double("controller").tap do |controller|
-        controller.stub_chain("class.respond_to?").and_return(true)
-      end
-    end
-
     let(:group) do
       RSpec::Core::ExampleGroup.describe do
         def controller

data/templates/generate_stuff.rb

@@ -5,9 +5,10 @@ generate('integration_test widgets')
 generate('mailer Notifications signup')
 generate('model thing name:string')
 generate('helper things')
-generate('scaffold widget name:string category:string instock:boolean')
+generate('scaffold widget name:string category:string instock:boolean --force')
 generate('observer widget')
 generate('scaffold gadget') # scaffold with no attributes
+generate('scaffold admin/accounts name:string') # scaffold with nested resource
 
 run('rake db:migrate')
 run('rake db:test:prepare')

data/templates/run_specs.rb

@@ -1,4 +1,4 @@
-run('bundle exec rspec spec -cfdoc')
+run('rspec spec -cfdoc')
 run('rake spec')
 run('rake spec:requests')
 run('rake spec:models')
@@ -6,4 +6,4 @@ run('rake spec:views')
 run('rake spec:controllers')
 run('rake spec:helpers')
 run('rake spec:mailers')
-run('rake stats')
+run("rake stats")

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 15424049
+  prerelease: 6
   segments: 
   - 2
-  - 5
+  - 6
   - 0
-  version: 2.5.0
+  - rc
+  - 2
+  version: 2.6.0.rc2
 platform: ruby
 authors: 
 - David Chelimsky
@@ -15,11 +17,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 -06:00
+date: 2011-04-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  name: activesupport
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -29,12 +34,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  type: :runtime
-  name: activesupport
-  prerelease: false
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  name: actionpack
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,12 +49,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  type: :runtime
-  name: actionpack
-  prerelease: false
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  name: railties
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -59,26 +64,25 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  type: :runtime
-  name: railties
-  prerelease: false
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  name: rspec
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 15424049
         segments: 
         - 2
-        - 5
+        - 6
         - 0
-        version: 2.5.0
-  type: :runtime
-  name: rspec
-  prerelease: false
-  version_requirements: *id004
+        - rc
+        - 2
+        version: 2.6.0.rc2
+  requirement: *id004
 description: RSpec-2 for Rails-3
 email: dchelimsky@gmail.com
 executables: []
@@ -91,14 +95,11 @@ files:
 - .document
 - .gitignore
 - .rspec
-- Gemfile-3-0-stable
-- Gemfile-3.0.0
-- Gemfile-3.0.3
-- Gemfile-base
-- Gemfile-master
+- .travis.yml
 - History.md
 - License.txt
 - README.md
+- README_DEV.md
 - Rakefile
 - Thorfile
 - Upgrade.md
@@ -136,6 +137,16 @@ files:
 - features/view_specs/inferred_controller_path.feature
 - features/view_specs/stub_template.feature
 - features/view_specs/view_spec.feature
+- gemfiles/base.rb
+- gemfiles/rails-3-0-stable
+- gemfiles/rails-3.0.0
+- gemfiles/rails-3.0.1
+- gemfiles/rails-3.0.2
+- gemfiles/rails-3.0.3
+- gemfiles/rails-3.0.4
+- gemfiles/rails-3.0.5
+- gemfiles/rails-3.0.6
+- gemfiles/rails-master
 - lib/autotest/rails_rspec2.rb
 - lib/generators/rspec.rb
 - lib/generators/rspec/controller/controller_generator.rb
@@ -222,49 +233,13 @@ files:
 - spec/rspec/rails/view_rendering_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
-- specs.watchr
-- templates/Gemfile-base
 - templates/generate_stuff.rb
 - templates/run_specs.rb
 has_rdoc: true
 homepage: http://github.com/rspec/rspec-rails
 licenses: []
 
-post_install_message: |
-  **************************************************
-  
-    Thank you for installing rspec-rails-2.5.0!
-  
-    This version of rspec-rails only works with versions of rails >= 3.0.0
-  
-    To configure your app to use rspec-rails, add a declaration to your Gemfile.
-    If you are using Bundler's grouping feature in your Gemfile, be sure to include
-    rspec-rails in the :development group as well as the :test group so that you
-    can access its generators and rake tasks.
-  
-      group :development, :test do
-        gem "rspec-rails", ">= 2.5.0"
-      end
-  
-    Be sure to run the following command in each of your Rails apps if you're
-    upgrading:
-  
-      script/rails generate rspec:install
-  
-    Even if you've run it before, this ensures that you have the latest updates
-    to spec/spec_helper.rb and any other support files.
-  
-    Beta versions of rspec-rails-2 installed files that are no longer being used,
-    so please remove these files if you have them:
-  
-      lib/tasks/rspec.rake
-      config/initializers/rspec_generator.rb
-  
-    Lastly, be sure to look at Upgrade.markdown to see what might have changed
-    since the last release.
-  
-  **************************************************
-
+post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -281,19 +256,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.5.0
+summary: rspec-rails-2.6.0.rc2
 test_files: 
 - features/Autotest.md
 - features/Changelog.md