rspec-rails 2.6.0.rc4 → 2.6.0.rc6

data/.gitignore

@@ -2,6 +2,7 @@ tmp
 doc
 pkg
 vendor
+!lib/rspec/rails/vendor
 *.gem
 Gemfile
 Gemfile.lock

data/.travis.yml

@@ -5,5 +5,6 @@ rvm:
 gemfile:
   - gemfiles/rails-3.0.7
   - gemfiles/rails-3-0-stable
+  - gemfiles/rails-3.1.0.beta1
 env:
   - CI=true

data/features/Changelog.md

@@ -1,3 +1,12 @@
+### 2.6.0.rc6 / 2011-05-06
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.6.0.rc4...v2.6.0.rc6)
+
+* Bug fixes
+  * Fix load order issue w/ Capybara (oleg dashevskii)
+  * Relax the dependencies on rails gems to >= 3.0 (Joel Moss)
+  * Fix monkey patches that broke due to internal changes in rails-3.1.0.beta1
+
 ### 2.6.0.rc4 / 2011-05-01
 
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.6.0.rc2...v2.6.0.rc4)

data/features/matchers/new_record_matcher.feature

@@ -26,45 +26,3 @@ Feature: be_a_new matcher
       """
     When I run `rspec spec/models/widget_spec.rb`
     Then the examples should all pass
-
-  Scenario: example spec using be_a_new.with
-    Given a file named "spec/models/widget_spec.rb" with:
-      """
-      require "spec_helper"
-
-      class Widget < ActiveRecord::Base
-        establish_connection :adapter => 'sqlite3',
-                             :database => ':memory:'
-
-        connection.execute <<-eosql
-          CREATE TABLE widgets (
-            foo_id integer,
-            number integer
-          )
-        eosql
-      end
-
-      describe Widget do
-        context "when initialized with attributes" do
-          subject { Widget.new(:foo_id => 1, :number => 1) }
-
-          it "has all of the attributes" do
-            should be_a_new(Widget).with(:foo_id => 1, :number => 1)
-          end
-
-          it "has one of the attributes" do
-            should be_a_new(Widget).with(:foo_id => 1)
-          end
-
-          it "has none of the attributes" do
-            should_not be_a_new(Widget).with(:blah => 'blah')
-          end
-
-          it "has one of the attribute values not the same" do
-            should_not be_a_new(Widget).with(:foo_id => 2)
-          end
-        end
-      end
-      """
-    When I run `rspec spec/models/widget_spec.rb`
-    Then the examples should all pass

data/features/view_specs/view_spec.feature

@@ -134,25 +134,6 @@ Feature: view spec
     When I run `rspec spec/views`
     Then the examples should all pass
 
-  Scenario: passing spec with rendering of Prototype helper update
-    Given a file named "spec/views/widgets/prototype_update.html.erb_spec.rb" with:
-      """
-      require "spec_helper"
-
-      describe "render a Prototype helper update" do
-        it "hides the status indicator" do
-
-          render :update do |page|
-            page.hide 'status-indicator'
-          end
-
-          rendered.should =~ /Element.hide\(\"status-indicator\"\);/
-        end
-      end
-      """
-    When I run `rspec spec/views`
-    Then the examples should all pass
-
   Scenario: spec with view that accesses helper_method helpers
     Given a file named "app/views/secrets/index.html.erb" with:
       """

data/gemfiles/base.rb

@@ -20,7 +20,7 @@ module GemfileBase
       gem "growl", "1.0.3"
       gem "ZenTest", "~> 4.4.2"
 
-      # gem "webrat", "0.7.2"
+      # gem "webrat", "0.7.3"
       # gem "capybara", "~> 0.4"
       # gem "capybara", "1.0.0.beta1"
 

data/gemfiles/rails-3-0-stable

@@ -4,4 +4,3 @@ extend GemfileBase
 
 gem "rails", :git => "git://github.com/rails/rails.git", :branch => "3-0-stable"
 gem "arel",  :git => "git://github.com/rails/arel.git", :branch => "2-0-stable"
-gem "rack",  :git => "git://github.com/rack/rack.git"

data/gemfiles/rails-3.1.0.beta1

@@ -0,0 +1,16 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.1.0.beta1"
+
+# From the Gemfile generated by 'rails new ....'
+gem 'sass'
+gem 'coffee-script'
+gem 'uglifier'
+gem 'jquery-rails'
+
+group :test do
+  # Pretty printed test output
+  gem 'turn', :require => false
+end

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

@@ -127,7 +127,7 @@ describe <%= controller_class_name %>Controller do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
-        put :update, :id => <%= file_name %>.id.to_s
+        put :update, :id => <%= file_name %>.id.to_s, :<%= ns_file_name %> => {}
         assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
       end
 
@@ -135,7 +135,7 @@ describe <%= controller_class_name %>Controller do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
-        put :update, :id => <%= file_name %>.id.to_s
+        put :update, :id => <%= file_name %>.id.to_s, :<%= ns_file_name %> => {}
         response.should render_template("edit")
       end
     end

data/lib/rspec/rails.rb

@@ -12,6 +12,6 @@ require 'rspec/rails/matchers'
 require 'rspec/rails/fixture_support'
 require 'rspec/rails/mocks'
 require 'rspec/rails/module_inclusion'
-require 'rspec/rails/browser_simulators'
 require 'rspec/rails/example'
-
+require 'rspec/rails/vendor/capybara'
+require 'rspec/rails/vendor/webrat'

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

@@ -82,21 +82,6 @@ module RSpec::Rails
     include RSpec::Rails::Matchers::RedirectTo
     include RSpec::Rails::Matchers::RenderTemplate
     include RSpec::Rails::Matchers::RoutingMatchers
-    include RSpec::Rails::BrowserSimulators
-
-    webrat do
-      include Webrat::Matchers
-      include Webrat::Methods
-    end
-
-    capybara do
-      begin
-        include Capybara::DSL
-        include Capybara::RSpecMatchers
-      rescue
-        include Capybara
-      end
-    end
 
     module ClassMethods
       def controller_class
@@ -140,11 +125,9 @@ module RSpec::Rails
       # defined in +ApplicationController+, however, are accessible from within
       # the block.
       def controller(base_class = ApplicationController, &body)
-        metadata[:example_group][:describes] = Class.new(base_class, &body)
-        metadata[:example_group][:describes].singleton_class.class_eval do
-          def name
-            "StubResourcesController"
-          end
+        base_class.dup.tap do |new_base|
+          def new_base.name; "StubResourcesController"; end
+          metadata[:example_group][:describes] = Class.new(new_base, &body)
         end
 
         before do
@@ -179,12 +162,6 @@ module RSpec::Rails
         @routes = ::Rails.application.routes
         ActionController::Base.allow_forgery_protection = false
       end
-
-      webrat do
-        before do
-          Webrat.configure {|c| c.mode = :rails}
-        end
-      end
     end
   end
 end

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

@@ -30,15 +30,6 @@ module RSpec::Rails
     include RSpec::Rails::RailsExampleGroup
     include ActionView::TestCase::Behavior
     include RSpec::Rails::ViewAssigns
-    include RSpec::Rails::BrowserSimulators
-
-    webrat do
-      include Webrat::Matchers
-    end
-
-    capybara do
-      include Capybara::RSpecMatchers if defined?(Capybara::RSpecMatchers)
-    end
 
     module ClassMethods
       def determine_default_helper_class(ignore)

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

@@ -4,19 +4,6 @@ if defined?(ActionMailer)
       extend ActiveSupport::Concern
       include RSpec::Rails::RailsExampleGroup
       include ActionMailer::TestCase::Behavior
-      include RSpec::Rails::BrowserSimulators
-
-      webrat do
-        include Webrat::Matchers
-      end
-
-      capybara do
-        begin
-          include Capybara::RSpecMatchers
-        rescue
-          include Capybara
-        end
-      end
 
       included do
         metadata[:type] = :mailer

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

@@ -16,7 +16,6 @@ module RSpec::Rails
     include RSpec::Rails::RailsExampleGroup
     include ActionDispatch::Integration::Runner
     include ActionDispatch::Assertions
-    include RSpec::Rails::BrowserSimulators
 
     module InstanceMethods
       def app
@@ -24,22 +23,6 @@ module RSpec::Rails
       end
     end
 
-    webrat do
-      include Webrat::Matchers
-      include Webrat::Methods
-
-      module InstanceMethods
-
-        def last_response
-          @response
-        end
-      end
-    end
-
-    capybara do
-      include Capybara unless defined?(Capybara::DSL)
-    end
-
     include RSpec::Rails::Matchers::RedirectTo
     include RSpec::Rails::Matchers::RenderTemplate
     include ActionController::TemplateAssertions
@@ -50,14 +33,6 @@ module RSpec::Rails
       before do
         @routes = ::Rails.application.routes
       end
-
-      webrat do
-        before do
-          Webrat.configure do |c|
-            c.mode = :rack
-          end
-        end
-      end
     end
   end
 end

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

@@ -23,15 +23,6 @@ module RSpec::Rails
     include ActionView::TestCase::Behavior
     include RSpec::Rails::ViewAssigns
     include RSpec::Rails::Matchers::RenderTemplate
-    include RSpec::Rails::BrowserSimulators
-
-    webrat do
-      include Webrat::Matchers
-    end
-
-    capybara do
-      include Capybara::RSpecMatchers if defined?(Capybara::RSpecMatchers)
-    end
 
     module ClassMethods
       def _default_helper
@@ -151,7 +142,13 @@ module RSpec::Rails
 
       before do
         _include_controller_helpers
-        controller.controller_path = _controller_path
+        if view.lookup_context.respond_to?(:prefixes)
+          # rails 3.1
+          view.lookup_context.prefixes << _controller_path
+        else
+          # rails 3.0
+          controller.controller_path = _controller_path
+        end
         controller.request.path_parameters["controller"] = _controller_path
         controller.request.path_parameters["action"]     = _inferred_action unless _inferred_action =~ /^_/
       end

data/lib/rspec/rails/vendor/capybara.rb

@@ -0,0 +1,29 @@
+begin
+  require 'capybara/rspec'
+rescue LoadError
+end
+
+begin
+  require 'capybara/rails'
+rescue LoadError
+end
+
+RSpec.configure do |c|
+  if defined?(Capybara::RSpecMatchers)
+    c.include Capybara::RSpecMatchers, :type => :view
+    c.include Capybara::RSpecMatchers, :type => :helper
+    c.include Capybara::RSpecMatchers, :type => :mailer
+    c.include Capybara::RSpecMatchers, :type => :controller
+  end
+
+  if defined?(Capybara::DSL)
+    c.include Capybara::DSL, :type => :controller
+  end
+
+  unless defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)
+    if defined?(Capybara)
+      c.include Capybara, :type => :request
+      c.include Capybara, :type => :controller
+    end
+  end
+end

data/lib/rspec/rails/vendor/webrat.rb

@@ -0,0 +1,33 @@
+begin
+  require 'webrat'
+rescue LoadError
+end
+
+RSpec.configure do |c|
+  if defined?(Webrat)
+    c.include Webrat::Matchers, :type => :request
+    c.include Webrat::Matchers, :type => :controller
+    c.include Webrat::Matchers, :type => :view
+    c.include Webrat::Matchers, :type => :helper
+    c.include Webrat::Matchers, :type => :mailer
+
+    c.include Webrat::Methods,  :type => :request
+    c.include Webrat::Methods,  :type => :controller
+
+    module RequestInstanceMethods
+      def last_response
+        @response
+      end
+    end
+
+    c.include RequestInstanceMethods, :type => :request
+
+    c.before :type => :controller do
+      Webrat.configure {|c| c.mode = :rails}
+    end
+
+    c.before :type => :request do
+      Webrat.configure {|c| c.mode = :rack}
+    end
+  end
+end

data/lib/rspec/rails/version.rb

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

data/rspec-rails.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
 
-  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(%q<activesupport>, [">= 3.0"])
+  s.add_runtime_dependency(%q<actionpack>, [">= 3.0"])
+  s.add_runtime_dependency(%q<railties>, [">= 3.0"])
   if RSpec::Rails::Version::STRING =~ /[a-zA-Z]+/
     s.add_runtime_dependency "rspec", "= #{RSpec::Rails::Version::STRING}"
   else

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 15424061
+  hash: 15424057
   prerelease: 6
   segments: 
   - 2
   - 6
   - 0
   - rc
