danger-gitlab_reviewbot 1.1.8 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a7eaa5cd15e0c7c399b577b76461cf7eb3580b1d1350bcc0175c5126784fc1c
-  data.tar.gz: 17c5294182aad19fb6d68dcf6858ab313a1ed140a53acffa6ef815abdb4b5a48
+  metadata.gz: 0b07048b00ab79e2a4fe6497f1559c00925da2b216240b5180eb5f9e9ac92189
+  data.tar.gz: c0a83a3f273f8b98796a41039f4502307ae9fdd698630745233f7e08a459124a
 SHA512:
-  metadata.gz: b66136604fadac6c2d49a53739b5435a40a3634a269683d68af032a0bd5475a8070f3a6f8a49801bc537a167c4f3b5955fd97fa464ea9349c268056612526708
-  data.tar.gz: 776cc841222ceb2f057aa7c9bc4fda90b3dff2fddfa602c4863e036f71ab6af098a1a22b0606dda00a829d98edcd7da77d02bf68b4c3ab9adc299489d0471f4a
+  metadata.gz: 1576186ee3d22820f48734093708df1f10ef1b2fcd28899ee82f7f648cc08142aedff7acad11c893847d69098ac014d7367c91aaee6b84e801a96647cc89acea
+  data.tar.gz: 9222d55514970d4dc4d5595d8523f1a8c076ebddb273d2e969f37b254d040bee2ca0350669a9a52272be20d8210d43633794f00f51b7a5c5eaac2af718d36c7c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-gitlab_reviewbot (1.1.7)
+    danger-gitlab_reviewbot (1.2.0)
       danger-gitlab
       danger-plugin-api (~> 1.0)
 
@@ -100,7 +100,7 @@ GEM
       method_source (~> 0.9.0)
     pry-nav (0.3.0)
       pry (>= 0.9.10, < 0.13.0)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (13.0.1)
     rb-fsevent (0.10.4)

data/lib/gitlab_reviewbot/gem_version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitlabReviewbot
-  VERSION = "1.1.8"
+  VERSION = "1.2.1"
 end

data/lib/gitlab_reviewbot/gitlab.rb

@@ -26,7 +26,7 @@ module Gitlab
 
     def users_with_pending_mr_review(project_id)
       outstanding_mrs = fetch_mrs_requiring_review(project_id)
-      all_assignees = outstanding_mrs.reduce([]) { |acc, mr| acc + mr.assignees - assignees_with_review(project_id, mr.id, mr.assignees)}
+      all_assignees = outstanding_mrs.reduce([]) { |acc, mr| acc + mr.reviewers - assignees_with_review(project_id, mr.iid, mr.reviewers)}
       assignees_id_map = all_assignees.each_with_object({}) do |a, acc|
         aid = a["id"]
         ausername = a["username"]
@@ -53,7 +53,7 @@ module Gitlab
 
     def assign_mr_to_users(project_id, mr_iid, users)
       user_ids = users.map(&:id)
-      @client.update_merge_request(project_id, mr_iid, "assignee_ids" => user_ids)
+      @client.update_merge_request(project_id, mr_iid, "reviewer_ids" => user_ids)
 
     end
 
@@ -67,7 +67,7 @@ module Gitlab
     end
 
     def fetch_mr_reviewers(project_id, mr_iid)
-      @client.merge_request(project_id, mr_iid).assignees.map { |u| User.new(u["id"], u["username"]) }
+      @client.merge_request(project_id, mr_iid).reviewers.map { |u| User.new(u["id"], u["username"]) }
     end
 
     private
@@ -99,8 +99,8 @@ module Gitlab
     end
 
     def method_missing(method, *args)
-      if @client_helper.respond_to?(method)
-        @client_helper.send(method, *args)
+      if client_helper.respond_to?(method)
+        client_helper.send(method, *args)
       else
         super
       end

data/spec/gitlab_ext_spec.rb

@@ -16,22 +16,22 @@ module Danger
       @sam = Gitlab::User.new(1, "Sam")
       @tom = Gitlab::User.new(2, "Tom")
       @nic = Gitlab::User.new(3, "Nic")
-      @assignees = [{'id' => 1, 'username' => "Sam"},
+      @reviewers = [{'id' => 1, 'username' => "Sam"},
                     {'id' => 2, 'username' => "Tom"},
                     {'id' => 3, 'username' => "Nic"}]
     end
 
     it "Correctly calculates users with pending reviews" do
-      already_reviewed = [@assignees[0]]
+      already_reviewed = [@reviewers[0]]
 
-      allow(@mock_client).to receive(:merge_requests).with(10, {:per_page=>"100", :state=>"opened"}).and_return([Gitlab::ObjectifiedHash.new({'id' => 110, 'assignees' => @assignees})])
+      allow(@mock_client).to receive(:merge_requests).with(10, {:per_page=>"100", :state=>"opened"}).and_return([Gitlab::ObjectifiedHash.new({'iid' => 110, 'reviewers' => @reviewers})])
       allow(@mock_client).to receive(:merge_request_approval_state).with(10, 110).and_return(Gitlab::ObjectifiedHash.new({'rules' => [{'approved_by' => already_reviewed}]}))
 
       expect(@client_helper.users_with_pending_mr_review(10)).to be == [@tom, @nic]
     end
 
     it "Correctly calculates users with pending reviews (multi rule)" do
-      allow(@mock_client).to receive(:merge_requests).with(10, {:per_page=>"100", :state=>"opened"}).and_return([Gitlab::ObjectifiedHash.new({'id' => 110, 'assignees' => @assignees})])
+      allow(@mock_client).to receive(:merge_requests).with(10, {:per_page=>"100", :state=>"opened"}).and_return([Gitlab::ObjectifiedHash.new({'iid' => 110, 'reviewers' => @reviewers})])
       allow(@mock_client).to receive(:merge_request_approval_state).with(10, 110).and_return(Gitlab::ObjectifiedHash.new({'rules' => [{'approved_by' => [{'id' => 1, 'username' => "Sam"}]}, {'approved_by' => [{'id' => 2, 'username' => "Tom"}]}]}))
 
       expect(@client_helper.users_with_pending_mr_review(10)).to be == [@nic]
@@ -43,7 +43,7 @@ module Danger
       inactive_users = [Gitlab::ObjectifiedHash.new({'id' => 3, 'username' => 'OldSam', 'state' => 'inactive', 'access_level' => 30})]
       non_developer_users = [Gitlab::ObjectifiedHash.new({'id' => 4, 'username' => 'Reporter', 'state' => 'active', 'access_level' => 20})]
       allow(@mock_client).to receive(:group_search).with("mygroup").and_return([Gitlab::ObjectifiedHash.new({'id' => 10, 'full_path' => "mygroup"})])
-      allow(@mock_client).to receive(:group_members).with(10).and_return(active_users + inactive_users + non_developer_users)
+      allow(@mock_client).to receive(:group_members).with(10, {:per_page=>100}).and_return(active_users + inactive_users + non_developer_users)
       expect(@client_helper.fetch_users_for_group("mygroup")).to be == [@sam, @tom]
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-gitlab_reviewbot
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.1
 platform: ruby
 authors:
 - Fabio Gallonetto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api