Skip to content

Commit 71c8dfe

Browse files
author
Ryan Baxter
committed
Removed git hooks
1 parent ac0deeb commit 71c8dfe

File tree

13 files changed

+5
-657
lines changed

13 files changed

+5
-657
lines changed

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryIntegrationTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,14 @@ public void nestedWithApplicationPlaceholders() throws IOException {
223223
public void verifyPropertySourceOrdering() throws IOException {
224224
String uri = ConfigServerTestUtils.prepareLocalRepo("ordering-repo");
225225
this.context = new SpringApplicationBuilder(TestConfiguration.class).web(WebApplicationType.NONE)
226-
.run("--spring.cloud.config.server.git.uri=" + uri,
227-
"--spring.cloud.config.server.git.searchPaths=**");
226+
.run("--spring.cloud.config.server.git.uri=" + uri, "--spring.cloud.config.server.git.searchPaths=**");
228227
EnvironmentRepository repository = this.context.getBean(EnvironmentRepository.class);
229228
Environment environment = repository.findOne("application", "test", "master");
230229
assertThat(environment.getPropertySources().size()).isEqualTo(2);
231-
assertThat(environment.getPropertySources().get(0).getName()).isEqualTo("file:././target/repos/ordering-repo//project/sub/application-test.yml");
232-
assertThat(environment.getPropertySources().get(1).getName()).isEqualTo("file:././target/repos/ordering-repo//project/application.yml");
230+
assertThat(environment.getPropertySources().get(0).getName())
231+
.isEqualTo("file:././target/repos/ordering-repo//project/sub/application-test.yml");
232+
assertThat(environment.getPropertySources().get(1).getName())
233+
.isEqualTo("file:././target/repos/ordering-repo//project/application.yml");
233234
}
234235

235236
@Test

spring-cloud-config-server/src/test/resources/ordering-repo/git/hooks/applypatch-msg.sample

Lines changed: 0 additions & 15 deletions
This file was deleted.

spring-cloud-config-server/src/test/resources/ordering-repo/git/hooks/commit-msg.sample

Lines changed: 0 additions & 24 deletions
This file was deleted.

spring-cloud-config-server/src/test/resources/ordering-repo/git/hooks/fsmonitor-watchman.sample

Lines changed: 0 additions & 114 deletions
This file was deleted.

spring-cloud-config-server/src/test/resources/ordering-repo/git/hooks/post-update.sample

Lines changed: 0 additions & 8 deletions
This file was deleted.

spring-cloud-config-server/src/test/resources/ordering-repo/git/hooks/pre-applypatch.sample

Lines changed: 0 additions & 14 deletions
This file was deleted.

spring-cloud-config-server/src/test/resources/ordering-repo/git/hooks/pre-commit.sample

Lines changed: 0 additions & 49 deletions
This file was deleted.

spring-cloud-config-server/src/test/resources/ordering-repo/git/hooks/pre-merge-commit.sample

Lines changed: 0 additions & 13 deletions
This file was deleted.

spring-cloud-config-server/src/test/resources/ordering-repo/git/hooks/pre-push.sample

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)