rspec-rails 2.0.0.beta.12 → 2.0.0.beta.13

data/lib/rspec/rails/matchers.rb

@@ -2,14 +2,8 @@ require 'rspec/core/deprecation'
 require 'rspec/core/backward_compatibility'
 require 'rspec/matchers'
 
-begin
-  require 'test/unit/assertionfailederror'
-rescue LoadError
-  module Test
-    module Unit
-      class AssertionFailedError < StandardError
-      end
-    end
+module RSpec::Rails
+  module Matchers
   end
 end
 
@@ -18,60 +12,24 @@ begin
 rescue LoadError
 end
 
-module RSpec::Rails
-  module ControllerSpecMatchers
-    extend RSpec::Matchers::DSL
-
-    matcher :redirect_to do |destination|
-      match_unless_raises Test::Unit::AssertionFailedError do |_|
-        assert_redirected_to destination
-      end
-
-      failure_message_for_should do
-        rescued_exception.message
-      end
-    end
-
-    matcher :render_template do |options, message|
-      match_unless_raises Test::Unit::AssertionFailedError do |_|
-        options = options.to_s if Symbol === options
-        assert_template options, message
-      end
-
-      failure_message_for_should do
-        rescued_exception.message
-      end
-    end
-  end
-end
-
-RSpec::Matchers.define :be_a_new do |model_klass|
-  match do |actual|
-    model_klass === actual && actual.new_record?
-  end
+begin
+  require "action_controller"
+rescue LoadError
 end
 
-require 'rspec/matchers/have'
-
-module RSpec #:nodoc:
-  module Matchers #:nodoc:
-    class Have #:nodoc:
-
-      def failure_message_for_should_with_errors_on_extensions
-        return "expected #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}, got #{@actual}" if @collection_name == :errors_on
-        return "expected #{relativities[@relativity]}#{@expected} error on :#{@args[0]}, got #{@actual}"  if @collection_name == :error_on
-        return failure_message_for_should_without_errors_on_extensions
-      end
-      alias_method_chain :failure_message_for_should, :errors_on_extensions
-      
-      def description_with_errors_on_extensions
-        return "have #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}" if @collection_name == :errors_on
-        return "have #{relativities[@relativity]}#{@expected} error on :#{@args[0]}"  if @collection_name == :error_on
-        return description_without_errors_on_extensions
+begin
+  require 'test/unit/assertionfailederror'
+rescue LoadError
+  module Test
+    module Unit
+      class AssertionFailedError < StandardError
       end
-      alias_method_chain :description, :errors_on_extensions
-
     end
   end
 end
 
+require 'rspec/rails/matchers/render_template'
+require 'rspec/rails/matchers/redirect_to'
+require 'rspec/rails/matchers/routing_spec_matchers'
+require 'rspec/rails/matchers/be_a_new'
+require 'rspec/rails/matchers/have_extension'

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

@@ -0,0 +1,5 @@
+RSpec::Matchers.define :be_a_new do |model_klass|
+  match do |actual|
+    model_klass === actual && actual.new_record?
+  end
+end

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

@@ -0,0 +1,23 @@
+require 'active_support/core_ext/module/aliasing'
+require 'rspec/matchers/have'
+
+module RSpec #:nodoc:
+  module Matchers #:nodoc:
+    class Have #:nodoc:
+      def failure_message_for_should_with_errors_on_extensions
+        return "expected #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}, got #{@actual}" if @collection_name == :errors_on
+        return "expected #{relativities[@relativity]}#{@expected} error on :#{@args[0]}, got #{@actual}"  if @collection_name == :error_on
+        return failure_message_for_should_without_errors_on_extensions
+      end
+      alias_method_chain :failure_message_for_should, :errors_on_extensions
+      
+      def description_with_errors_on_extensions
+        return "have #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}" if @collection_name == :errors_on
+        return "have #{relativities[@relativity]}#{@expected} error on :#{@args[0]}"  if @collection_name == :error_on
+        return description_without_errors_on_extensions
+      end
+      alias_method_chain :description, :errors_on_extensions
+    end
+  end
+end
+

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

