Skip to content

Commit

Permalink
Merge pull request #125 from gnandiga/bug/116-Add-ShallowClone-Capabi…
Browse files Browse the repository at this point in the history
…lity

#116: Added shallow clone capability for large git projects
  • Loading branch information
ashwanthkumar committed Aug 22, 2018
2 parents 492af8c + fe87926 commit e7c819f
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,9 @@ GitConfig getGitConfig(Map<String, String> configuration) {
configuration.get("url"),
configuration.get("username"),
configuration.get("password"),
StringUtils.trimToNull(configuration.get("defaultBranch")));
StringUtils.trimToNull(configuration.get("defaultBranch")),
true,
Boolean.parseBoolean(configuration.get("shallowClone")));
provider.addConfigData(gitConfig);
return gitConfig;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public Map<String, Object> fields() {
response.put("username", FieldFactory.createForScm("Username", null, false, false, false, "1"));
response.put("password", FieldFactory.createForScm("Password", null, false, false, true, "2"));
response.put("defaultBranch", FieldFactory.createForScm("Default Branch", "master", false, false, false, "3"));
response.put("shallowClone", FieldFactory.createForScm("Default Clone Behaviour", "false", false, false, false, "4"));
return response;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public void shouldBuildGitConfig() {
configuration.put("url", "url");
configuration.put("username", "config-username");
configuration.put("password", "config-password");
configuration.put("shallowClone", "true");

GitHubPRBuildPlugin plugin = new GitHubPRBuildPlugin();
plugin.setProvider(new GitHubProvider());
Expand All @@ -81,15 +82,18 @@ public void shouldBuildGitConfig() {
assertThat(gitConfig.getUrl(), is("url"));
assertThat(gitConfig.getUsername(), is("config-username"));
assertThat(gitConfig.getPassword(), is("config-password"));
assertThat(gitConfig.isShallowClone(), is(true));

configuration.remove("username");
configuration.remove("password");
configuration.remove("shallowClone");

gitConfig = plugin.getGitConfig(configuration);

assertThat(gitConfig.getUrl(), is("url"));
assertThat(gitConfig.getUsername(), is(usernameProperty));
assertThat(gitConfig.getPassword(), is(passwordProperty));
assertThat(gitConfig.isShallowClone(), is(false));
}

@Ignore("url validation is turned off")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ public void shouldReturnCorrectScmSettingsFields() throws Exception {
PluginConfigurationView scmConfigurationView = getScmView();

assertThat(scmConfigurationView.fields().keySet(),
hasItems("url", "username", "password", "defaultBranch")
hasItems("url", "username", "password", "defaultBranch", "shallowClone")
);
assertThat(scmConfigurationView.fields().size(), is(4));
assertThat(scmConfigurationView.fields().size(), is(5));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ public void shouldReturnCorrectScmSettingsFields() throws Exception {
PluginConfigurationView scmConfigurationView = getScmView();

assertThat(scmConfigurationView.fields().keySet(),
hasItems("url", "username", "password", "branchwhitelist", "branchblacklist", "defaultBranch")
hasItems("url", "username", "password", "branchwhitelist", "branchblacklist", "defaultBranch", "shallowClone")
);
assertThat(scmConfigurationView.fields().size(), is(6));
assertThat(scmConfigurationView.fields().size(), is(7));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ public void shouldReturnCorrectScmSettingsFields() throws Exception {
PluginConfigurationView scmConfigurationView = getScmView();

assertThat(scmConfigurationView.fields().keySet(),
hasItems("url", "username", "password", "defaultBranch")
hasItems("url", "username", "password", "defaultBranch", "shallowClone")
);
assertThat(scmConfigurationView.fields().size(), is(4));
assertThat(scmConfigurationView.fields().size(), is(5));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ public void shouldReturnCorrectScmSettingsFields() throws Exception {
PluginConfigurationView scmConfigurationView = getScmView();

assertThat(scmConfigurationView.fields().keySet(),
hasItems("url", "username", "password", "defaultBranch")
hasItems("url", "username", "password", "defaultBranch", "shallowClone")
);
assertThat(scmConfigurationView.fields().size(), is(4));
assertThat(scmConfigurationView.fields().size(), is(5));
}

@Test
public void shouldReturnCorrectGeneralSettingsTemplate() throws Exception {
public void shouldReturnCorrectGeneralSettingsTemplate() throws Exception {
PluginConfigurationView generalConfigurationView = getGeneralView();

assertThat(generalConfigurationView.templateName(), is(""));
Expand Down

0 comments on commit e7c819f

Please sign in to comment.