wip test fix against CI

alexcrocha · alexcrocha · commit 6b9f24f8a3b5 · 2025-01-22T13:55:25.000-08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -71,7 +71,7 @@ jobs:
           bundler-cache: true
           rubygems: ${{ matrix.rubygems }}
       - name: Run tests
-        run: bin/test
+        run: bin/test spec/tapioca/ruby_lsp/run_gem_rbi_check_spec.rb
         continue-on-error: ${{ !!matrix.experimental }}
 
   buildall:
diff --git a/lib/ruby_lsp/tapioca/run_gem_rbi_check.rb b/lib/ruby_lsp/tapioca/run_gem_rbi_check.rb
@@ -50,12 +50,12 @@ def git_repo?
       sig { returns(T::Boolean) }
       def lockfile_changed?
         fetch_lockfile_diff
-        !T.must(@lockfile_diff).empty?
+        !@lockfile_diff.empty?
       end
 
       sig { returns(String) }
       def fetch_lockfile_diff
-        @lockfile_diff = %x(git diff HEAD Gemfile.lock).strip
+        @lockfile_diff = File.exist?("Gemfile.lock") ? %x(git diff Gemfile.lock).strip : ""
       end
 
       sig { void }
@@ -77,7 +77,9 @@ def execute_tapioca_gem_command(gems)
         # Resetting BUNDLE_GEMFILE to root folder to use the project's Gemfile instead of Ruby LSP's composed Gemfile
         stdout, stderr, status = T.unsafe(Open3).capture3(
           { "BUNDLE_GEMFILE" => "Gemfile" },
-          "bin/tapioca",
+          "bundle",
+          "exec",
+          "tapioca",
           "gem",
           "--lsp_addon",
           *gems,
diff --git a/spec/helpers/mock_gem.rb b/spec/helpers/mock_gem.rb
@@ -12,7 +12,7 @@ class MockGem < Spoom::Context
 
     # The gem's version string such as "1.0.0" or ">= 2.0.5"
     sig { returns(String) }
-    attr_reader :version
+    attr_accessor :version
 
     # The dependencies to be added to the gem's gemspec
     sig { returns(T::Array[String]) }
diff --git a/spec/spec_with_project.rb b/spec/spec_with_project.rb
@@ -84,6 +84,13 @@ def mock_gem(name, version, dependencies: [], path: default_gem_path(name), &blo
       gem
     end
 
+    sig { params(gem: MockGem, version: String).returns(MockGem) }
+    def update_gem(gem, version)
+      gem.version = version
+      gem.gemspec(gem.default_gemspec_contents)
+      gem
+    end
+
     # Spec assertions
 
     # Assert that the contents of `path` inside `@project` is equals to `expected`
diff --git a/spec/tapioca/ruby_lsp/run_gem_rbi_check_spec.rb b/spec/tapioca/ruby_lsp/run_gem_rbi_check_spec.rb
@@ -12,140 +12,131 @@ module Foo
         end
       RUBY
 
-      # TODO: understand why this fails with `before(:all)`
-      # before(:all) do
       before do
-        @project.tapioca("configure")
+        @project = mock_project
       end
 
       after do
-        project.write_gemfile!(project.tapioca_gemfile)
-        @project.require_default_gems
-        project.remove!("sorbet/rbi")
-        project.remove!("../gems")
-        project.remove!(".git")
-        project.remove!("sorbet/tapioca/require.rb")
-        project.remove!("config/application.rb")
-      ensure
-        @project.remove!("output")
+        @project.destroy!
       end
 
-      def setup_git_repo
-        @project.exec("git init")
-        @project.exec("touch Gemfile.lock")
-        FileUtils.mkdir_p("#{@project.absolute_path}/sorbet/rbi/gems")
-        @project.exec("git add . && git commit -m 'Initial commit'")
-      end
-
-      it "does nothing if there is no git repo" do
-        foo = mock_gem("foo", "0.0.1") do
-          write!("lib/foo.rb", FOO_RB)
+      describe "without git" do
+        before do
+          @project.bundle_install!
+          @project.tapioca("configure")
         end
-        @project.require_mock_gem(foo)
 
-        @project.bundle_install!
-        check = ::RubyLsp::Tapioca::RunGemRbiCheck.new
-        check.run(@project.absolute_path)
-
-        assert check.result.stdout.include?("Not a git repository")
-      end
+        it "does nothing if there is no git repo" do
+          foo = mock_gem("foo", "0.0.1") do
+            write!("lib/foo.rb", FOO_RB)
+          end
+          @project.require_mock_gem(foo)
 
-      it "creates the RBI for a newly added gem" do
-        setup_git_repo
+          @project.bundle_install!
+          check = ::RubyLsp::Tapioca::RunGemRbiCheck.new
+          check.run(@project.absolute_path)
 
-        foo = mock_gem("foo", "0.0.1") do
-          write!("lib/foo.rb", FOO_RB)
+          assert check.result.stdout.include?("Not a git repository")
         end
-        @project.require_mock_gem(foo)
-        @project.bundle_install!
-
-        check = ::RubyLsp::Tapioca::RunGemRbiCheck.new
-        check.run(@project.absolute_path)
-
-        assert_project_file_exist("sorbet/rbi/gems/foo@0.0.1.rbi")
       end
 
-      it "regenerates RBI when a gem version changes" do
-        setup_git_repo
-
-        foo = mock_gem("foo", "0.0.1") do
-          write!("lib/foo.rb", FOO_RB)
+      describe "with git" do
+        before do
+          @project.bundle_install!
+          @project.tapioca("configure")
+          @project.exec("git init")
+          @project.exec("git config commit.gpgsign false")
+          @project.exec("git add .")
+          @project.exec("git commit -m 'Initial commit'")
         end
-        @project.require_mock_gem(foo)
-        @project.bundle_install!
 
-        check = ::RubyLsp::Tapioca::RunGemRbiCheck.new
-        check.run(@project.absolute_path)
+        it "creates the RBI for a newly added gem" do
+          foo = mock_gem("foo", "0.0.1") do
+            write!("lib/foo.rb", FOO_RB)
+          end
+          @project.require_mock_gem(foo)
+          @project.bundle_install!
 
-        assert_project_file_exist("sorbet/rbi/gems/foo@0.0.1.rbi")
+          check = ::RubyLsp::Tapioca::RunGemRbiCheck.new
+          check.run(@project.absolute_path)
 
-        # Modify the gem
-        foo = mock_gem("foo", "0.0.2") do
-          write!("lib/foo.rb", FOO_RB)
+          assert_project_file_exist("sorbet/rbi/gems/foo@0.0.1.rbi")
         end
-        @project.require_mock_gem(foo)
-        @project.bundle_install!
 
-        check.run(@project.absolute_path)
+        it "regenerates RBI when a gem version changes" do
+          foo = mock_gem("foo", "0.0.1") do
+            write!("lib/foo.rb", FOO_RB)
+          end
+          @project.require_mock_gem(foo)
+          @project.bundle_install!
 
-        assert_project_file_exist("sorbet/rbi/gems/foo@0.0.2.rbi")
-      end
+          check = ::RubyLsp::Tapioca::RunGemRbiCheck.new
+          check.run(@project.absolute_path)
 
-      it "removes RBI file when a gem is removed" do
-        setup_git_repo
+          assert_project_file_exist("sorbet/rbi/gems/foo@0.0.1.rbi")
 
-        foo = mock_gem("foo", "0.0.1") do
-          write!("lib/foo.rb", FOO_RB)
-        end
-        @project.require_mock_gem(foo)
-        @project.bundle_install!
+          # Modify the gem
+          update_gem foo, "0.0.2"
+          @project.bundle_install!
+
+          check.run(@project.absolute_path)
 
-        check = ::RubyLsp::Tapioca::RunGemRbiCheck.new
-        check.run(@project.absolute_path)
+          assert_project_file_exist("sorbet/rbi/gems/foo@0.0.2.rbi")
+        end
 
-        assert_project_file_exist("sorbet/rbi/gems/foo@0.0.1.rbi")
+        it "removes RBI file when a gem is removed" do
+          foo = mock_gem("foo", "0.0.1") do
+            write!("lib/foo.rb", FOO_RB)
+          end
+          @project.require_mock_gem(foo)
+          @project.bundle_install!
 
-        @project.exec("git add Gemfile.lock")
-        @project.exec("git commit -m 'Add foo gem'")
+          check1 = ::RubyLsp::Tapioca::RunGemRbiCheck.new
+          check1.run(@project.absolute_path)
 
-        @project.write_gemfile!(@project.tapioca_gemfile)
-        @project.bundle_install!
+          assert_project_file_exist("sorbet/rbi/gems/foo@0.0.1.rbi")
 
-        check = ::RubyLsp::Tapioca::RunGemRbiCheck.new
-        check.run(@project.absolute_path)
+          @project.exec("git restore Gemfile Gemfile.lock")
 
-        refute_project_file_exist("sorbet/rbi/gems/foo@0.0.1.rbi")
-      end
+          check2 = ::RubyLsp::Tapioca::RunGemRbiCheck.new
+          check2.run(@project.absolute_path)
 
-      it "deletes untracked RBI files" do
-        setup_git_repo
+          refute_project_file_exist("sorbet/rbi/gems/foo@0.0.1.rbi")
+        end
 
-        # Create an untracked RBI file
-        FileUtils.touch("#{@project.absolute_path}/sorbet/rbi/gems/bar@0.0.1.rbi")
+        it "deletes untracked RBI files" do
+          @project.bundle_install!
+          FileUtils.mkdir_p("#{@project.absolute_path}/sorbet/rbi/gems")
+          # Create an untracked RBI file
+          FileUtils.touch("#{@project.absolute_path}/sorbet/rbi/gems/bar@0.0.1.rbi")
 
-        assert_project_file_exist("/sorbet/rbi/gems/bar@0.0.1.rbi")
+          assert_project_file_exist("/sorbet/rbi/gems/bar@0.0.1.rbi")
 
-        check = ::RubyLsp::Tapioca::RunGemRbiCheck.new
-        check.run(@project.absolute_path)
+          check = ::RubyLsp::Tapioca::RunGemRbiCheck.new
+          check.run(@project.absolute_path)
 
-        refute_project_file_exist("sorbet/rbi/gems/bar@0.0.1.rbi")
-      end
+          refute_project_file_exist("sorbet/rbi/gems/bar@0.0.1.rbi")
+        end
 
-      it "restores deleted RBI files" do
-        setup_git_repo
+        it "restores deleted RBI files" do
+          @project.bundle_install!
+          FileUtils.mkdir_p("#{@project.absolute_path}/sorbet/rbi/gems")
+          # Create and delete a tracked RBI file
+          FileUtils.touch("#{@project.absolute_path}/sorbet/rbi/gems/foo@0.0.1.rbi")
+          @project.exec("git add sorbet/rbi/gems/foo@0.0.1.rbi")
+          @project.exec("git commit -m 'Add foo RBI'")
+          FileUtils.rm("#{@project.absolute_path}/sorbet/rbi/gems/foo@0.0.1.rbi")
 
-        # Create and delete a tracked RBI file
-        FileUtils.touch("#{@project.absolute_path}/sorbet/rbi/gems/foo@0.0.1.rbi")
-        @project.exec("git add sorbet/rbi/gems/foo@0.0.1.rbi")
-        @project.exec("git commit -m 'Add foo RBI'")
-        FileUtils.rm("#{@project.absolute_path}/sorbet/rbi/gems/foo@0.0.1.rbi")
+          refute_project_file_exist("sorbet/rbi/gems/foo@0.0.1.rbi")
 
-        refute_project_file_exist("sorbet/rbi/gems/foo@0.0.1.rbi")
+          check = ::RubyLsp::Tapioca::RunGemRbiCheck.new
+          check.run(@project.absolute_path)
 
-        check = ::RubyLsp::Tapioca::RunGemRbiCheck.new
-        check.run(@project.absolute_path)
+          assert_project_file_exist("sorbet/rbi/gems/foo@0.0.1.rbi")
 
-        assert_project_file_exist("sorbet/rbi/gems/foo@0.0.1.rbi")
+          # Clean-up commit
+          @project.exec("git reset --hard HEAD^")
+        end
       end
     end
   end