@@ -0,0 +1,15 @@
+module RSpec::Rails::Matchers
+  module RedirectTo
+    extend RSpec::Matchers::DSL
+
+    matcher :redirect_to do |destination|
+      match_unless_raises Test::Unit::AssertionFailedError do |_|
+        assert_redirected_to destination
+      end
+
+      failure_message_for_should do
+        rescued_exception.message
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module RSpec::Rails::Matchers
+  module RenderTemplate
+    extend RSpec::Matchers::DSL
+
+    matcher :render_template do |options, message|
+      match_unless_raises Test::Unit::AssertionFailedError do |_|
+        options = options.to_s if Symbol === options
+        assert_template options, message
+      end
+
+      failure_message_for_should do
+        rescued_exception.message
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module RSpec::Rails
+  module RoutingSpecMatchers
+    extend RSpec::Matchers::DSL
+
+    matcher :route_to do |route_options|
+      match_unless_raises Test::Unit::AssertionFailedError do |path|
+        assertion_path = { :method => path.keys.first, :path => path.values.first }
+        assert_routing(assertion_path, route_options)
+      end
+
+      failure_message_for_should do
+        rescued_exception.message
+      end
+    end
+
+    matcher :be_routable do
+      match_unless_raises ActionController::RoutingError do |path|
+        @routing_options = routes.recognize_path(
+          path.values.first, :method => path.keys.first
+        )
+      end
+
+      failure_message_for_should_not do |path|
+        "expected #{path.inspect} not to be routable, but it routes to #{@routing_options.inspect}"
+      end
+    end
+  end
+end

data/lib/rspec/rails/monkey.rb

@@ -1,4 +1 @@
-require 'rspec/rails/monkey/action_controller/test_case'
-require 'rspec/rails/monkey/action_view/test_case'
 require 'rspec/rails/monkey/action_mailer/test_case'
-require 'rspec/rails/monkey/active_support/notifications/fanout'

data/lib/rspec/rails/view_rendering.rb

@@ -1,3 +1,6 @@
+require 'action_controller'
+require 'action_view/testing/resolvers'
+
 module RSpec
   module Rails
     module ViewRendering
@@ -21,7 +24,7 @@ module RSpec
       included do
         before do
           @_view_paths = controller.class.view_paths
