danger-gitlab_reviewbot 1.1.8 → 1.2.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +2 -2
- data/lib/gitlab_reviewbot/gem_version.rb +1 -1
- data/lib/gitlab_reviewbot/gitlab.rb +5 -5
- data/spec/gitlab_ext_spec.rb +5 -5
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0b07048b00ab79e2a4fe6497f1559c00925da2b216240b5180eb5f9e9ac92189
|
4
|
+
data.tar.gz: c0a83a3f273f8b98796a41039f4502307ae9fdd698630745233f7e08a459124a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1576186ee3d22820f48734093708df1f10ef1b2fcd28899ee82f7f648cc08142aedff7acad11c893847d69098ac014d7367c91aaee6b84e801a96647cc89acea
|
7
|
+
data.tar.gz: 9222d55514970d4dc4d5595d8523f1a8c076ebddb273d2e969f37b254d040bee2ca0350669a9a52272be20d8210d43633794f00f51b7a5c5eaac2af718d36c7c
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
danger-gitlab_reviewbot (1.
|
4
|
+
danger-gitlab_reviewbot (1.2.0)
|
5
5
|
danger-gitlab
|
6
6
|
danger-plugin-api (~> 1.0)
|
7
7
|
|
@@ -100,7 +100,7 @@ GEM
|
|
100
100
|
method_source (~> 0.9.0)
|
101
101
|
pry-nav (0.3.0)
|
102
102
|
pry (>= 0.9.10, < 0.13.0)
|
103
|
-
public_suffix (4.0.
|
103
|
+
public_suffix (4.0.6)
|
104
104
|
rainbow (3.0.0)
|
105
105
|
rake (13.0.1)
|
106
106
|
rb-fsevent (0.10.4)
|
@@ -26,7 +26,7 @@ module Gitlab
|
|
26
26
|
|
27
27
|
def users_with_pending_mr_review(project_id)
|
28
28
|
outstanding_mrs = fetch_mrs_requiring_review(project_id)
|
29
|
-
all_assignees = outstanding_mrs.reduce([]) { |acc, mr| acc + mr.
|
29
|
+
all_assignees = outstanding_mrs.reduce([]) { |acc, mr| acc + mr.reviewers - assignees_with_review(project_id, mr.iid, mr.reviewers)}
|
30
30
|
assignees_id_map = all_assignees.each_with_object({}) do |a, acc|
|
31
31
|
aid = a["id"]
|
32
32
|
ausername = a["username"]
|
@@ -53,7 +53,7 @@ module Gitlab
|
|
53
53
|
|
54
54
|
def assign_mr_to_users(project_id, mr_iid, users)
|
55
55
|
user_ids = users.map(&:id)
|
56
|
-
@client.update_merge_request(project_id, mr_iid, "
|
56
|
+
@client.update_merge_request(project_id, mr_iid, "reviewer_ids" => user_ids)
|
57
57
|
|
58
58
|
end
|
59
59
|
|
@@ -67,7 +67,7 @@ module Gitlab
|
|
67
67
|
end
|
68
68
|
|
69
69
|
def fetch_mr_reviewers(project_id, mr_iid)
|
70
|
-
@client.merge_request(project_id, mr_iid).
|
70
|
+
@client.merge_request(project_id, mr_iid).reviewers.map { |u| User.new(u["id"], u["username"]) }
|
71
71
|
end
|
72
72
|
|
73
73
|
private
|
@@ -99,8 +99,8 @@ module Gitlab
|
|
99
99
|
end
|
100
100
|
|
101
101
|
def method_missing(method, *args)
|
102
|
-
if
|
103
|
-
|
102
|
+
if client_helper.respond_to?(method)
|
103
|
+
client_helper.send(method, *args)
|
104
104
|
else
|
105
105
|
super
|
106
106
|
end
|
data/spec/gitlab_ext_spec.rb
CHANGED
@@ -16,22 +16,22 @@ module Danger
|
|
16
16
|
@sam = Gitlab::User.new(1, "Sam")
|
17
17
|
@tom = Gitlab::User.new(2, "Tom")
|
18
18
|
@nic = Gitlab::User.new(3, "Nic")
|
19
|
-
@
|
19
|
+
@reviewers = [{'id' => 1, 'username' => "Sam"},
|
20
20
|
{'id' => 2, 'username' => "Tom"},
|
21
21
|
{'id' => 3, 'username' => "Nic"}]
|
22
22
|
end
|
23
23
|
|
24
24
|
it "Correctly calculates users with pending reviews" do
|
25
|
-
already_reviewed = [@
|
25
|
+
already_reviewed = [@reviewers[0]]
|
26
26
|
|
27
|
-
allow(@mock_client).to receive(:merge_requests).with(10, {:per_page=>"100", :state=>"opened"}).and_return([Gitlab::ObjectifiedHash.new({'
|
27
|
+
allow(@mock_client).to receive(:merge_requests).with(10, {:per_page=>"100", :state=>"opened"}).and_return([Gitlab::ObjectifiedHash.new({'iid' => 110, 'reviewers' => @reviewers})])
|
28
28
|
allow(@mock_client).to receive(:merge_request_approval_state).with(10, 110).and_return(Gitlab::ObjectifiedHash.new({'rules' => [{'approved_by' => already_reviewed}]}))
|
29
29
|
|
30
30
|
expect(@client_helper.users_with_pending_mr_review(10)).to be == [@tom, @nic]
|
31
31
|
end
|
32
32
|
|
33
33
|
it "Correctly calculates users with pending reviews (multi rule)" do
|
34
|
-
allow(@mock_client).to receive(:merge_requests).with(10, {:per_page=>"100", :state=>"opened"}).and_return([Gitlab::ObjectifiedHash.new({'
|
34
|
+
allow(@mock_client).to receive(:merge_requests).with(10, {:per_page=>"100", :state=>"opened"}).and_return([Gitlab::ObjectifiedHash.new({'iid' => 110, 'reviewers' => @reviewers})])
|
35
35
|
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"}]}]}))
|
36
36
|
|
37
37
|
expect(@client_helper.users_with_pending_mr_review(10)).to be == [@nic]
|
@@ -43,7 +43,7 @@ module Danger
|
|
43
43
|
inactive_users = [Gitlab::ObjectifiedHash.new({'id' => 3, 'username' => 'OldSam', 'state' => 'inactive', 'access_level' => 30})]
|
44
44
|
non_developer_users = [Gitlab::ObjectifiedHash.new({'id' => 4, 'username' => 'Reporter', 'state' => 'active', 'access_level' => 20})]
|
45
45
|
allow(@mock_client).to receive(:group_search).with("mygroup").and_return([Gitlab::ObjectifiedHash.new({'id' => 10, 'full_path' => "mygroup"})])
|
46
|
-
allow(@mock_client).to receive(:group_members).with(10).and_return(active_users + inactive_users + non_developer_users)
|
46
|
+
allow(@mock_client).to receive(:group_members).with(10, {:per_page=>100}).and_return(active_users + inactive_users + non_developer_users)
|
47
47
|
expect(@client_helper.fetch_users_for_group("mygroup")).to be == [@sam, @tom]
|
48
48
|
end
|
49
49
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: danger-gitlab_reviewbot
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1
|
4
|
+
version: 1.2.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Fabio Gallonetto
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-09-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: danger-plugin-api
|