Skip to content

Commit

Permalink
Revert "fix access priorities of each level in LeveledOptions"
Browse files Browse the repository at this point in the history
This reverts commit 15f0847.

Fixes #1200
  • Loading branch information
nateberkopec committed Feb 9, 2017
1 parent 42126a2 commit 30c12ca
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
2 changes: 1 addition & 1 deletion lib/puma/configuration.rb
Expand Up @@ -31,7 +31,7 @@ def shift
end

def [](key)
@set.reverse_each do |o|
@set.each do |o|
if o.key? key
return o[key]
end
Expand Down
11 changes: 0 additions & 11 deletions test/test_config.rb
Expand Up @@ -56,17 +56,6 @@ def test_allow_users_to_override_default_options
assert_equal 'bin/rails server', conf.options[:restart_cmd]
end

def test_overwrite_options
conf = Puma::Configuration.new do |c|
c.workers 3
end
conf.load

assert_equal conf.options[:workers], 3
conf.options[:workers] += 1
assert_equal conf.options[:workers], 4
end

private

def with_env(env = {})
Expand Down

0 comments on commit 30c12ca

Please sign in to comment.