rspec-rails 2.11.0 → 2.11.4

data/.yardopts

@@ -6,3 +6,4 @@
 -
 Changelog.md
 License.txt
+Capybara.md

data/Capybara.md

@@ -0,0 +1,81 @@
+rspec-rails supports integration with Capbyara out of the box by adding
+its Capybara::DSL (visit/page) and Capybara::RSpecMatchers to the
+examples in the applicable directories, which differ slightly between
+Capybara 1.x and Capybara >= 2.x.
+
+Note that you need to require "capybara/rspec" for this integration to work.
+
+## Capybara::DSL
+
+Adds the `visit` and `page` methods, which work together to simulate a
+`get` and provide access to the result (via `page`).
+
+## Capybara::RSpecMatchers
+
+Exposes matchers used to specify expected HTML content (e.g. `have_selector`).
+
+## Capybara 1.x
+
+Capybara::DSL is added to examples in:
+
+* spec/requests    # included by Capybara
+* spec/controllers
+
+Capybara::RSpecMatchers is added to examples in:
+
+* spec/requests    # included by Capybara
+* spec/controllers
+* spec/views
+* spec/helpers
+* spec/mailers
+
+## Capybara 2.0
+
+To use Capybara 2.0, you need rspec-rails-2.11.1 or greater.
+
+Capybara::DSL is added to examples in:
+
+* spec/features
+
+Capybara::RSpecMatchers is added to examples in:
+
+* spec/features
+* spec/controllers
+* spec/views
+* spec/helpers
+* spec/mailers
+
+## Upgrading to Capybara-2.0
+
+Many users have been confused by the co-existence of the the
+Capybara::DSL (visit/page) alongside the rack-test DSL
+(get|post|put|delete|head/response.body) in examples in spec/requests
+and spec/controllers. As of rspec-2.11.1 and capybara-2.0.0.beta2, these
+are separated as follows:
+
+* Capybara::DSL is included `spec/features`
+* rack-test DSL is included in `spec/requests` and `spec/controllers`
+
+Capybara::RSpecMatchers is added to examples in:
+
+* spec/features
+* spec/controllers
+* spec/views
+* spec/helpers
+* spec/mailers
+
+If you're upgrading to Capybara-2.0 and you used visit/page in
+spec/requests you'll want to move those examples to spec/features and
+they should just work.
+
+If you want to leave those examples in spec/requests, you can include
+Capybara::DSL in those examples yourself as follows, but this is
+absolutely not recommended as you will be overriding the intended
+behavior and accepting the risks associated with doing so:
+
+    # not recommended!
+    RSpec.configure do |c|
+      c.include Capybara::DSL, :example_group => {
+        :file_path => "spec/requests"
+      }
+    end

data/Changelog.md

@@ -1,3 +1,17 @@
+### 2.11.4 / 2012-10-14
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.11.0...v2.11.4)
+
+Capybara-2.0 integration support:
+
+* include RailsExampleGroup in spec/features (necessary when there is no AR)
+* include Capybara::DSL and Capybara::RSpecMatchers in spec/features
+
+See [https://github.com/jnicklas/capybara/pull/809](https://github.com/jnicklas/capybara/pull/809)
+and [http://rubydoc.info/gems/rspec-rails/file/CAPYBARA.md](http://rubydoc.info/gems/rspec-rails/file/CAPYBARA.md)
+for background.
+
+2.11.1, .2, .3 were yanked due to errant documentation.
+
 ### 2.11.0 / 2012-07-07
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.10.1...v2.11.0)
 

data/README.md

@@ -64,6 +64,10 @@ gem "webrat"
 gem "capybara"
 ```
 
+See [http://rubydoc.info/gems/rspec-rails/file/Capybara.md](http://rubydoc.info/gems/rspec-rails/file/Capybara.md)
+for more info on Capybara integration.
+
+
 ## Living on edge
 
 Bundler makes it a snap to use the latest code for any gem your app depends on. For

data/lib/rspec/rails/fixture_support.rb

@@ -3,7 +3,6 @@ module RSpec
     if defined?(ActiveRecord::TestFixtures)
       module FixtureSupport
         extend ActiveSupport::Concern
-
         include RSpec::Rails::SetupAndTeardownAdapter
         include RSpec::Rails::TestUnitAssertionAdapter
         include ActiveRecord::TestFixtures
@@ -37,4 +36,3 @@ module RSpec
     end
   end
 end
-

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

@@ -8,20 +8,30 @@ begin
 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)
+  RSpec.configure do |c|
+    if defined?(Capybara::DSL)
+      c.include Capybara::DSL, :type => :controller
+      c.include Capybara::DSL, :example_group => {
+        :file_path => c.escaped_path(%w[spec features])
+      }
+    end
 
-  if defined?(Capybara::DSL)
-    c.include Capybara::DSL, :type => :controller
-  end
+    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
+      c.include Capybara::RSpecMatchers, :example_group => {
+        :file_path => c.escaped_path(%w[spec features])
+      }
+    end
 
-  unless defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)
-    if defined?(Capybara)
+    if defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)
+      c.include RSpec::Rails::RailsExampleGroup, :example_group => {
+        :file_path => c.escaped_path(%w[spec features])
+      }
+    else
       c.include Capybara, :type => :request
       c.include Capybara, :type => :controller
     end

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Rails
     module Version
-      STRING = '2.11.0'
+      STRING = '2.11.4'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
+date: 2012-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -224,6 +224,7 @@ files:
 - README.md
 - License.txt
 - Changelog.md
+- Capybara.md
 - .yardopts
 - .document
 - features/Autotest.md
@@ -318,7 +319,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -673310072700950015
+      hash: 3042437687647811829
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -327,13 +328,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -673310072700950015
+      hash: 3042437687647811829
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.11.0
+summary: rspec-rails-2.11.4
 test_files:
 - features/Autotest.md
 - features/Generators.md