rspec-rails 2.13.2 → 2.14.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bde9d78133ed3ae52ae2a3d1899ac9e698da737f
-  data.tar.gz: b3112c615d1bd84ebc99f76d72ff063a7a57910b
+  metadata.gz: 04c5822ee12ba5761dfec43b208aeb0d945e70b0
+  data.tar.gz: 4b06190cf25cd2c4058da8c2b9ba777b3d0d7359
 SHA512:
-  metadata.gz: a20ea10e0d036f6fc3a14a4689c1c140c87256b4386890fad04f6acaa77bb258b6846a6420e8f9b224b38cf197560467461799781fc1e9ec4e4c0cd3061f1613
-  data.tar.gz: 97fb4eb068173b5b2f7710ea395595b57a547ff3520f7f29bce52d4bec1b3db19fa65835f829fc56704b5319502b4fb51942dc807758176345c0197cd0bf0b24
+  metadata.gz: 604533fb3bb940d49e396d434633b07ed51e3aa28a7ec16d7c00f38a4bec2722ac123a1658df97125afa827dd05afa52dc89804314ab1ff26f324b105e4945e2
+  data.tar.gz: 8c4648637f18a46590249f07de896212d4fb08a0913dcd31d48ddbfe543d1cc3f8940543f901c8db9d8c64917ce091ca0fcb9916fa0cd4a014addd2d0ac12113

data/Changelog.md

@@ -1,3 +1,16 @@
+### 2.14.0.rc1 / 2013-05-27
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.13.2...v2.14.0.rc1)
+
+Enhancements
+
+* Prelimiarily support Rails 4.1 by updating adapters to support Minitest 5.0.
+  (Andy Lindeman)
+
+Bug fixes
+
+* `rake stats` runs correctly when spec files exist at the top level of the
+  spec/ directory. (Benjamin Fleischer)
+
 ### 2.13.2 / 2013-05-18
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.13.1...v2.13.2)
 

data/README.md

@@ -56,6 +56,10 @@ Once installed, RSpec will generate spec files instead of Test::Unit test files
 when commands like `rails generate model` and `rails generate controller` are
 used.
 
+You may also invoke invoke RSpec generators independently. For instance,
+running `rspec generate rspec:model` will generate a model spec. For more
+information, see [list of all
+generators](https://www.relishapp.com/rspec/rspec-rails/docs/generators).
 
 ## Model Specs
 

data/lib/generators/rspec/helper/templates/helper_spec.rb

@@ -6,7 +6,7 @@ require 'spec_helper'
 # describe <%= class_name %>Helper do
 #   describe "string concat" do
 #     it "concats two strings with spaces" do
-#       helper.concat_strings("this","that").should == "this that"
+#       expect(helper.concat_strings("this","that")).to eq("this that")
 #     end
 #   end
 # end

data/lib/generators/rspec/integration/integration_generator.rb

@@ -18,7 +18,7 @@ module Rspec
 
       # @deprecated Use `--webrat` instead.
       def webrat?
-        RSpec.deprecate("the --webrat-matchers option", "--webrat") if options[:webrat_matchers]
+        RSpec.deprecate("the --webrat-matchers option", :replacement => "--webrat") if options[:webrat_matchers]
         options[:webrat] || options[:webrat_matchers]
       end
 

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -48,7 +48,7 @@ module Rspec
 
         # @deprecated Use `--webrat` instead.
         def webrat?
-          RSpec.deprecate("--webrat-matchers", "--webrat") if options[:webrat_matchers]
+          RSpec.deprecate("--webrat-matchers", :replacement => "--webrat") if options[:webrat_matchers]
           options[:webrat] || options[:webrat_matchers]
         end
 

data/lib/rspec/rails.rb

@@ -1,8 +1,8 @@
 require 'rspec/core'
 
 RSpec::configure do |c|
-  c.backtrace_clean_patterns << /vendor\//
-  c.backtrace_clean_patterns << /lib\/rspec\/rails/
+  c.backtrace_exclusion_patterns << /vendor\//
+  c.backtrace_exclusion_patterns << /lib\/rspec\/rails/
 end
 
 require 'rails/version'

data/lib/rspec/rails/adapters.rb

@@ -9,6 +9,7 @@ module RSpec
       def initialize(*assertion_modules)
         assertion_class = Class.new(SimpleDelegator) do
           include Test::Unit::Assertions
+          include ::RSpec::Rails::MinitestCounters
           assertion_modules.each { |mod| include mod }
         end
 
@@ -65,6 +66,19 @@ module RSpec
       end
     end
 
+    # @api private
+    module MinitestCounters
+      # @api private
+      def assertions
+        @assertions ||= 0
+      end
+
+      # @api private
+      def assertions=(assertions)
+        @assertions = assertions
+      end
+    end
+
     module SetupAndTeardownAdapter
       extend ActiveSupport::Concern
 
@@ -126,6 +140,7 @@ module RSpec
 
       class AssertionDelegator
         include Test::Unit::Assertions
+        include ::RSpec::Rails::MinitestCounters
       end
 
       # @api private

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

@@ -82,7 +82,7 @@ module RSpec::Rails
 
       # @deprecated Use `view` instead.
       def template
-        RSpec.deprecate("template","view")
+        RSpec.deprecate("template", :replacement => "view")
         view
       end
 

data/lib/rspec/rails/module_inclusion.rb

@@ -8,18 +8,8 @@ module RSpec::Rails
     # internally. As it happens, there are a few blog posts citing its use, so
     # I'm leaving it here, but deprecated.
     def include_self_when_dir_matches(*path_parts)
-        instead = <<-INSTEAD
-
-
-    RSpec.configure do |c|
-      c.include self, :example_group => {
-        :file_path => /#{path_parts.join('\/')}/
-      }
-    end
-
-INSTEAD
       lambda do |c|
-        RSpec.deprecate('include_self_when_dir_matches', instead, 'rails-3.0')
+        RSpec.deprecate('include_self_when_dir_matches')
         c.include self, :example_group => {
           :file_path => Regexp.compile(path_parts.join('[\\\/]'))
         }

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

@@ -14,7 +14,10 @@ RSpec::Core::RakeTask.new(:spec => spec_prereq)
 
 namespace :spec do
   def types
-    dirs = Dir['./spec/**/*_spec.rb'].map { |f| f.sub(/^\.\/(spec\/\w+)\/.*/, '\\1') }.uniq
+    dirs = Dir['./spec/**/*_spec.rb'].
+      map { |f| f.sub(/^\.\/(spec\/\w+)\/.*/, '\\1') }.
+      uniq.
+      select { |f| File.directory?(f) }
     Hash[dirs.map { |d| [d.split('/').last, d] }]
   end
 

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Rails
     module Version
-      STRING = '2.13.2'
+      STRING = '2.14.0.rc1'
     end
   end
 end

data/lib/rspec/rails/view_rendering.rb

@@ -41,7 +41,7 @@ module RSpec
 
         # @deprecated Use `render_views` instead.
         def integrate_views
-          RSpec.deprecate("integrate_views","render_views")
+          RSpec.deprecate("integrate_views", :replacement => "render_views")
           render_views
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 2.13.2
+  version: 2.14.0.rc1
 platform: ruby
 authors:
 - David Chelimsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -56,44 +56,44 @@ dependencies:
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0.rc1
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0.rc1
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -269,14 +269,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: rspec-rails-2.13.2
+summary: rspec-rails-2.14.0.rc1
 test_files: []
 has_rdoc: