Skip to content

Commit

Permalink
remove some unused attr_readers and just use the instance
Browse files Browse the repository at this point in the history 
variables internally
  • Loading branch information
@dchelimsky
dchelimsky committed Mar 3, 2010
1 parent bb48845 commit 47f0b2a
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 42 deletions.
62 changes: 27 additions & 35 deletions lib/rspec/core/configuration.rb
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
module Rspec
module Core
class Configuration
# All of the defined advice in the configuration (before/after/around)
attr_reader :advice

# Allows you to control what examples are ran by filtering
# Control what examples are run by filtering
attr_reader :filter

# Control what examples are not run by filtering
attr_reader :exclusion_filter

# Modules that will be included or extended based on given filters
attr_reader :include_or_extend_modules

# Run all examples if the run is filtered, and no examples were found. Normally this is what you want -
# when using focused examples for instance. Defaults to true
attr_accessor :run_all_when_everything_filtered

attr_reader :options
# Run all examples if the run is filtered, and no examples were found.
attr_writer :run_all_when_everything_filtered

def initialize
@run_all_when_everything_filtered = false
@advice = {
@hooks = {
:before => { :each => [], :all => [], :suite => [] },
:after => { :each => [], :all => [], :suite => [] }
}
Expand All @@ -47,15 +39,15 @@ def default_options
end

def cleaned_from_backtrace?(line)
options[:backtrace_clean_patterns].any? { |regex| line =~ regex }
@options[:backtrace_clean_patterns].any? { |regex| line =~ regex }
end

def backtrace_clean_patterns
options[:backtrace_clean_patterns]
@options[:backtrace_clean_patterns]
end

def mock_framework=(use_me_to_mock)
options[:mock_framework] = use_me_to_mock
@options[:mock_framework] = use_me_to_mock

mock_framework_class = case use_me_to_mock.to_s
when /rspec/i
Expand All @@ -75,24 +67,24 @@ def mock_framework=(use_me_to_mock)
Rspec::Core::Mocking::WithAbsolutelyNothing
end

options[:mock_framework_class] = mock_framework_class
@options[:mock_framework_class] = mock_framework_class
Rspec::Core::ExampleGroup.send(:include, mock_framework_class)
end

def mock_framework
options[:mock_framework]
@options[:mock_framework]
end

def filename_pattern
options[:filename_pattern]
@options[:filename_pattern]
end

def filename_pattern=(new_pattern)
options[:filename_pattern] = new_pattern
@options[:filename_pattern] = new_pattern
end

def color_enabled=(on_or_off)
options[:color_enabled] = on_or_off
@options[:color_enabled] = on_or_off
end

def full_backtrace=(bool)
Expand All @@ -118,7 +110,7 @@ def debug=(bool)
end

def color_enabled?
options[:color_enabled]
@options[:color_enabled]
end

def line_number=(line_number)
Expand All @@ -131,15 +123,15 @@ def full_description=(description)

# Enable profiling of example run - defaults to false
def profile_examples
options[:profile_examples]
@options[:profile_examples]
end

def profile_examples=(on_or_off)
options[:profile_examples] = on_or_off
@options[:profile_examples] = on_or_off
end

def formatter_class
options[:formatter_class]
@options[:formatter_class]
end

def formatter=(formatter_to_use)
Expand All @@ -151,19 +143,19 @@ def formatter=(formatter_to_use)
else
raise ArgumentError, "Formatter '#{formatter_to_use}' unknown - maybe you meant 'documentation' or 'progress'?."
end
options[:formatter_class] = formatter_class
@options[:formatter_class] = formatter_class
end

def formatter
@formatter ||= formatter_class.new
end

def files_to_run
options[:files_to_run]
@options[:files_to_run]
end

def files_or_directories_to_run=(*files)
options[:files_to_run] = files.flatten.inject([]) do |result, file|
@options[:files_to_run] = files.flatten.inject([]) do |result, file|
if File.directory?(file)
filename_pattern.split(",").each do |pattern|
result += Dir["#{file}/#{pattern.strip}"]
Expand Down Expand Up @@ -205,29 +197,29 @@ def parse_command_line_args(args)
end

def include(mod, options={})
include_or_extend_modules << [:include, mod, options]
@include_or_extend_modules << [:include, mod, options]
end

def extend(mod, options={})
include_or_extend_modules << [:extend, mod, options]
@include_or_extend_modules << [:extend, mod, options]
end

def find_modules(group)
include_or_extend_modules.select do |include_or_extend, mod, filters|
@include_or_extend_modules.select do |include_or_extend, mod, filters|
group.all_apply?(filters)
end
end

def before(each_or_all=:each, options={}, &block)
advice[:before][each_or_all] << [options, block]
@hooks[:before][each_or_all] << [options, block]
end

def after(each_or_all=:each, options={}, &block)
advice[:after][each_or_all] << [options, block]
@hooks[:after][each_or_all] << [options, block]
end

def find_advice(desired_advice_type, desired_each_or_all, group)
advice[desired_advice_type][desired_each_or_all].select do |filters, block|
def find_hook(hook, each_or_all, group)
@hooks[hook][each_or_all].select do |filters, block|
group.all_apply?(filters)
end.map { |filters, block| block }
end
Expand Down
8 changes: 4 additions & 4 deletions lib/rspec/core/example_group.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,26 +156,26 @@ def self.eval_before_alls(running_example)
if superclass.respond_to?(:before_all_ivars)
superclass.before_all_ivars.each { |ivar, val| running_example.instance_variable_set(ivar, val) }
end
configuration.find_advice(:before, :all, self).each { |blk| running_example.instance_eval(&blk) }
configuration.find_hook(:before, :all, self).each { |blk| running_example.instance_eval(&blk) }

before_alls.each { |blk| running_example.instance_eval(&blk) }
running_example.instance_variables.each { |ivar| before_all_ivars[ivar] = running_example.instance_variable_get(ivar) }
end

def self.eval_before_eachs(running_example)
configuration.find_advice(:before, :each, self).each { |blk| running_example.instance_eval(&blk) }
configuration.find_hook(:before, :each, self).each { |blk| running_example.instance_eval(&blk) }
before_ancestors.each { |ancestor| ancestor.before_eachs.each { |blk| running_example.instance_eval(&blk) } }
end

def self.eval_after_alls(running_example)
after_alls.each { |blk| running_example.instance_eval(&blk) }
configuration.find_advice(:after, :all, self).each { |blk| running_example.instance_eval(&blk) }
configuration.find_hook(:after, :all, self).each { |blk| running_example.instance_eval(&blk) }
before_all_ivars.keys.each { |ivar| before_all_ivars[ivar] = running_example.instance_variable_get(ivar) }
end

def self.eval_after_eachs(running_example)
after_ancestors.each { |ancestor| ancestor.after_eachs.each { |blk| running_example.instance_eval(&blk) } }
configuration.find_advice(:after, :each, self).each { |blk| running_example.instance_eval(&blk) }
configuration.find_hook(:after, :each, self).each { |blk| running_example.instance_eval(&blk) }
end

def self.run(reporter)
Expand Down
6 changes: 3 additions & 3 deletions spec/rspec/core/configuration_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,10 @@ def that_thing

end

describe "run_all_when_everything_filtered" do
describe "run_all_when_everything_filtered?" do

it "defaults to false" do
config.run_all_when_everything_filtered.should == false
config.run_all_when_everything_filtered?.should == false
end

it "can be queried with question method" do
Expand Down Expand Up @@ -213,7 +213,7 @@ def that_thing
describe "full_backtrace=" do
it "clears the backtrace clean patterns" do
config.full_backtrace = true
config.options[:backtrace_clean_patterns].should == []
config.backtrace_clean_patterns.should == []
end
end

Expand Down

0 comments on commit 47f0b2a

Please sign in to comment.