fbe 0.0.57 → 0.0.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed6340a5cdc2dc6fa780e0548d52da19dd8700d770179b7af7b0ea93d743d0c0
-  data.tar.gz: 02c2c48dca7e2b75c52e188f2796c7ed6f61d2509f8ccb0956c2b918dfe5b674
+  metadata.gz: dcb7a83f13eadb9bd57bd7a4741709a4b41622109f64e716ffabe98df60f2e7e
+  data.tar.gz: b854b1108dc729e24cee35970cefc92387c4e44c0a171c3991a162a819e7e256
 SHA512:
-  metadata.gz: 8f26b5f1447c4addf6892de639fe665d18d3cfd6089c209dce5986d5caa45efca71902b69e33bdafdbc705945359e94d538bc331ccb9f2c92e93b843bc4792c2
-  data.tar.gz: 76e0740eaed590150154c16ddc42b41c32360951dae668b8fb2c8c28d6d81050764012ab4ef2bdf40ba5abea158c0df4b6dade1b924680cbc9190068869f0296
+  metadata.gz: 95584b9296deb9707f364d29b8351505f70e12273c3df3794704535febd965a18f0777318ec8d445a51bcc2309453820094039354e1d3dc3f82aa50635f81b1c
+  data.tar.gz: a2893b12fef6a7f24ffda4ac0152c08500ac58a9ac27e6bc9e32ae3ba329b7b8f781dbfae7514bd6ade9b0c9fff38ac109706f1e2a6d8a67b7631b8a6a1be020

data/lib/fbe/github_graph.rb

@@ -82,7 +82,9 @@ class Fbe::Graph
         }
       GRAPHQL
     )
-    result.repository.pull_request.review_threads.to_h['nodes']
+    result&.to_h&.dig('repository', 'pullRequest', 'reviewThreads', 'nodes')&.select do |thread|
+      thread['isResolved']
+    end || []
   end
 
   def total_commits(owner, name, branch)
@@ -124,29 +126,38 @@ class Fbe::Graph
       {}
     end
 
-    def resolved_conversations(_owner, _name, _number)
-      [
-        {
-          'id' => 'PRRT_kwDOK2_4A85BHZAR',
-          'isResolved' => true,
-          'comments' => {
-            'nodes' => [
-              {
-                'id' => 'PRRC_kwDOK2_4A85l3obO',
-                'body' => 'first message',
-                'author' => { '__typename' => 'User', 'login' => 'reviewer' },
-                'createdAt' => '2024-08-08T09:41:46Z'
-              },
-              {
-                'id' => 'PRRC_kwDOK2_4A85l3yTp',
-                'body' => 'second message',
-                'author' => { '__typename' => 'User', 'login' => 'programmer' },
-                'createdAt' => '2024-08-08T10:01:55Z'
-              }
-            ]
-          }
+    def resolved_conversations(owner, name, _number)
+      data = {
+        zerocracy_baza: [
+          conversation('PRRT_kwDOK2_4A85BHZAR')
+        ]
+      }
+      data[:"#{owner}_#{name}"] || []
+    end
+
+    private
+
+    def conversation(id)
+      {
+        'id' => id,
+        'isResolved' => true,
+        'comments' => {
+          'nodes' => [
+            {
+              'id' => 'PRRC_kwDOK2_4A85l3obO',
+              'body' => 'first message',
+              'author' => { '__typename' => 'User', 'login' => 'reviewer' },
+              'createdAt' => '2024-08-08T09:41:46Z'
+            },
+            {
+              'id' => 'PRRC_kwDOK2_4A85l3yTp',
+              'body' => 'second message',
+              'author' => { '__typename' => 'User', 'login' => 'programmer' },
+              'createdAt' => '2024-08-08T10:01:55Z'
+            }
+          ]
         }
-      ]
+      }
     end
   end
 end

data/lib/fbe/octo.rb

@@ -522,7 +522,10 @@ class Fbe::FakeOctokit
                 node_id: 'R_kgDOK2_4Aw',
                 name: 'baza',
                 full_name: 'zerocracy/baza',
-                private: false
+                private: false,
+                owner: {
+                  login: 'zerocracy'
+                }
               }
             },
             head: {

data/lib/fbe.rb

@@ -27,5 +27,5 @@
 # License:: MIT
 module Fbe
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.0.57'
+  VERSION = '0.0.59'
 end

data/test/fbe/test_github_graph.rb

@@ -80,6 +80,23 @@ class TestGitHubGraph < Minitest::Test
     g = Fbe.github_graph(options:, loog: Loog::NULL, global:)
     result = g.resolved_conversations('zerocracy', 'baza', 172)
     assert_equal(1, result.count)
+    result = g.resolved_conversations('zerocracy', 'baza', 0)
+    assert(Array, result.class)
+    assert(0, result.count)
+    result = g.resolved_conversations('zerocracy1', 'baza', 0)
+    assert(Array, result.class)
+    assert(0, result.count)
+    result = g.resolved_conversations('zerocracy', 'baza1', 0)
+    assert(Array, result.class)
+    assert(0, result.count)
+  end
+
+  def test_does_not_count_unresolved_conversations
+    skip # it's a "live" test, run it manually if you need it
+    WebMock.allow_net_connect!
+    g = Fbe.github_graph(options: Judges::Options.new, loog: Loog::NULL, global: {})
+    result = g.resolved_conversations('zerocracy', 'judges-action', 296)
+    assert_equal(0, result.count)
   end
 
   def test_gets_total_commits_of_repo
@@ -91,4 +108,18 @@ class TestGitHubGraph < Minitest::Test
     result = g.total_commits('zerocracy', 'baza', 'master')
     assert(result.positive?)
   end
+
+  def test_get_fake_empty_conversations
+    WebMock.disable_net_connect!
+    graph = Fbe.github_graph(options: Judges::Options.new('testing' => true), loog: Loog::NULL, global: {})
+    result = graph.resolved_conversations(nil, 'baza', 172)
+    assert(result.empty?)
+  end
+
+  def test_get_fake_conversations
+    WebMock.disable_net_connect!
+    graph = Fbe.github_graph(options: Judges::Options.new('testing' => true), loog: Loog::NULL, global: {})
+    result = graph.resolved_conversations('zerocracy', 'baza', 172)
+    assert_equal(1, result.count)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.0.57
+  version: 0.0.59
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-19 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace