diff options
| author | Benoit Daloze <eregontp@gmail.com> | 2022-09-28 18:37:16 +0200 |
|---|---|---|
| committer | Benoit Daloze <eregontp@gmail.com> | 2022-09-28 18:37:16 +0200 |
| commit | 5a1ab740fc287df8bf4038f19bd28bbb73e181b6 (patch) | |
| tree | 4c5c6e015e949f7e8c26a3fe5e1efe326a2e3342 /spec/mspec/lib/mspec/utils | |
| parent | 3e7c42a239d944ba6025e40bcceef249db93b852 (diff) | |
Update to ruby/mspec@b60306d
Diffstat (limited to 'spec/mspec/lib/mspec/utils')
| -rw-r--r-- | spec/mspec/lib/mspec/utils/name_map.rb | 7 | ||||
| -rw-r--r-- | spec/mspec/lib/mspec/utils/script.rb | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/spec/mspec/lib/mspec/utils/name_map.rb b/spec/mspec/lib/mspec/utils/name_map.rb index a389b9d1de..bf70e651a2 100644 --- a/spec/mspec/lib/mspec/utils/name_map.rb +++ b/spec/mspec/lib/mspec/utils/name_map.rb @@ -51,6 +51,10 @@ class NameMap SpecVersion ] + ALWAYS_PRIVATE = %w[ + initialize initialize_copy initialize_clone initialize_dup respond_to_missing? + ].map(&:to_sym) + def initialize(filter = false) @seen = {} @filter = filter @@ -86,7 +90,8 @@ class NameMap hash["#{name}."] = ms.sort unless ms.empty? ms = m.public_instance_methods(false) + - m.protected_instance_methods(false) + m.protected_instance_methods(false) + + (m.private_instance_methods(false) & ALWAYS_PRIVATE) ms.map! { |x| x.to_s } hash["#{name}#"] = ms.sort unless ms.empty? diff --git a/spec/mspec/lib/mspec/utils/script.rb b/spec/mspec/lib/mspec/utils/script.rb index dd1603c20a..e86beaab86 100644 --- a/spec/mspec/lib/mspec/utils/script.rb +++ b/spec/mspec/lib/mspec/utils/script.rb @@ -84,12 +84,7 @@ class MSpecScript names.each do |name| config[:path].each do |dir| - begin - file = File.expand_path name, dir - rescue ArgumentError - # File.expand_path can issue error e.g. if HOME is not available - next - end + file = File.expand_path name, dir if @loaded.include?(file) return true elsif File.exist? file @@ -288,7 +283,6 @@ class MSpecScript script = new script.load_default - script.try_load '~/.mspecrc' script.options script.signals script.register |