rspec-core 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3464d50aabc135c4eb42c895bf39efee77b71c0
-  data.tar.gz: 7ece9a5ae8f18b7dd4f64922278e16f27bf5c7df
+  metadata.gz: ba0ddfd56ea03cc9a322731b3f8dfaffdbf30e0a
+  data.tar.gz: c583095f89e08f9bad505e66ff8e7c6b8d86463e
 SHA512:
-  metadata.gz: a17e0892a0475a1fc22e75da06fa40b9f7e6e99e1aa709b148f6cd4ea7b435aec49c298cb39f9bd7030fd18de5a7c045810dbb0045c92213b094f82cd671c217
-  data.tar.gz: 9e2a83b038993bddf729f9821349588d6c21612fec3482bd39ea7835bcbeccf85d21feb72c3676cb336ea24792436760b574181a346b88df7280976844c363c0
+  metadata.gz: fc5a1e85733f04c1356f602fb26423b97d6d77f615b9fed60af58c000a6f053d9370de6d07cb7ccf0491597b3483ae50c04f8520196dea74bb1f3dd69fa3dc0c
+  data.tar.gz: c69325b31b38dd11ad00ba848bd4863184031aec28479d2329d0e7971443e4fc06ebeb82416cbfaa3d2a5b348992c3a906d65a3472fe1eb5f7f1d648a043309c

data/Changelog.md

@@ -1,3 +1,13 @@
+### 3.2.2 / 2015-03-11
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.2.1...v3.2.2)
+
+Bug Fixes:
+
+* Fix regression in 3.2.0 that allowed tag-filtered examples to
+  run even if there was a location filter applied to the spec
+  file that was intended to limit the file to other examples.
+  (#1894, Myron Marston)
+
 ### 3.2.1 / 2015-02-23
 [Full Changelog](http://github.com/rspec/rspec-core/compare/v3.2.0...v3.2.1)
 

data/lib/rspec/core/filter_manager.rb

@@ -31,8 +31,13 @@ module RSpec
         if inclusions.standalone?
           examples.select { |e| include?(e) }
         else
-          locations = inclusions.fetch(:locations) { Hash.new([]) }
-          examples.select { |e| priority_include?(e, locations) || (!exclude?(e) && include?(e)) }
+          locations, other_inclusions = inclusions.partition_locations
+
+          examples.select do |e|
+            priority_include?(e, locations) do
+              !exclude?(e) && other_inclusions.include_example?(e)
+            end
+          end
         end
       end
 
@@ -83,7 +88,7 @@ module RSpec
       # defined in the same file as the location filters. Excluded specs in
       # other files should still be excluded.
       def priority_include?(example, locations)
-        return false if locations[example.metadata[:absolute_file_path]].empty?
+        return yield if locations[example.metadata[:absolute_file_path]].empty?
         MetadataFilter.filter_applies?(:locations, locations, example.metadata)
       end
     end
@@ -104,8 +109,8 @@ module RSpec
         [exclusions, inclusions]
       end
 
-      def initialize(*args, &block)
-        @rules = Hash.new(*args, &block)
+      def initialize(rules={})
+        @rules = rules
       end
 
       def add(updated)
@@ -173,6 +178,13 @@ module RSpec
         apply_standalone_filter(*args) || super
       end
 
+      def partition_locations
+        locations = @rules.fetch(:locations) { Hash.new([]) }
+        other_inclusions = self.class.new(@rules.dup.tap { |r| r.delete(:locations) })
+
+        return locations, other_inclusions
+      end
+
       def include_example?(example)
         @rules.empty? || super
       end

data/lib/rspec/core/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Core.
     module Version
       # Current version of RSpec Core, in semantic versioning format.
-      STRING = '3.2.1'
+      STRING = '3.2.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Steven Baker
@@ -46,7 +46,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -276,9 +276,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-core-3.2.1
+summary: rspec-core-3.2.2
 test_files: []
 has_rdoc: