Add possibility to delete branch Model Condition #70
Conversation
Conflicts: src/test/java/com/cdancy/bitbucket/rest/features/BranchApiMockTest.java
…o branchModel-list # Conflicts: # src/main/java/com/cdancy/bitbucket/rest/fallbacks/BitbucketFallbacks.java
# Conflicts: # src/test/java/com/cdancy/bitbucket/rest/features/BranchApiLiveTest.java
# Conflicts: # src/test/java/com/cdancy/bitbucket/rest/features/BranchApiLiveTest.java
# Conflicts: # src/test/java/com/cdancy/bitbucket/rest/features/BranchApiLiveTest.java
…o branchModel-Update # Conflicts: # src/main/java/com/cdancy/bitbucket/rest/features/BranchApi.java # src/test/java/com/cdancy/bitbucket/rest/features/BranchApiLiveTest.java # src/test/java/com/cdancy/bitbucket/rest/features/BranchApiMockTest.java
|
Rebase off of master to resolve conflicts? |
| BranchModelConfiguration branchModelConfiguration = api().updateModelConfiguration(projectKey, repoKey, configuration); | ||
| assertThat(branchModelConfiguration).isNotNull(); | ||
| assertThat(branchModelConfiguration.errors().isEmpty()).isTrue(); | ||
| assertThat(branchModelConfiguration.development().refId()).isNotNull(); |
There was a problem hiding this comment.
Removed this check in master as it was null for me on my version of Bitbucket.
| } | ||
|
|
||
| private void checkDefaultBranchConfiguration() { | ||
| assertThat(branchModelConfiguration).isNotNull(); | ||
| assertThat(branchModelConfiguration.errors().isEmpty()).isTrue(); | ||
| assertThat(branchModelConfiguration.development().refId()).isNotNull(); |
There was a problem hiding this comment.
Removed this check as well as it was null for me.
| @Path("/branch-utils/{jclouds.api-version}/projects/{project}/repos/{repo}/branchmodel/configuration") | ||
| @Fallback(BitbucketFallbacks.FalseOnError.class) | ||
| @DELETE | ||
| boolean deleteModelConfiguration(@PathParam("project") String project, |
There was a problem hiding this comment.
@documentation annotation for this? Searched online and couldn't find anything
There was a problem hiding this comment.
Yup, this endpoint isn't in documentation.
There was a problem hiding this comment.
@j0nathan33 can you add the Documentation annotation and use that jira ISSUE?
There was a problem hiding this comment.
ok, I will do it.
…o branchModel-delete # Conflicts: # src/main/java/com/cdancy/bitbucket/rest/features/BranchApi.java # src/test/java/com/cdancy/bitbucket/rest/features/BranchApiLiveTest.java # src/test/java/com/cdancy/bitbucket/rest/features/BranchApiMockTest.java
.gitattributes
Outdated
| @@ -1,6 +1,6 @@ | |||
| # Handle line endings automatically for files detected as text | |||
| # and leave all files detected as binary untouched. | |||
| * text=auto | |||
| * text=lf | |||
There was a problem hiding this comment.
Can we back this out and open a separate PR for it if you truly want to change it?
There was a problem hiding this comment.
Ok, I will do it
This reverts commit 83bc6b0.
|
@j0nathan33 merged this PR with various fixes to account for proper integration test support now working OOTB. For future PR's, and assuming you have a bitbucket instance, simply running |
No description provided.