Permalink
Browse files

Merge pull request #555 from ineverov/add_set_require

require 'set'
  • Loading branch information...
2 parents 454f3b4 + 2b76e88 commit 192cd0283a1e125c60401b45a1d3d07c6ecb0720 @dchelimsky dchelimsky committed Jan 16, 2012
Showing with 4 additions and 3 deletions.
  1. +1 −0 lib/rspec/core.rb
  2. +1 −1 lib/rspec/core/drb_options.rb
  3. +1 −1 lib/rspec/core/filter_manager.rb
  4. +1 −1 lib/rspec/core/hooks.rb
View
1 lib/rspec/core.rb
@@ -10,6 +10,7 @@ def require_rspec(path)
end
end
+require 'set'
require_rspec 'core/filter_manager'
require_rspec 'core/dsl'
require_rspec 'core/extensions'
View
2 lib/rspec/core/drb_options.rb
@@ -52,7 +52,7 @@ def add_line_numbers(argv)
end
end
- CONDITIONAL_FILTERS = [:if, :unless].to_set
+ CONDITIONAL_FILTERS = [:if, :unless]
def add_filter(argv, name, hash)
hash.each_pair do |k, v|
View
2 lib/rspec/core/filter_manager.rb
@@ -71,7 +71,7 @@ class FilterManager
:unless => lambda { |value| value }
}
- STANDALONE_FILTERS = [:locations, :line_numbers, :full_description].to_set
+ STANDALONE_FILTERS = [:locations, :line_numbers, :full_description]
module Describable
PROC_HEX_NUMBER = /0x[0-9a-f]+@/
View
2 lib/rspec/core/hooks.rb
@@ -398,7 +398,7 @@ def find_hook(hook, scope, example_group_class, example = nil)
private
- SCOPES = [:each, :all, :suite].to_set
+ SCOPES = [:each, :all, :suite]
def scope_and_options_from(*args)
scope = if SCOPES.include?(args.first)

0 comments on commit 192cd02

Please sign in to comment.