rspec-rails 2.0.0.beta.18 → 2.0.0.beta.19

data/Gemfile

@@ -12,5 +12,5 @@ gem 'rspec', :path => "../rspec"
 gem 'cucumber'
 gem 'aruba', ">= 0.2.0", :require => nil
 gem 'jeweler'
-gem 'webrat'
+gem 'webrat', ">= 0.7.2.beta.1"
 gem 'sqlite3-ruby', :require => 'sqlite3'

data/Rakefile

@@ -43,8 +43,8 @@ begin
     gem.homepage = "http://github.com/rspec/rspec-rails"
     gem.authors = ["David Chelimsky", "Chad Humphries"]
     gem.rubyforge_project = "rspec"
-    gem.add_dependency "rspec", ">= 2.0.0.beta.14"
-    gem.add_dependency "webrat", ">= 0.7.0"
+    gem.add_dependency "rspec", RSpec::Rails::Version::STRING
+    gem.add_dependency "webrat", ">= 0.7.2.beta.1"
     gem.post_install_message = <<-EOM
 #{"*"*50}
 

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.18
+2.0.0.beta.19

data/features/controller_specs/anonymous_controller.feature

@@ -0,0 +1,40 @@
+Feature: anonymous controller
+
+  As a Rails developer using RSpec
+  In order to specify behaviour of ApplicationController
+  I want a simple DSL for generating anonymous subclasses
+
+  Scenario: specify error handling in ApplicationController
+    Given a file named "spec/controllers/application_controller_spec.rb" with:
+      """
+      require "spec_helper"
+
+      class ApplicationController < ActionController::Base
+        class AccessDenied < StandardError; end
+
+        rescue_from AccessDenied, :with => :access_denied
+
+      private
+
+        def access_denied
+          redirect_to "/401.html"
+        end
+      end
+
+      describe ApplicationController do
+        controller do
+          def index
+            raise ApplicationController::AccessDenied
+          end
+        end
+
+        describe "handling AccessDenied exceptions" do
+          it "redirects to the /401.html page" do
+            get :index
+            response.should redirect_to("/401.html")
+          end
+        end
+      end
+      """
+    When I run "rspec spec"
+    Then the output should contain "1 example, 0 failures"

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

@@ -89,6 +89,54 @@ module RSpec::Rails
       def controller_class
         describes
       end
+
+      # Creates an anonymous subclass of ApplicationController and evals the
+      # +body+ in that context. Also sets up implicit routes for this
+      # controller, that are separate from those defined in
+      # <tt>config/routes.rb</tt>.
+      #
+      # Supports a simple DSL for specifying behaviour of ApplicationController.
+      #
+      # == Example
+      #
+      #    describe ApplicationController do
+      #      controller do
+      #        def index
+      #          raise ApplicationController::AccessDenied
+      #        end
+      #      end
+
+      #      describe "handling AccessDenied exceptions" do
+      #        it "redirects to the /401.html page" do
+      #          get :index
+      #          response.should redirect_to("/401.html")
+      #        end
+      #      end
+      #    end
+      #   
+      # NOTICE: Due to Ruby 1.8 scoping rules in anoymous subclasses, constants
+      # defined in +ApplicationController+ must be fully qualified (e.g.
+      # ApplicationController::AccessDenied) in the block passed to the
+      # +controller+ method. Any instance methods, filters, etc, that are
+      # defined in +ApplicationController+, however, are accessible from within
+      # the block.
+      def controller(&body)
+        metadata[:example_group][:describes] = Class.new(ApplicationController, &body)
+        metadata[:example_group][:describes].singleton_class.class_eval do
+          def name
+            "StubResourcesController"
+          end
+        end
+
+        before do
+          @orig_routes, @routes = @routes, ActionDispatch::Routing::RouteSet.new
+          @routes.draw { resources :stub_resources }
+        end
+
+        after do
+          @routes = @orig_routes
+        end
+      end
     end
 
     module InstanceMethods

data/lib/rspec/rails/extensions/active_record/base.rb

@@ -36,11 +36,9 @@ if defined?(ActiveRecord::Base)
     end
   end
 
-  module ActiveRecord #:nodoc:
-    class Base
-      extend  RSpec::Rails::Extensions::ActiveRecord::ClassMethods
-      include RSpec::Rails::Extensions::ActiveRecord::InstanceMethods
-    end
+  class ActiveRecord::Base #:nodoc:
+    extend  RSpec::Rails::Extensions::ActiveRecord::ClassMethods
+    include RSpec::Rails::Extensions::ActiveRecord::InstanceMethods
   end
 end
 

data/lib/rspec/rails/fixture_support.rb

@@ -1,31 +1,33 @@
-module RSpec
-  module Rails
-    module FixtureSupport
-      extend ActiveSupport::Concern
+if defined?(ActiveRecord)
+  module RSpec
+    module Rails
+      module FixtureSupport
+        extend ActiveSupport::Concern
 
-      include RSpec::Rails::SetupAndTeardownAdapter
-      include RSpec::Rails::TestUnitAssertionAdapter
+        include RSpec::Rails::SetupAndTeardownAdapter
+        include RSpec::Rails::TestUnitAssertionAdapter
 
-      included do
-        if RSpec.configuration.use_transactional_fixtures
-          # TODO - figure out how to move this outside the included block
-          include ActiveRecord::TestFixtures
+        included do
+          if RSpec.configuration.use_transactional_fixtures
+            # TODO - figure out how to move this outside the included block
+            include ActiveRecord::TestFixtures
 