-  - 4
-  version: 2.6.0.rc4
+  - 6
+  version: 2.6.0.rc6
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,14 +17,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 -04:00
+date: 2011-05-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -39,7 +39,7 @@ dependencies:
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -54,7 +54,7 @@ dependencies:
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -71,14 +71,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424061
+        hash: 15424057
         segments: 
         - 2
         - 6
         - 0
         - rc
-        - 4
-        version: 2.6.0.rc4
+        - 6
+        version: 2.6.0.rc6
   prerelease: false
   type: :runtime
   requirement: *id004
@@ -149,6 +149,7 @@ files:
 - gemfiles/rails-3.0.5
 - gemfiles/rails-3.0.6
 - gemfiles/rails-3.0.7
+- gemfiles/rails-3.1.0.beta1
 - gemfiles/rails-master
 - lib/autotest/rails_rspec2.rb
 - lib/generators/rspec.rb
@@ -182,7 +183,6 @@ files:
 - lib/rspec-rails.rb
 - lib/rspec/rails.rb
 - lib/rspec/rails/adapters.rb
-- lib/rspec/rails/browser_simulators.rb
 - lib/rspec/rails/example.rb
 - lib/rspec/rails/example/controller_example_group.rb
 - lib/rspec/rails/example/helper_example_group.rb
@@ -205,6 +205,8 @@ files:
 - lib/rspec/rails/mocks.rb
 - lib/rspec/rails/module_inclusion.rb
 - lib/rspec/rails/tasks/rspec.rake
+- lib/rspec/rails/vendor/capybara.rb
+- lib/rspec/rails/vendor/webrat.rb
 - lib/rspec/rails/version.rb
 - lib/rspec/rails/view_assigns.rb
 - lib/rspec/rails/view_rendering.rb
@@ -274,7 +276,7 @@ rubyforge_project: rspec
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.6.0.rc4
+summary: rspec-rails-2.6.0.rc6
 test_files: 
 - features/Autotest.md
 - features/Changelog.md

data/lib/rspec/rails/browser_simulators.rb

@@ -1,35 +0,0 @@
-begin
-  require 'capybara/rspec'
-rescue LoadError
-end
-
-begin
-  require 'capybara/rails'
-rescue LoadError
-end
-
-begin
-  require 'webrat'
-rescue LoadError
-end
-
-module RSpec
-  module Rails
-    module BrowserSimulators
-      extend ActiveSupport::Concern
-
-      def self.included(mod)
-        mod.instance_eval do
-          def webrat(&block)
-            block.call if defined?(Webrat)
-          end
-
-          def capybara(&block)
-            block.call if defined?(Capybara)
-          end
-        end
-      end
-
-    end
-  end
-end