Skip to content

Commit 2f10388

Browse files
lifeofguenterlifeofguenter
authored
master vs main (#513)
Swap most references to "master" with "main"
1 parent 8ce1332 commit 2f10388

30 files changed

+98
-98
lines changed

‎src/test/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketSCMNavigatorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ public void exclude_branches() throws Exception {
341341
allOf(
342342
instanceOf(WildcardSCMHeadFilterTrait.class),
343343
hasProperty("includes", is("*")),
344-
hasProperty("excludes", is("master"))
344+
hasProperty("excludes", is("main"))
345345
),
346346
allOf(
347347
instanceOf(WebhookRegistrationTrait.class),
@@ -355,7 +355,7 @@ public void exclude_branches() throws Exception {
355355
assertThat(instance.getPattern(), is(".*"));
356356
assertThat(instance.isAutoRegisterHooks(), is(false));
357357
assertThat(instance.getIncludes(), is("*"));
358-
assertThat(instance.getExcludes(), is("master"));
358+
assertThat(instance.getExcludes(), is("main"));
359359
}
360360

361361
@Test

‎src/test/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketSCMSourceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public void exclude_branches() throws Exception {
278278
Matchers.<SCMSourceTrait>allOf(
279279
instanceOf(WildcardSCMHeadFilterTrait.class),
280280
hasProperty("includes", is("*")),
281-
hasProperty("excludes", is("master"))
281+
hasProperty("excludes", is("main"))
282282
),
283283
Matchers.<SCMSourceTrait>allOf(
284284
instanceOf(WebhookRegistrationTrait.class),
@@ -290,7 +290,7 @@ public void exclude_branches() throws Exception {
290290
assertThat(instance.getBitbucketServerUrl(), is(nullValue()));
291291
assertThat(instance.getCheckoutCredentialsId(), is(BitbucketSCMSource.DescriptorImpl.SAME));
292292
assertThat(instance.getIncludes(), is("*"));
293-
assertThat(instance.getExcludes(), is("master"));
293+
assertThat(instance.getExcludes(), is("main"));
294294
assertThat(instance.isAutoRegisterHook(), is(false));
295295
}
296296

‎src/test/java/com/cloudbees/jenkins/plugins/bitbucket/SSHCheckoutTraitTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void given__sshCheckoutWithCredentials__when__decoratingGit__then__creden
3535
SSHCheckoutTrait instance = new SSHCheckoutTrait("keyId");
3636
BitbucketGitSCMBuilder probe =
3737
new BitbucketGitSCMBuilder(new BitbucketSCMSource("example", "does-not-exist"),
38-
new BranchSCMHead("master"), null, "scanId");
38+
new BranchSCMHead("main"), null, "scanId");
3939
assumeThat(probe.credentialsId(), is("scanId"));
4040
instance.decorateBuilder(probe);
4141
assertThat(probe.credentialsId(), is("keyId"));
@@ -46,7 +46,7 @@ public void given__sshCheckoutWithAgentKey__when__decoratingGit__then__useAgentK
4646
SSHCheckoutTrait instance = new SSHCheckoutTrait(null);
4747
BitbucketGitSCMBuilder probe =
4848
new BitbucketGitSCMBuilder(new BitbucketSCMSource( "example", "does-not-exist"),
49-
new BranchSCMHead("master"), null, "scanId");
49+
new BranchSCMHead("main"), null, "scanId");
5050
assumeThat(probe.credentialsId(), is("scanId"));
5151
instance.decorateBuilder(probe);
5252
assertThat(probe.credentialsId(), is(nullValue()));

‎src/test/java/com/cloudbees/jenkins/plugins/bitbucket/client/events/BitbucketCloudPullRequestEventTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void createPayloadOrigin() throws Exception {
8888
assertThat(event.getPullRequest().getDestination().getRepository().getLinks().get("self").get(0).getHref(),
8989
is("https://api.bitbucket.org/2.0/repositories/cloudbeers/temp"));
9090
assertThat(event.getPullRequest().getDestination().getBranch(), notNullValue());
91-
assertThat(event.getPullRequest().getDestination().getBranch().getName(), is("master"));
91+
assertThat(event.getPullRequest().getDestination().getBranch().getName(), is("main"));
9292
assertThat(event.getPullRequest().getDestination().getBranch().getRawNode(),
9393
anyOf(is("f612156eff2c"), is("f612156eff2c958f52f8e6e20c71f396aeaeaff4")));
9494
assertThat(event.getPullRequest().getDestination().getCommit(), notNullValue());
@@ -154,7 +154,7 @@ public void createPayloadFork() throws Exception {
154154
assertThat(event.getPullRequest().getDestination().getRepository().getLinks().get("self").get(0).getHref(),
155155
is("https://api.bitbucket.org/2.0/repositories/cloudbeers/temp"));
156156
assertThat(event.getPullRequest().getDestination().getBranch(), notNullValue());
157-
assertThat(event.getPullRequest().getDestination().getBranch().getName(), is("master"));
157+
assertThat(event.getPullRequest().getDestination().getBranch().getName(), is("main"));
158158
assertThat(event.getPullRequest().getDestination().getBranch().getRawNode(),
159159
anyOf(is("1986c2284946"), is("1986c228494671574242f99b62d1a00a4bfb69a5")));
160160
assertThat(event.getPullRequest().getDestination().getCommit(), notNullValue());
@@ -175,7 +175,7 @@ public void createPayloadFork() throws Exception {
175175
is("https://api.bitbucket.org/2.0/repositories/stephenc/temp-fork"));
176176

177177
assertThat(event.getPullRequest().getSource().getBranch(), notNullValue());
178-
assertThat(event.getPullRequest().getSource().getBranch().getName(), is("master"));
178+
assertThat(event.getPullRequest().getSource().getBranch().getName(), is("main"));
179179
assertThat(event.getPullRequest().getSource().getBranch().getRawNode(),
180180
anyOf(is("1c48041a96db"), is("1c48041a96db4c98620609260c21ff5fbc9640c2")));
181181
assertThat(event.getPullRequest().getSource().getCommit(), notNullValue());
@@ -219,7 +219,7 @@ public void updatePayload_newCommit() throws Exception {
219219
assertThat(event.getPullRequest().getDestination().getRepository().getLinks().get("self").get(0).getHref(),
220220
is("https://api.bitbucket.org/2.0/repositories/cloudbeers/temp"));
221221
assertThat(event.getPullRequest().getDestination().getBranch(), notNullValue());
222-
assertThat(event.getPullRequest().getDestination().getBranch().getName(), is("master"));
222+
assertThat(event.getPullRequest().getDestination().getBranch().getName(), is("main"));
223223
assertThat(event.getPullRequest().getDestination().getBranch().getRawNode(),
224224
anyOf(is("1986c2284946"), is("1986c228494671574242f99b62d1a00a4bfb69a5")));
225225
assertThat(event.getPullRequest().getDestination().getCommit(), notNullValue());
@@ -240,7 +240,7 @@ public void updatePayload_newCommit() throws Exception {
240240
is("https://api.bitbucket.org/2.0/repositories/stephenc/temp-fork"));
241241

242242
assertThat(event.getPullRequest().getSource().getBranch(), notNullValue());
243-
assertThat(event.getPullRequest().getSource().getBranch().getName(), is("master"));
243+
assertThat(event.getPullRequest().getSource().getBranch().getName(), is("main"));
244244
assertThat(event.getPullRequest().getSource().getBranch().getRawNode(),
245245
anyOf(is("63e3d18dca4c"), is("63e3d18dca4c61e6b9e31eb6036802c7730fa2b3")));
246246
assertThat(event.getPullRequest().getSource().getCommit(), notNullValue());
@@ -305,7 +305,7 @@ public void updatePayload_newDestination() throws Exception {
305305
is("https://api.bitbucket.org/2.0/repositories/stephenc/temp-fork"));
306306

307307
assertThat(event.getPullRequest().getSource().getBranch(), notNullValue());
308-
assertThat(event.getPullRequest().getSource().getBranch().getName(), is("master"));
308+
assertThat(event.getPullRequest().getSource().getBranch().getName(), is("main"));
309309
assertThat(event.getPullRequest().getSource().getBranch().getRawNode(),
310310
anyOf(is("63e3d18dca4c"), is("63e3d18dca4c61e6b9e31eb6036802c7730fa2b3")));
311311
assertThat(event.getPullRequest().getSource().getCommit(), notNullValue());
@@ -349,7 +349,7 @@ public void updatePayload_newDestinationCommit() throws Exception {
349349
assertThat(event.getPullRequest().getDestination().getRepository().getLinks().get("self").get(0).getHref(),
350350
is("https://api.bitbucket.org/2.0/repositories/cloudbeers/temp"));
351351
assertThat(event.getPullRequest().getDestination().getBranch(), notNullValue());
352-
assertThat(event.getPullRequest().getDestination().getBranch().getName(), is("master"));
352+
assertThat(event.getPullRequest().getDestination().getBranch().getName(), is("main"));
353353
assertThat(event.getPullRequest().getDestination().getBranch().getRawNode(),
354354
anyOf(is("5449b752db4f"), is("5449b752db4fa7ca0e2329d7f70122e2a82856cc")));
355355
assertThat(event.getPullRequest().getDestination().getCommit(), notNullValue());
@@ -370,7 +370,7 @@ public void updatePayload_newDestinationCommit() throws Exception {
370370
is("https://api.bitbucket.org/2.0/repositories/stephenc/temp-fork"));
371371

372372
assertThat(event.getPullRequest().getSource().getBranch(), notNullValue());
373-
assertThat(event.getPullRequest().getSource().getBranch().getName(), is("master"));
373+
assertThat(event.getPullRequest().getSource().getBranch().getName(), is("main"));
374374
assertThat(event.getPullRequest().getSource().getBranch().getRawNode(),
375375
anyOf(is("63e3d18dca4c"), is("63e3d18dca4c61e6b9e31eb6036802c7730fa2b3")));
376376
assertThat(event.getPullRequest().getSource().getCommit(), notNullValue());
@@ -414,7 +414,7 @@ public void rejectedPayload() throws Exception {
414414
assertThat(event.getPullRequest().getDestination().getRepository().getLinks().get("self").get(0).getHref(),
415415
is("https://api.bitbucket.org/2.0/repositories/cloudbeers/temp"));
416416
assertThat(event.getPullRequest().getDestination().getBranch(), notNullValue());
417-
assertThat(event.getPullRequest().getDestination().getBranch().getName(), is("master"));
417+
assertThat(event.getPullRequest().getDestination().getBranch().getName(), is("main"));
418418
assertThat(event.getPullRequest().getDestination().getBranch().getRawNode(),
419419
anyOf(is("5449b752db4f"), is("5449b752db4fa7ca0e2329d7f70122e2a82856cc")));
420420
assertThat(event.getPullRequest().getDestination().getCommit(), notNullValue());
@@ -436,7 +436,7 @@ public void rejectedPayload() throws Exception {
436436
is("https://api.bitbucket.org/2.0/repositories/stephenc/temp-fork"));
437437

438438
assertThat(event.getPullRequest().getSource().getBranch(), notNullValue());
439-
assertThat(event.getPullRequest().getSource().getBranch().getName(), is("master"));
439+
assertThat(event.getPullRequest().getSource().getBranch().getName(), is("main"));
440440
assertThat(event.getPullRequest().getSource().getBranch().getRawNode(),
441441
anyOf(is("63e3d18dca4c"), is("63e3d18dca4c61e6b9e31eb6036802c7730fa2b3")));
442442
assertThat(event.getPullRequest().getSource().getCommit(), notNullValue());
@@ -480,7 +480,7 @@ public void fulfilledPayload() throws Exception {
480480
assertThat(event.getPullRequest().getDestination().getRepository().getLinks().get("self").get(0).getHref(),
481481
is("https://api.bitbucket.org/2.0/repositories/cloudbeers/temp"));
482482
assertThat(event.getPullRequest().getDestination().getBranch(), notNullValue());
483-
assertThat(event.getPullRequest().getDestination().getBranch().getName(), is("master"));
483+
assertThat(event.getPullRequest().getDestination().getBranch().getName(), is("main"));
484484
assertThat(event.getPullRequest().getDestination().getBranch().getRawNode(),
485485
anyOf(is("f612156eff2c"), is("f612156eff2c958f52f8e6e20c71f396aeaeaff4")));
486486
assertThat(event.getPullRequest().getDestination().getCommit(), notNullValue());

‎src/test/java/com/cloudbees/jenkins/plugins/bitbucket/client/events/BitbucketCloudPushEventTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void createPayload() throws Exception {
7373
assertThat(change.isCreated(), is(true));
7474
assertThat(change.isClosed(), is(false));
7575
assertThat(change.getNew(), notNullValue());
76-
assertThat(change.getNew().getName(), is("master"));
76+
assertThat(change.getNew().getName(), is("main"));
7777
assertThat(change.getNew().getType(), is("branch"));
7878
assertThat(change.getNew().getTarget(), notNullValue());
7979
assertThat(change.getNew().getTarget().getHash(), is("501bf5b99365d1d870882254b9360c17172bda0e"));
@@ -151,14 +151,14 @@ public void multipleChangesPayload() throws Exception {
151151
assertThat(event.getChanges().size(), is(3));
152152
BitbucketPushEvent.Change change = event.getChanges().get(0);
153153
assertThat(change.getOld(), notNullValue());
154-
assertThat(change.getOld().getName(), is("master"));
154+
assertThat(change.getOld().getName(), is("main"));
155155
assertThat(change.getOld().getType(), is("branch"));
156156
assertThat(change.getOld().getTarget(), notNullValue());
157157
assertThat(change.getOld().getTarget().getHash(), is("fc4d1ce2853b6f1ac0d0dbad643d17ef4a6e0be7"));
158158
assertThat(change.isCreated(), is(false));
159159
assertThat(change.isClosed(), is(false));
160160
assertThat(change.getNew(), notNullValue());
161-
assertThat(change.getNew().getName(), is("master"));
161+
assertThat(change.getNew().getName(), is("main"));
162162
assertThat(change.getNew().getType(), is("branch"));
163163
assertThat(change.getNew().getTarget(), notNullValue());
164164
assertThat(change.getNew().getTarget().getHash(), is("325d37697849f4b1fe42cb19c20134af08e03a82"));

‎src/test/java/com/cloudbees/jenkins/plugins/bitbucket/server/events/BitbucketServerPullRequestEventTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void updatePayload() throws Exception {
8989
assertThat(event.getPullRequest().getDestination().getRepository().getLinks().get("self").get(0).getHref(),
9090
is("http://local.example.com:7990/bitbucket/projects/PROJECT_1/repos/rep_1/browse"));
9191
assertThat(event.getPullRequest().getDestination().getBranch(), notNullValue());
92-
assertThat(event.getPullRequest().getDestination().getBranch().getName(), is("master"));
92+
assertThat(event.getPullRequest().getDestination().getBranch().getName(), is("main"));
9393
assertThat(event.getPullRequest().getDestination().getBranch().getRawNode(), is("d235f0c0aa22f4c75b2fb63b217e39e2d3c29f49"));
9494
assertThat(event.getPullRequest().getDestination().getCommit(), notNullValue());
9595
assertThat(event.getPullRequest().getDestination().getCommit().getHash(), is(
@@ -110,7 +110,7 @@ public void updatePayload() throws Exception {
110110
is("http://local.example.com:7990/bitbucket/users/user/repos/rep_1/browse")));
111111

112112
assertThat(event.getPullRequest().getSource().getBranch(), notNullValue());
113-
assertThat(event.getPullRequest().getSource().getBranch().getName(), is("master"));
113+
assertThat(event.getPullRequest().getSource().getBranch().getName(), is("main"));
114114
assertThat(event.getPullRequest().getSource().getBranch().getRawNode(),
115115
is("feb8d676cd70406cecd4128c8fd1bee30282db11"));
116116
assertThat(event.getPullRequest().getSource().getCommit(), notNullValue());
@@ -142,7 +142,7 @@ public void apiResponse() throws Exception {
142142
assertThat(pullRequest.getDestination().getRepository().getLinks().get("self").get(0).getHref(),
143143
is("http://local.example.com:7990/bitbucket/projects/PROJECT_1/repos/rep_1/browse"));
144144
assertThat(pullRequest.getDestination().getBranch(), notNullValue());
145-
assertThat(pullRequest.getDestination().getBranch().getName(), is("master"));
145+
assertThat(pullRequest.getDestination().getBranch().getName(), is("main"));
146146
assertThat(pullRequest.getDestination().getBranch().getRawNode(),
147147
is("d235f0c0aa22f4c75b2fb63b217e39e2d3c29f49"));
148148
assertThat(pullRequest.getDestination().getCommit(), notNullValue());
@@ -165,7 +165,7 @@ public void apiResponse() throws Exception {
165165
);
166166

167167
assertThat(pullRequest.getSource().getBranch(), notNullValue());
168-
assertThat(pullRequest.getSource().getBranch().getName(), is("master"));
168+
assertThat(pullRequest.getSource().getBranch().getName(), is("main"));
169169
assertThat(pullRequest.getSource().getBranch().getRawNode(),
170170
is("feb8d676cd70406cecd4128c8fd1bee30282db11"));
171171
assertThat(pullRequest.getSource().getCommit(), notNullValue());

0 commit comments

Comments
 (0)