ruby-lsp-shoulda-context 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8507f756d0b208adca8b52c8d852897a5d641eafc10e4f426d52a1f996e77be4
-  data.tar.gz: 2ce268a5a67e65f5dedb35ef95e4a0f5007c3fa87e0a39c774214e88fc2d9910
+  metadata.gz: 8112ca7fa20b49f281d1b3b89975e7cab08adbdc93d753daaa0b275423adff19
+  data.tar.gz: 7a175a8727300cc49bedf73b82e7263330262e319a8df36083215b4deed11f23
 SHA512:
-  metadata.gz: 6f3b09e7a7d238b18adddbd2d76cce47d2b4d0c97064ad3ea4344a1c6344a0a7eb81eee4dbe7d6378e83b2c1c694c78acd2ecea3e904798e5865b54f730dabcb
-  data.tar.gz: 3caae73f44f1d790c0336369ae3ac28f00ad2dc9cf742b254c57b3ece19842fdb5b696ceed6916cf7b7eb453a0a05e217ff29d774d410cd0e89fcf7b268d7c43
+  metadata.gz: 443dcb56b9542410765f47fc3a22d7135fa09ad71abb6e9d2308eee42566b5854c16564abc2f515e4e0433be5e830d1de5ff18c25b41e6612f6d3991129139dc
+  data.tar.gz: 1d9353e3befef9ee4b5f9e7f11cca6e44034fd8cd64c2af0250bacd7716b1113f7eaba9985003a909038c7d2dbddcac021fa5041eb26506c777776a9cdb72833

data/Readme.md

@@ -44,5 +44,6 @@ Everyone interacting in the RubyLsp::ShouldaContext project's codebases, issue t
 - [ ] Make exec method conditional to rails or Minitest setup
 - [x] Make inner context or inner should with collissions with outer DSL not collide using full name of the test (Currently if 2 tests have the same name both are executed)
 - [x] Provide grouping with classes that ends with "..Test" syntax (Note: The codelens is duplicated becuase lsp support minitest by default and LSP responses are merged)
+- [ ] Provide support for Inner Classes
 
 **Note**: This project is in very early stage and could have major bugs

data/lib/ruby_lsp/ruby-lsp-shoulda-context/code_lens.rb

@@ -11,11 +11,12 @@ module RubyLsp
 
       BASE_COMMAND = T.let(
         begin
+          cmd = File.exist?(File.join(Dir.pwd, "bin", "rails")) ? "bin/rails test" : "ruby -ITest"
           Bundler.with_original_env { Bundler.default_lockfile }
-          "bundle exec ruby"
+          "bundle exec #{cmd}"
         rescue Bundler::GemfileNotFound
-          "ruby"
-        end + " -ITest",
+          cmd
+        end,
         String,
       )
 
@@ -31,6 +32,7 @@ module RubyLsp
         @_response = T.let([], ResponseType)
         # Listener is only initialized if uri.to_standardized_path is valid
         @path = T.let(T.must(uri.to_standardized_path), String)
+        @class_name = T.let("", String)
         @group_id = T.let(1, Integer)
         @group_id_stack = T.let([], T::Array[Integer])
         @pattern = T.let("test_: ", String)
@@ -46,6 +48,12 @@ module RubyLsp
         case node.message
         when "should"
           name = generate_name(node)
+
+          # If is top level should without context the DSL is different
+          if @group_id_stack.length == 1
+            @pattern += "#{@class_name} "
+          end
+
           @pattern += "should #{name} "
           add_test_code_lens(node, name: name, kind: :example)
         when "context"
@@ -65,7 +73,13 @@ module RubyLsp
         case node.message
         when "should"
           name = generate_name(node)
+
           @pattern = remove_last_pattern_in_string(@pattern, "should #{name} ")
+
+          # If is top level should without context the DSL is different
+          if @group_id_stack.length == 1
+            @pattern = remove_last_pattern_in_string(@pattern, "#{@class_name} ")
+          end
         when "context"
           return unless valid_group?(node)
 
@@ -78,12 +92,13 @@ module RubyLsp
       sig { params(node: Prism::ClassNode).void }
       def on_class_node_enter(node)
         class_name = node.constant_path.slice
+        @class_name = remove_last_pattern_in_string(class_name, "Test")
 
         if @path && class_name.end_with?("Test")
           add_test_code_lens(
             node,
             name: class_name,
-            kind: :group,
+            kind: :class,
           )
         end
 
@@ -102,10 +117,6 @@ module RubyLsp
         string.sub(/#{pattern}$/, "")
       end
 
-      def pattern_only_has_test?(pattern)
-        pattern == "test_: "
-      end
-
       sig { params(node: Prism::CallNode).returns(T::Boolean) }
       def valid_group?(node)
         !node.block.nil?
@@ -137,7 +148,13 @@ module RubyLsp
       def add_test_code_lens(node, name:, kind:)
         return unless DependencyDetector.instance.dependencies.include?(REQUIRED_LIBRARY)
 
-        command = "#{@base_command} #{@path} -n \"/#{@pattern.strip}/\""
+        if kind == :class
+          pattern = "#{@class_name}Test"
+          kind = :group
+        else
+          pattern = @pattern.strip
+        end
+        command = "#{@base_command} #{@path} --name \"/#{pattern}/\""
 
         grouping_data = { group_id: @group_id_stack.last, kind: kind }
         grouping_data[:id] = @group_id if kind == :group

data/lib/ruby_lsp/shoulda_context/version.rb

@@ -3,6 +3,6 @@
 
 module RubyLsp
   module ShouldaContext
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-shoulda-context
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Domingo Edwards
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-10 00:00:00.000000000 Z
+date: 2024-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-lsp