Skip to content

Commit 6ca1aec

Browse files
Fix CI: rubocop, cspell, and stale test mocks
- Wrap escape_glob_metacharacters in `class << self` to satisfy Style/ClassMethodsDefinitions - Add `metacharacters` and `Bslug` to project-words for cspell - Update Dir.glob mocks in resolve_test_commands_test to return paths relative to `base:`, matching the new test_style.rb contract
1 parent 82dea6a commit 6ca1aec

3 files changed

Lines changed: 14 additions & 10 deletions

File tree

lib/ruby_lsp/utils.rb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ module RubyLsp
2121
GUESSED_TYPES_URL = "https://shopify.github.io/ruby-lsp/#guessed-types"
2222
TEST_PATH_PATTERN = "**/{test,spec,features}/**/{*_test.rb,test_*.rb,*_spec.rb,*.feature}"
2323

24-
# Escape characters that have special meaning in Dir.glob patterns
25-
#: (String str) -> String
26-
def self.escape_glob_metacharacters(str)
27-
str.gsub(/[\[\]{}*?\\]/) { |c| "\\#{c}" }
24+
class << self
25+
# Escape characters that have special meaning in Dir.glob patterns
26+
#: (String str) -> String
27+
def escape_glob_metacharacters(str)
28+
str.gsub(/[\[\]{}*?\\]/) { |c| "\\#{c}" }
29+
end
2830
end
2931

3032
# Request delegation for embedded languages is not yet standardized into the language server specification. Here we

project-words

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ binstub
1111
binstubs
1212
Bizt
1313
Bizw
14+
Bslug
1415
boolish
1516
bufnr
1617
bytesize
@@ -60,6 +61,7 @@ linuxbrew
6061
lockfiles
6162
lspconfig
6263
Lstart
64+
metacharacters
6365
metaprogramming
6466
mkpath
6567
multibyte

test/requests/resolve_test_commands_test.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ def test_resolve_test_command_entire_files
223223

224224
def test_resolve_test_command_entire_directories
225225
with_server do |server|
226-
Dir.stubs(:glob).returns(["/other/test/fake_test.rb", "/other/test/fake_test2.rb"])
226+
Dir.stubs(:glob).returns(["fake_test.rb", "fake_test2.rb"])
227227
server.process_message({
228228
id: 1,
229229
method: "rubyLsp/resolveTestCommands",
@@ -539,7 +539,7 @@ def test_resolve_test_command_nested_test_groups
539539

540540
def test_resolve_test_command_mix_of_directories_and_examples
541541
with_server do |server|
542-
Dir.stubs(:glob).returns(["/test/unit/fake_test.rb", "/test/unit/fake_test2.rb"])
542+
Dir.stubs(:glob).returns(["fake_test.rb", "fake_test2.rb"])
543543
server.process_message({
544544
id: 1,
545545
method: "rubyLsp/resolveTestCommands",
@@ -637,7 +637,7 @@ def test_resolve_test_command_for_minitest_spec
637637

638638
def test_resolve_test_command_for_minitest_spec_directory
639639
with_server do |server|
640-
Dir.stubs(:glob).returns(["/other/spec/fake_spec.rb", "/other/spec/fake2_spec.rb"])
640+
Dir.stubs(:glob).returns(["fake_spec.rb", "fake2_spec.rb"])
641641
server.process_message({
642642
id: 1,
643643
method: "rubyLsp/resolveTestCommands",
@@ -782,7 +782,7 @@ def test_resolve_properly_escapes_single_file_paths
782782

783783
def test_resolve_properly_escapes_file_paths_within_directories
784784
with_server do |server|
785-
Dir.stubs(:glob).returns(["/other/test/fake(v2)_test.rb"])
785+
Dir.stubs(:glob).returns(["fake(v2)_test.rb"])
786786
server.process_message({
787787
id: 1,
788788
method: "rubyLsp/resolveTestCommands",
@@ -1298,7 +1298,7 @@ def test_resolve_test_command_nested_test_groups
12981298

12991299
def test_resolve_test_command_mix_of_directories_and_examples
13001300
with_server do |server|
1301-
Dir.stubs(:glob).returns(["/test/unit/fake_test.rb", "/test/unit/fake_test2.rb"])
1301+
Dir.stubs(:glob).returns(["fake_test.rb", "fake_test2.rb"])
13021302
server.process_message({
13031303
id: 1,
13041304
method: "rubyLsp/resolveTestCommands",
@@ -1366,7 +1366,7 @@ def test_resolve_properly_escapes_single_file_paths
13661366

13671367
def test_resolve_properly_escapes_file_paths_within_directories
13681368
with_server do |server|
1369-
Dir.stubs(:glob).returns(["/other/test/fake(v2)_test.rb"])
1369+
Dir.stubs(:glob).returns(["fake(v2)_test.rb"])
13701370
server.process_message({
13711371
id: 1,
13721372
method: "rubyLsp/resolveTestCommands",

0 commit comments

Comments
 (0)