-          self.fixture_path = RSpec.configuration.fixture_path
-          self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
-          self.use_instantiated_fixtures  = RSpec.configuration.use_instantiated_fixtures
-          fixtures RSpec.configuration.global_fixtures if RSpec.configuration.global_fixtures
+            self.fixture_path = RSpec.configuration.fixture_path
+            self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
+            self.use_instantiated_fixtures  = RSpec.configuration.use_instantiated_fixtures
+            fixtures RSpec.configuration.global_fixtures if RSpec.configuration.global_fixtures
+          end
         end
       end
     end
   end
-end
 
-RSpec.configure do |c|
-  c.include RSpec::Rails::FixtureSupport
-  c.add_setting :use_transactional_fixtures
-  c.add_setting :use_transactional_examples, :alias => :use_transactional_fixtures
-  c.add_setting :use_instantiated_fixtures
-  c.add_setting :global_fixtures
-  c.add_setting :fixture_path
+  RSpec.configure do |c|
+    c.include RSpec::Rails::FixtureSupport
+    c.add_setting :use_transactional_fixtures
+    c.add_setting :use_transactional_examples, :alias => :use_transactional_fixtures
+    c.add_setting :use_instantiated_fixtures
+    c.add_setting :global_fixtures
+    c.add_setting :fixture_path
+  end
 end

data/lib/rspec/rails/mocks.rb

@@ -154,7 +154,7 @@ EOM
       #   end
       def stub_model(model_class, stubs={})
         stubs = {:id => next_id}.merge(stubs)
-        returning model_class.new do |m|
+        model_class.new.tap do |m|
           m.id = stubs.delete(:id)
           m.extend ModelStubber
           m.stub(stubs)

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.18"
+  s.version = "2.0.0.beta.19"
 
   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-07-21}
+  s.date = %q{2010-07-25}
   s.description = %q{RSpec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "autotest/discover.rb",
      "cucumber.yml",
      "features/README.markdown",
+     "features/controller_specs/anonymous_controller.feature",
      "features/controller_specs/isolation_from_views.feature",
      "features/controller_specs/readers.feature",
      "features/controller_specs/render_views.feature",
@@ -122,7 +123,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.18!
+  Thank you for installing rspec-rails-2.0.0.beta.19!
 
   This version of rspec-rails only works with versions of rails >= 3.0.0.beta.4.
 
@@ -132,7 +133,7 @@ Gem::Specification.new do |s|
   can access its generators and rake tasks.
 
     group :development, :test do
-      gem "rspec-rails", ">= 2.0.0.beta.18"
+      gem "rspec-rails", ">= 2.0.0.beta.19"
     end
 
   Be sure to run the following command in each of your Rails apps if you're
@@ -158,7 +159,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{rspec-rails-2.0.0.beta.18}
+  s.summary = %q{rspec-rails-2.0.0.beta.19}
   s.test_files = [
     "spec/rspec/rails/example/controller_example_group_spec.rb",
      "spec/rspec/rails/example/helper_example_group_spec.rb",
@@ -185,15 +186,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.beta.14"])
-      s.add_runtime_dependency(%q<webrat>, [">= 0.7.0"])
+      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.19"])
+      s.add_runtime_dependency(%q<webrat>, [">= 0.7.2.beta.1"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.14"])
-      s.add_dependency(%q<webrat>, [">= 0.7.0"])
+      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.19"])
+      s.add_dependency(%q<webrat>, [">= 0.7.2.beta.1"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.14"])
-    s.add_dependency(%q<webrat>, [">= 0.7.0"])
+    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.19"])
+    s.add_dependency(%q<webrat>, [">= 0.7.2.beta.1"])
   end
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 62196423
+  hash: 62196421
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 18
-  version: 2.0.0.beta.18
+  - 19
+  version: 2.0.0.beta.19
 platform: ruby
 authors: 
 - David Chelimsky
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 -05:00
+date: 2010-07-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,16 +28,16 @@ dependencies:
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196479
+        hash: 62196421
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 14
-        version: 2.0.0.beta.14
+        - 19
+        version: 2.0.0.beta.19
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -48,12 +48,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 62196417
         segments: 
         - 0
         - 7
-        - 0
-        version: 0.7.0
+        - 2
+        - beta
+        - 1
+        version: 0.7.2.beta.1
   requirement: *id002
 description: RSpec-2 for Rails-3
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
@@ -74,6 +76,7 @@ files:
 - autotest/discover.rb
 - cucumber.yml
 - features/README.markdown
+- features/controller_specs/anonymous_controller.feature
 - features/controller_specs/isolation_from_views.feature
 - features/controller_specs/readers.feature
 - features/controller_specs/render_views.feature
@@ -173,7 +176,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.18!
+    Thank you for installing rspec-rails-2.0.0.beta.19!
   
     This version of rspec-rails only works with versions of rails >= 3.0.0.beta.4.
   
@@ -183,7 +186,7 @@ post_install_message: |
     can access its generators and rake tasks.
   
       group :development, :test do
-        gem "rspec-rails", ">= 2.0.0.beta.18"
+        gem "rspec-rails", ">= 2.0.0.beta.19"
       end
   
     Be sure to run the following command in each of your Rails apps if you're
@@ -235,7 +238,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.18
+summary: rspec-rails-2.0.0.beta.19
 test_files: 
 - spec/rspec/rails/example/controller_example_group_spec.rb
 - spec/rspec/rails/example/helper_example_group_spec.rb