vx-service_connector 0.4.11 → 0.4.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/vx/service_connector/model.rb +8 -3
- data/lib/vx/service_connector/version.rb +1 -1
- data/spec/lib/model_spec.rb +29 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 368fb19bb348c6f4eb12c4ad053b0e94dcbb24fe
|
4
|
+
data.tar.gz: 4eade9c653a9990590af1966b593aefe1857aa2b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c9127c96f8379525029dc744a7111fde3dd418f0a68b7073b899f557e8743a59aaf923d61493940255de2e366b4d7d993fea15962790544c78fa227b0e50110d
|
7
|
+
data.tar.gz: e01757a23859a23e55cf1f7f82388ae1eeb4de3d670ec49bfbcabcffd750b7a68bf3ce871d3364a0ccdb70181cf3a6f61619bd9c5a7160d09586c4d2fd3f8407
|
@@ -45,8 +45,9 @@ module Vx
|
|
45
45
|
end
|
46
46
|
|
47
47
|
if restriction.is_a?(Hash)
|
48
|
-
branch_re
|
49
|
-
|
48
|
+
branch_re = restriction[:branch]
|
49
|
+
pr_branch_re = restriction[:pull_requests_filter]
|
50
|
+
pr = restriction[:pull_request]
|
50
51
|
|
51
52
|
if !branch_re && internal_pull_request?
|
52
53
|
return false
|
@@ -60,7 +61,11 @@ module Vx
|
|
60
61
|
end
|
61
62
|
|
62
63
|
if pr && pull_request?
|
63
|
-
|
64
|
+
if !pr_branch_re.nil?
|
65
|
+
return !Regexp.new(pr_branch_re).match(branch).nil?
|
66
|
+
else
|
67
|
+
return true
|
68
|
+
end
|
64
69
|
end
|
65
70
|
|
66
71
|
return false
|
data/spec/lib/model_spec.rb
CHANGED
@@ -94,6 +94,35 @@ describe "(models)" do
|
|
94
94
|
instance(
|
95
95
|
params.merge(internal_pull_request?: true)
|
96
96
|
).to_not be_perform(pull_request: false)
|
97
|
+
|
98
|
+
# allow, pr, pr_branch eq filter
|
99
|
+
instance(
|
100
|
+
params.merge(
|
101
|
+
foreign_pull_request?: true,
|
102
|
+
branch: 'develop'
|
103
|
+
)
|
104
|
+
).to be_perform(pull_requests_filter: "develop", pull_request: true)
|
105
|
+
|
106
|
+
# deny, pr, pr_branch not eq filter
|
107
|
+
instance(
|
108
|
+
params.merge(
|
109
|
+
foreign_pull_request?: true,
|
110
|
+
branch: 'develop'
|
111
|
+
)
|
112
|
+
).to_not be_perform(pull_requests_filter: "test", pull_request: true)
|
113
|
+
|
114
|
+
# deny, push, pr_branch eq filter
|
115
|
+
instance(
|
116
|
+
params.merge(branch: 'develop')
|
117
|
+
).to_not be_perform(pull_requests_filter: "develop", pull_request: true)
|
118
|
+
|
119
|
+
# deny, pr, pr_branch eq filter, but pr not checked
|
120
|
+
instance(
|
121
|
+
params.merge(
|
122
|
+
foreign_pull_request?: true,
|
123
|
+
branch: 'develop'
|
124
|
+
)
|
125
|
+
).to_not be_perform(pull_requests_filter: "test", pull_request: false)
|
97
126
|
end
|
98
127
|
|
99
128
|
it "unknown restriction" do
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vx-service_connector
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.12
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dmitry Galinsky
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-11-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: octokit
|