Skip to content

Commit

Permalink
Revert "RSpec.reset resets filters"
Browse files Browse the repository at this point in the history
This reverts commit ba15a2e.
  • Loading branch information
dchelimsky committed May 18, 2012
1 parent ba15a2e commit 2d61d16
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 32 deletions.
4 changes: 0 additions & 4 deletions Changelog.md
Expand Up @@ -12,10 +12,6 @@ Enhancements
* thanks to Bradley Schaefer for suggesting it and Avdi Grimm for almost * thanks to Bradley Schaefer for suggesting it and Avdi Grimm for almost
suggesting it. suggesting it.


Bug fixes

* `RSpec.reset` also resets filters.

### 2.10.0 / 2012-05-03 ### 2.10.0 / 2012-05-03
[full changelog](http://github.com/rspec/rspec-core/compare/v2.9.0...v2.10.0) [full changelog](http://github.com/rspec/rspec-core/compare/v2.9.0...v2.10.0)


Expand Down
1 change: 0 additions & 1 deletion lib/rspec/core/configuration.rb
Expand Up @@ -209,7 +209,6 @@ def force(hash)
def reset def reset
@reporter = nil @reporter = nil
@formatters.clear @formatters.clear
filter_manager.reset
end end


# @overload add_setting(name) # @overload add_setting(name)
Expand Down
8 changes: 2 additions & 6 deletions lib/rspec/core/filter_manager.rb
Expand Up @@ -115,13 +115,9 @@ def _warn_deprecated_key(key, updates)
attr_reader :exclusions, :inclusions attr_reader :exclusions, :inclusions


def initialize def initialize
reset
extend(BackwardCompatibility)
end

def reset
@inclusions = {}.extend(Describable)
@exclusions = DEFAULT_EXCLUSIONS.dup.extend(Describable) @exclusions = DEFAULT_EXCLUSIONS.dup.extend(Describable)
@inclusions = {}.extend(Describable)
extend(BackwardCompatibility)
end end


def add_location(file_path, line_numbers) def add_location(file_path, line_numbers)
Expand Down
5 changes: 0 additions & 5 deletions spec/rspec/core/configuration_spec.rb
Expand Up @@ -1101,11 +1101,6 @@ def metadata_hash(*args)
config.reset config.reset
config.formatters.should be_empty config.formatters.should be_empty
end end

it "resets the filter_manager" do
config.filter_manager.should_receive(:reset)
config.reset
end
end end


describe "#force" do describe "#force" do
Expand Down
16 changes: 0 additions & 16 deletions spec/rspec/core/filter_manager_spec.rb
Expand Up @@ -252,21 +252,5 @@ def filterable_object_with(args = {})
filter_manager.inclusions.should eq(filter => "a_value") filter_manager.inclusions.should eq(filter => "a_value")
end end
end end

describe "#reset" do
it "clears the inclusions" do
filter_manager = FilterManager.new
filter_manager.include :foo => :bar
filter_manager.reset
filter_manager.inclusions.should be_empty
end

it "clears the exclusions" do
filter_manager = FilterManager.new
filter_manager.exclude :foo => :bar
filter_manager.reset
filter_manager.exclusions.should eq(FilterManager::DEFAULT_EXCLUSIONS)
end
end
end end
end end

0 comments on commit 2d61d16

Please sign in to comment.