-          controller.class.view_paths = [RSpec::Rails::NullResolver.new()] unless
+          controller.class.view_paths = [ActionView::NullResolver.new()] unless
             self.class.render_views?
         end
 

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.12"
+  s.version = "2.0.0.beta.13"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-06-14}
+  s.date = %q{2010-06-23}
   s.description = %q{RSpec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "features/matchers/new_record_matcher.feature",
      "features/model_specs/errors_on.feature",
      "features/model_specs/transactional_examples.feature",
+     "features/routing_specs/be_routable_matcher.feature",
      "features/step_definitions/model_steps.rb",
      "features/support/env.rb",
      "features/view_specs/view_spec.feature",
@@ -74,18 +75,20 @@ Gem::Specification.new do |s|
      "lib/rspec/rails/example/helper_example_group.rb",
      "lib/rspec/rails/example/mailer_example_group.rb",
      "lib/rspec/rails/example/request_example_group.rb",
+     "lib/rspec/rails/example/routing_example_group.rb",
      "lib/rspec/rails/example/view_example_group.rb",
      "lib/rspec/rails/extensions.rb",
      "lib/rspec/rails/extensions/active_record/base.rb",
      "lib/rspec/rails/fixture_support.rb",
      "lib/rspec/rails/matchers.rb",
+     "lib/rspec/rails/matchers/be_a_new.rb",
+     "lib/rspec/rails/matchers/have_extension.rb",
+     "lib/rspec/rails/matchers/redirect_to.rb",
+     "lib/rspec/rails/matchers/render_template.rb",
+     "lib/rspec/rails/matchers/routing_spec_matchers.rb",
      "lib/rspec/rails/mocks.rb",
      "lib/rspec/rails/monkey.rb",
-     "lib/rspec/rails/monkey/action_controller/test_case.rb",
      "lib/rspec/rails/monkey/action_mailer/test_case.rb",
-     "lib/rspec/rails/monkey/action_view/test_case.rb",
-     "lib/rspec/rails/monkey/active_support/notifications/fanout.rb",
-     "lib/rspec/rails/null_resolver.rb",
      "lib/rspec/rails/version.rb",
      "lib/rspec/rails/view_assigns.rb",
      "lib/rspec/rails/view_rendering.rb",
@@ -94,12 +97,14 @@ Gem::Specification.new do |s|
      "spec/rspec/rails/example/helper_example_group_spec.rb",
      "spec/rspec/rails/example/mailer_example_group_spec.rb",
      "spec/rspec/rails/example/request_example_group_spec.rb",
+     "spec/rspec/rails/example/routing_example_group_spec.rb",
      "spec/rspec/rails/example/view_example_group_spec.rb",
      "spec/rspec/rails/example/view_rendering_spec.rb",
      "spec/rspec/rails/matchers/be_a_new_spec.rb",
      "spec/rspec/rails/matchers/errors_on_spec.rb",
      "spec/rspec/rails/matchers/redirect_to_spec.rb",
      "spec/rspec/rails/matchers/render_template_spec.rb",
+     "spec/rspec/rails/matchers/route_to_spec.rb",
      "spec/rspec/rails/mocks/ar_classes.rb",
      "spec/rspec/rails/mocks/mock_model_spec.rb",
      "spec/rspec/rails/mocks/stub_model_spec.rb",
@@ -113,7 +118,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/rspec-rails}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-rails-2.0.0.beta.12!
+  Thank you for installing rspec-rails-2.0.0.beta.13!
 
   This version of rspec-rails only works with 
   versions of rails >= 3.0.0.pre.
@@ -129,18 +134,20 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-rails-2.0.0.beta.12}
+  s.summary = %q{rspec-rails-2.0.0.beta.13}
   s.test_files = [
     "spec/rspec/rails/example/controller_example_group_spec.rb",
      "spec/rspec/rails/example/helper_example_group_spec.rb",
      "spec/rspec/rails/example/mailer_example_group_spec.rb",
      "spec/rspec/rails/example/request_example_group_spec.rb",
+     "spec/rspec/rails/example/routing_example_group_spec.rb",
      "spec/rspec/rails/example/view_example_group_spec.rb",
      "spec/rspec/rails/example/view_rendering_spec.rb",
      "spec/rspec/rails/matchers/be_a_new_spec.rb",
      "spec/rspec/rails/matchers/errors_on_spec.rb",
      "spec/rspec/rails/matchers/redirect_to_spec.rb",
      "spec/rspec/rails/matchers/render_template_spec.rb",
+     "spec/rspec/rails/matchers/route_to_spec.rb",
      "spec/rspec/rails/mocks/ar_classes.rb",
      "spec/rspec/rails/mocks/mock_model_spec.rb",
      "spec/rspec/rails/mocks/stub_model_spec.rb",
@@ -153,14 +160,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.12"])
+      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.13"])
       s.add_runtime_dependency(%q<webrat>, [">= 0.7.0"])
     else
-      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.12"])
+      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.13"])
       s.add_dependency(%q<webrat>, [">= 0.7.0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.12"])
+    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.13"])
     s.add_dependency(%q<webrat>, [">= 0.7.0"])
   end
 end

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

@@ -14,7 +14,7 @@ module RSpec::Rails
 
     it "provides a controller_path based on the helper module's name" do
       helper_spec = Object.new.extend HelperExampleGroup::InstanceMethods
-      helper_spec.stub_chain(:running_example, :example_group, :describes).and_return(FoosHelper)
+      helper_spec.stub_chain(:example, :example_group, :describes).and_return(FoosHelper)
       helper_spec.__send__(:_controller_path).should == "foos"
     end
 

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

@@ -0,0 +1,13 @@
+require "spec_helper"
+
+module RSpec::Rails
+  describe RoutingExampleGroup do
+    it "is included in specs in ./spec/routing" do
+      stub_metadata(
+        :example_group => {:file_path => "./spec/routing/whatever_spec.rb:15"}
+      )
+      group = RSpec::Core::ExampleGroup.describe
+      group.included_modules.should include(RoutingExampleGroup)
+    end
+  end
+end

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

@@ -20,6 +20,9 @@ module RSpec::Rails
             def render(options={}, local_assigns={}, &block)
               received << [options, local_assigns, block]
             end
+            def _assigns
+              {}
+            end
           end
           include Local
           include ViewExampleGroup::InstanceMethods

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

@@ -2,7 +2,7 @@ require "spec_helper"
 require "action_controller/test_case"
 
 describe "redirect_to" do
-  include RSpec::Rails::ControllerSpecMatchers
+  include RSpec::Rails::Matchers::RedirectTo
 
   it "delegates to assert_redirected_to" do
     self.should_receive(:assert_redirected_to).with("destination")

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe "render_template" do
-  include RSpec::Rails::ControllerSpecMatchers
+  include RSpec::Rails::Matchers::RenderTemplate
 
   it "uses failure message from render_template" do
     self.stub!(:assert_template).and_raise(

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

@@ -0,0 +1,53 @@
+require "spec_helper"
+
+describe "route_to" do
+  include RSpec::Rails::RoutingSpecMatchers
+
+  it "uses failure message from assert_routing" do
+    self.stub!(:assert_routing).and_raise(
+      Test::Unit::AssertionFailedError.new("this message"))
+    expect do
+      {"this" => "path"}.should route_to("these" => "options")
+    end.to raise_error("this message")
+  end
+end
+
+describe "be_routable" do
+  include RSpec::Rails::RoutingSpecMatchers
+  attr_reader :routes
+
+  before { @routes = double("routes") }
+
+  context "with should" do
+    it "passes if routes recognize the path" do
+      routes.stub(:recognize_path) { {} }
+      expect do
+        {:get => "/a/path"}.should be_routable
+      end.to_not raise_error
+    end
+
+    it "fails if routes do not recognize the path" do
+      routes.stub(:recognize_path) { raise ActionController::RoutingError.new('ignore') }
+      expect do
+        {:get => "/a/path"}.should be_routable
+      end.to raise_error(/expected \{:get=>"\/a\/path"\} to be routable/)
+    end
+  end
+
+  context "with should_not" do
+    
+    it "passes if routes do not recognize the path" do
+      routes.stub(:recognize_path) { raise ActionController::RoutingError.new('ignore') }
+      expect do
+        {:get => "/a/path"}.should_not be_routable
+      end.to_not raise_error
+    end
+
+    it "fails if routes recognize the path" do
+      routes.stub(:recognize_path) { {:controller => "foo"} }
+      expect do
+        {:get => "/a/path"}.should_not be_routable
+      end.to raise_error(/expected \{:get=>"\/a\/path"\} not to be routable, but it routes to \{:controller=>"foo"\}/)
+    end
+  end
+end

data/templates/Gemfile

@@ -1,31 +1,12 @@
 source 'http://rubygems.org'
 
-gem "arel", :path => "../../vendor/arel"
-gem "rails", :path => "../../vendor/rails"
+gem 'arel', :path => "../../vendor/arel"
+gem 'rails', :path => "../../vendor/rails"
 
 gem 'sqlite3-ruby', :require => 'sqlite3'
 
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'ruby-debug'
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri', '1.4.1'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
-
-# Bundle gems for certain environments:
-# gem 'rspec', :group => :test
-# group :test do
-#   gem 'webrat'
-# end
-
-group :test do
-  gem "rspec-rails", :path => "../../../rspec-rails"
-end
+gem "rspec-rails",        :path => "../../../rspec-rails"
+gem "rspec",              :path => "../../../rspec"
+gem "rspec-core",         :path => "../../../rspec-core"
+gem "rspec-expectations", :path => "../../../rspec-expectations"
+gem "rspec-mocks",        :path => "../../../rspec-mocks"