SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the build and docs

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-05-08 13:13:37 +02:00
parent 45a284dc45
commit be83591547
9 changed files with 923 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-release-tools-core/pom.xml
View File

@@ -89,7 +89,7 @@
<dependency>
<groupId>com.jcabi</groupId>
<artifactId>jcabi-github</artifactId>
<version>0.23</version>
<version>${jcabi-github.version}</version>
</dependency>
<dependency>
<groupId>com.github.jknack</groupId>
@@ -111,6 +111,12 @@
<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>3.1.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>sagan</groupId>

7
spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/git/GithubIssuesTests.java
View File

@@ -19,12 +19,11 @@ package org.springframework.cloud.release.internal.git;
import java.io.IOException;
import java.util.Collections;
import javax.json.Json;
import com.jcabi.github.Coordinates;
import com.jcabi.github.Github;
import com.jcabi.github.Issue;
import com.jcabi.github.Repo;
import com.jcabi.github.Repos;
import com.jcabi.github.mock.MkGithub;
import org.junit.Before;
import org.junit.Rule;
@@ -123,8 +122,8 @@ public class GithubIssuesTests {
}
private Repo createGettingStartedGuides(MkGithub github) throws IOException {
return github.repos().create(
Json.createObjectBuilder().add("name", "getting-started-guides").build());
return github.repos()
.create(new Repos.RepoCreate("getting-started-guides", false));
}
private ProjectVersion nonGaSleuthProject() {

6
spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/git/GithubMilestonesTests.java
View File

@@ -19,10 +19,9 @@ package org.springframework.cloud.release.internal.git;
import java.io.IOException;
import java.net.URL;
import javax.json.Json;
import com.jcabi.github.Milestone;
import com.jcabi.github.Repo;
import com.jcabi.github.Repos;
import com.jcabi.github.mock.MkGithub;
import org.junit.Before;
import org.junit.Rule;
@@ -254,8 +253,7 @@ public class GithubMilestonesTests {
}
private Repo createSleuthRepo(MkGithub github) throws IOException {
return github.repos().create(
Json.createObjectBuilder().add("name", "spring-cloud-sleuth").build());
return github.repos().create(new Repos.RepoCreate("spring-cloud-sleuth", false));
}
@Test

10
spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/post/PostReleaseActionsTests.java
View File

@@ -26,10 +26,10 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.maven.model.Model;
import org.assertj.core.api.BDDAssertions;
import org.awaitility.Awaitility;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.revwalk.RevCommit;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -312,7 +312,6 @@ public class PostReleaseActionsTests {
}
@Test
@Ignore
public void should_build_and_deploy_guides_when_switch_is_on() throws Exception {
this.properties.getGit().setUpdateSpringGuides(true);
String projects = this.temporaryFolder.getAbsolutePath();
@@ -336,8 +335,11 @@ public class PostReleaseActionsTests {
actions.deployGuides(Collections
.singletonList(new ProcessedProject(this.properties, projectVersion)));
BDDAssertions.then(projectBuilderStub.get()).isNotNull();
BDDMockito.then(projectBuilderStub.get()).should().deployGuides(projectVersion);
Awaitility.await().untilAsserted(() -> {
BDDAssertions.then(projectBuilderStub.get()).isNotNull();
BDDMockito.then(projectBuilderStub.get()).should()
.deployGuides(projectVersion);
});
}
private String sleuthParentPomVersion() {