Skip to content
This repository was archived by the owner on Jun 9, 2021. It is now read-only.

Commit 5c6a81b

Browse files
committed
Avoiding error in Eclipse
1 parent 3f63db7 commit 5c6a81b

File tree

2 files changed

+47
-11
lines changed

2 files changed

+47
-11
lines changed

CHANGELOG.md

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,39 @@
33
Changelog of Pull Request Notifier for Bitbucket.
44

55
## Unreleased
6+
### GitHub [#220](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/220) Feature: add PREVIOUS_FROM_HASH and PREVIOUS_TO_HASH to variables
7+
PREVIOUS_FROM_HASH and PREVIOUS_TO_HASH
8+
9+
[085e0959e0b2f5a](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/085e0959e0b2f5a) Tomas Bjerre *2017-06-02 07:10:20*
10+
11+
### GitHub [#221](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/221) "You are not permitted to access this resource" after upgrade from Stash(v3) to Bitbucket(v4)
12+
Checking if canMerge with escalated (ADMIN) permission
13+
14+
[835b214f1b6d59c](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/835b214f1b6d59c) Tomas Bjerre *2017-06-02 06:45:05*
15+
616
### No issue
17+
Avoiding error in Eclipse
18+
19+
[3a64aa749946f0a](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/3a64aa749946f0a) Tomas Bjerre *2017-06-02 06:04:43*
20+
21+
Fix typo
22+
23+
[7e9306755d0f9f4](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/7e9306755d0f9f4) J.T. Conklin *2017-05-18 15:18:35*
24+
25+
## 3.0
26+
### GitHub [#215](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/215) Bitbucket Server 5.0 support
27+
Bitbucket Server 5.0
28+
29+
[37aed01e288ac56](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/37aed01e288ac56) Tomas Bjerre *2017-05-13 12:18:26*
30+
31+
### No issue
32+
Updating install script
33+
34+
[3f63db715413e9b](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/3f63db715413e9b) Tomas Bjerre *2017-05-13 09:01:49*
35+
736
doc
837

9-
[c5a68b3c849098f](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/c5a68b3c849098f) Tomas Bjerre *2017-04-21 14:46:49*
38+
[1b211572d28559a](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/1b211572d28559a) Tomas Bjerre *2017-04-21 16:49:33*
1039

1140
## 2.62
1241
### GitHub [#211](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/211) https proxy settings

src/test/java/se/bjurr/prnfb/listener/PrnfbPullRequestEventListenerTest.java

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,28 @@
2929
import org.mockito.invocation.InvocationOnMock;
3030
import org.mockito.stubbing.Answer;
3131

32-
import com.atlassian.bitbucket.event.pull.PullRequestCommentAddedEvent;
33-
import com.atlassian.bitbucket.event.pull.PullRequestEvent;
34-
import com.atlassian.bitbucket.project.Project;
35-
import com.atlassian.bitbucket.pull.PullRequest;
36-
import com.atlassian.bitbucket.pull.PullRequestRef;
37-
import com.atlassian.bitbucket.pull.PullRequestService;
38-
import com.atlassian.bitbucket.repository.Repository;
39-
import com.google.common.base.Function;
40-
4132
import se.bjurr.prnfb.http.ClientKeyStore;
4233
import se.bjurr.prnfb.http.HttpResponse;
4334
import se.bjurr.prnfb.http.Invoker;
4435
import se.bjurr.prnfb.http.UrlInvoker;
4536
import se.bjurr.prnfb.service.PrnfbRenderer;
4637
import se.bjurr.prnfb.service.PrnfbRendererFactory;
4738
import se.bjurr.prnfb.service.SettingsService;
39+
import se.bjurr.prnfb.service.VariablesContext;
4840
import se.bjurr.prnfb.settings.PrnfbNotification;
4941
import se.bjurr.prnfb.settings.PrnfbSettingsData;
5042
import se.bjurr.prnfb.settings.ValidationException;
5143

44+
import com.atlassian.bitbucket.event.pull.PullRequestCommentAddedEvent;
45+
import com.atlassian.bitbucket.event.pull.PullRequestEvent;
46+
import com.atlassian.bitbucket.project.Project;
47+
import com.atlassian.bitbucket.pull.PullRequest;
48+
import com.atlassian.bitbucket.pull.PullRequestRef;
49+
import com.atlassian.bitbucket.pull.PullRequestService;
50+
import com.atlassian.bitbucket.repository.Repository;
51+
import com.atlassian.bitbucket.user.ApplicationUser;
52+
import com.google.common.base.Function;
53+
5254
public class PrnfbPullRequestEventListenerTest {
5355

5456
private final ClientKeyStore clientKeyStore = null;
@@ -144,7 +146,12 @@ public HttpResponse invoke(UrlInvoker urlInvoker) {
144146
when(settingsService.getNotifications()) //
145147
.thenReturn(notifications);
146148

147-
when(prnfbRendererFactory.create(any(), any(), any(), any(), any())) //
149+
when(prnfbRendererFactory.create(
150+
any(PullRequest.class),
151+
any(PrnfbPullRequestAction.class),
152+
any(PrnfbNotification.class),
153+
any(VariablesContext.class),
154+
any(ApplicationUser.class))) //
148155
.thenReturn(renderer);
149156
when(renderer.render(any(), any(), any(), any())) //
150157
.thenAnswer(

0 commit comments

Comments
 (0)