geet 0.26.0 → 0.27.0

data/spec/integration/create_pr_spec.rb

@@ -7,8 +7,8 @@ require_relative '../../lib/geet/services/create_pr'
 
 describe Geet::Services::CreatePr do
   let(:git_client) { Geet::Utils::GitClient.new }
-  let(:repository) { Geet::Git::Repository.new(git_client: git_client, warnings: false) }
-  let(:upstream_repository) { Geet::Git::Repository.new(upstream: true, git_client: git_client, warnings: false) }
+  let(:repository) { Geet::Git::Repository.new(git_client:, warnings: false) }
+  let(:upstream_repository) { Geet::Git::Repository.new(upstream: true, git_client:, warnings: false) }
 
   context 'with github.com' do
     context 'with labels, reviewers and milestones' do
@@ -37,7 +37,7 @@ describe Geet::Services::CreatePr do
         actual_output = StringIO.new
 
         actual_created_pr = VCR.use_cassette('github_com/create_pr', allow_unused_http_interactions: true) do
-          service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+          service_instance = described_class.new(repository, out: actual_output, git_client:)
           service_instance.execute(
             'Title', 'Description',
             labels: 'bug,invalid', milestone: '0.0.1', reviewers: 'donald-fr'
@@ -74,7 +74,7 @@ describe Geet::Services::CreatePr do
         actual_output = StringIO.new
 
         actual_created_pr = VCR.use_cassette('github_com/create_pr_upstream', allow_unused_http_interactions: true) do
-          service_instance = described_class.new(upstream_repository, out: actual_output, git_client: git_client)
+          service_instance = described_class.new(upstream_repository, out: actual_output, git_client:)
           service_instance.execute('Title', 'Description')
         end
 
@@ -111,7 +111,7 @@ describe Geet::Services::CreatePr do
             actual_output = StringIO.new
 
             actual_created_pr = VCR.use_cassette('github_com/create_pr_upstream_without_write_permissions') do
-              service_instance = described_class.new(upstream_repository, out: actual_output, git_client: git_client)
+              service_instance = described_class.new(upstream_repository, out: actual_output, git_client:)
               service_instance.execute(
                 'Title', 'Description',
                 labels: '<ignored>'
@@ -136,7 +136,7 @@ describe Geet::Services::CreatePr do
         actual_output = StringIO.new
 
         expect do
-          service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+          service_instance = described_class.new(repository, out: actual_output, git_client:)
           service_instance.execute('Title', 'Description')
         end.to raise_error(RuntimeError, 'The working tree is not clean!')
 
@@ -163,7 +163,7 @@ describe Geet::Services::CreatePr do
         actual_output = StringIO.new
 
         actual_created_pr = VCR.use_cassette('github_com/create_pr_in_auto_mode_with_push', allow_unused_http_interactions: true) do
-          service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+          service_instance = described_class.new(repository, out: actual_output, git_client:)
           service_instance.execute('Title', 'Description')
         end
 
@@ -188,7 +188,7 @@ describe Geet::Services::CreatePr do
         actual_output = StringIO.new
 
         actual_created_pr = VCR.use_cassette('github_com/create_pr_in_auto_mode_create_upstream', allow_unused_http_interactions: true) do
-          service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+          service_instance = described_class.new(repository, out: actual_output, git_client:)
           service_instance.execute('Title', 'Description')
         end
 
@@ -223,7 +223,7 @@ describe Geet::Services::CreatePr do
 
         allow(repository).to receive(:create_pr).and_return(mock_pr)
 
-        service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+        service_instance = described_class.new(repository, out: actual_output, git_client:)
         service_instance.execute('Title', 'Description', automerge: true)
 
         expect(mock_pr).to have_received(:enable_automerge)
@@ -256,7 +256,7 @@ describe Geet::Services::CreatePr do
 
         allow(repository).to receive(:create_pr).and_return(mock_pr)
 
-        service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+        service_instance = described_class.new(repository, out: actual_output, git_client:)
 
         expect do
           service_instance.execute('Title', 'Description', automerge: true)

data/spec/spec_helper.rb

@@ -4,9 +4,12 @@
 
 require 'vcr'
 require 'base64'
+require 'rspec/sorbet'
 
 require_relative '../lib/geet'
 
+RSpec::Sorbet.allow_doubles!
+
 VCR.configure do |config|
   config.cassette_library_dir = 'spec/vcr_cassettes'
   config.hook_into :webmock

data/spec/unit/github/pr_spec.rb

@@ -0,0 +1,165 @@
+# frozen_string_literal: true
+# typed: false
+
+require 'spec_helper'
+
+require_relative '../../../lib/geet/github/pr'
+require_relative '../../../lib/geet/github/api_interface'
+
+describe Geet::Github::PR do
+  describe '#fetch_available_merge_method' do
+    let(:api_interface) { instance_double(Geet::Github::ApiInterface) }
+    let(:pr_number) { 123 }
+    let(:pr_title) { 'Test PR' }
+    let(:pr_link) { 'https://github.com/owner/repo/pull/123' }
+    let(:node_id) { 'PR_node_id_123' }
+    let(:repository_path) { 'owner/repo' }
+
+    subject { described_class.new(pr_number, api_interface, pr_title, pr_link, node_id: node_id) }
+
+    before do
+      allow(api_interface).to receive(:repository_path).and_return(repository_path)
+    end
+
+    context 'when there is one commit and squash merge is allowed' do
+      it 'returns SQUASH' do
+        graphql_response = {
+          'repository' => {
+            'mergeCommitAllowed' => true,
+            'squashMergeAllowed' => true,
+            'rebaseMergeAllowed' => true,
+            'pullRequest' => {
+              'commits' => {
+                'totalCount' => 1
+              }
+            }
+          }
+        }
+
+        expect(api_interface).to receive(:send_graphql_request)
+          .with(anything, variables: { owner: 'owner', name: 'repo', number: pr_number })
+          .and_return(graphql_response)
+
+        result = subject.send(:fetch_available_merge_method)
+        expect(result).to eq('SQUASH')
+      end
+    end
+
+    context 'when there is one commit but squash merge is not allowed' do
+      it 'returns MERGE if merge commit is allowed' do
+        graphql_response = {
+          'repository' => {
+            'mergeCommitAllowed' => true,
+            'squashMergeAllowed' => false,
+            'rebaseMergeAllowed' => true,
+            'pullRequest' => {
+              'commits' => {
+                'totalCount' => 1
+              }
+            }
+          }
+        }
+
+        expect(api_interface).to receive(:send_graphql_request)
+          .with(anything, variables: { owner: 'owner', name: 'repo', number: pr_number })
+          .and_return(graphql_response)
+
+        result = subject.send(:fetch_available_merge_method)
+        expect(result).to eq('MERGE')
+      end
+    end
+
+    context 'when there are multiple commits and merge commit is allowed' do
+      it 'returns MERGE' do
+        graphql_response = {
+          'repository' => {
+            'mergeCommitAllowed' => true,
+            'squashMergeAllowed' => true,
+            'rebaseMergeAllowed' => true,
+            'pullRequest' => {
+              'commits' => {
+                'totalCount' => 3
+              }
+            }
+          }
+        }
+
+        expect(api_interface).to receive(:send_graphql_request)
+          .with(anything, variables: { owner: 'owner', name: 'repo', number: pr_number })
+          .and_return(graphql_response)
+
+        result = subject.send(:fetch_available_merge_method)
+        expect(result).to eq('MERGE')
+      end
+    end
+
+    context 'when there are multiple commits and merge commit is not allowed' do
+      it 'returns SQUASH if squash merge is allowed' do
+        graphql_response = {
+          'repository' => {
+            'mergeCommitAllowed' => false,
+            'squashMergeAllowed' => true,
+            'rebaseMergeAllowed' => true,
+            'pullRequest' => {
+              'commits' => {
+                'totalCount' => 3
+              }
+            }
+          }
+        }
+
+        expect(api_interface).to receive(:send_graphql_request)
+          .with(anything, variables: { owner: 'owner', name: 'repo', number: pr_number })
+          .and_return(graphql_response)
+
+        result = subject.send(:fetch_available_merge_method)
+        expect(result).to eq('SQUASH')
+      end
+
+      it 'returns REBASE if only rebase merge is allowed' do
+        graphql_response = {
+          'repository' => {
+            'mergeCommitAllowed' => false,
+            'squashMergeAllowed' => false,
+            'rebaseMergeAllowed' => true,
+            'pullRequest' => {
+              'commits' => {
+                'totalCount' => 3
+              }
+            }
+          }
+        }
+
+        expect(api_interface).to receive(:send_graphql_request)
+          .with(anything, variables: { owner: 'owner', name: 'repo', number: pr_number })
+          .and_return(graphql_response)
+
+        result = subject.send(:fetch_available_merge_method)
+        expect(result).to eq('REBASE')
+      end
+    end
+
+    context 'when no merge methods are allowed' do
+      it 'raises an error' do
+        graphql_response = {
+          'repository' => {
+            'mergeCommitAllowed' => false,
+            'squashMergeAllowed' => false,
+            'rebaseMergeAllowed' => false,
+            'pullRequest' => {
+              'commits' => {
+                'totalCount' => 3
+              }
+            }
+          }
+        }
+
+        expect(api_interface).to receive(:send_graphql_request)
+          .with(anything, variables: { owner: 'owner', name: 'repo', number: pr_number })
+          .and_return(graphql_response)
+
+        expect { subject.send(:fetch_available_merge_method) }.to raise_error('No merge methods are allowed on this repository')
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: geet
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Saverio Miroddi
 bindir: bin
 cert_chain: []
-date: 2026-01-14 00:00:00.000000000 Z
+date: 2026-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -259,6 +259,7 @@ files:
 - spec/integration/open_pr_spec.rb
 - spec/integration/open_repo_spec.rb
 - spec/spec_helper.rb
+- spec/unit/github/pr_spec.rb
 - spec/vcr_cassettes/create_gist_private.yml
 - spec/vcr_cassettes/create_gist_public.yml
 - spec/vcr_cassettes/create_issue.yml