Package com.atlassian.jgitflow.core

Examples of com.atlassian.jgitflow.core.JGitFlow.releaseFinish()

63
64
65
66
67
68
69
70
71
72
73
        //create a new file
        File junkFile = new File(git.getRepository().getWorkTree(), "junk.txt");
        FileUtils.writeStringToFile(junkFile, "I am junk");

        //try to finish
        ReleaseMergeResult result = flow.releaseFinish("1.0").call();
        assertTrue(result.wasSuccessful());
    }

    @Test(expected = DirtyWorkingTreeException.class)
    public void finishReleaseUnCommittedFile() throws Exception
View Full Code Here
82
83
84
85
86
87
88
89
90
91
92
        File junkFile = new File(git.getRepository().getWorkTree(), "junk.txt");
        FileUtils.writeStringToFile(junkFile, "I am junk");
        git.add().addFilepattern(junkFile.getName()).call();

        //try to finish
        ReleaseMergeResult result = flow.releaseFinish("1.0").call();
        assertTrue(result.wasSuccessful());
    }

    @Test
    public void finishReleaseWithNewCommit() throws Exception
View Full Code Here
105
106
107
108
109
110
111
112
113
114
115
        //make sure develop doesn't report our commit yet
        assertFalse(GitHelper.isMergedInto(git, commit, flow.getDevelopBranchName()));

        //try to finish
        ReleaseMergeResult result = flow.releaseFinish("1.0").call();

        assertTrue(result.wasSuccessful());

        //we should be on develop branch
        assertEquals(flow.getDevelopBranchName(), git.getRepository().getBranch());
View Full Code Here
142
143
144
145
146
147
148
149
150
151
152
        //make sure develop doesn't report our commit yet
        assertFalse(GitHelper.isMergedInto(git, commit, flow.getDevelopBranchName()));

        //try to finish
        ReleaseMergeResult result = flow.releaseFinish("1.0").setNoMerge(true).call();

        assertTrue(result.wasSuccessful());

        //we should be on develop branch
        assertEquals(flow.getDevelopBranchName(), git.getRepository().getBranch());
View Full Code Here
172
173
174
175
176
177
178
179
180
181
182
        flow.releaseStart("1.0").call();

        //just in case
        assertEquals(flow.getReleaseBranchPrefix() + "1.0", git.getRepository().getBranch());

        ReleaseMergeResult result = flow.releaseFinish("1.0").setKeepBranch(true).call();

        assertTrue(result.wasSuccessful());

        //we should be on develop branch
        assertEquals(flow.getDevelopBranchName(), git.getRepository().getBranch());
View Full Code Here
210
211
212
213
214
215
216
217
218
219
220
        //make sure develop doesn't have our commits yet
        assertFalse(GitHelper.isMergedInto(git, commit, flow.getDevelopBranchName()));
        assertFalse(GitHelper.isMergedInto(git, commit2, flow.getDevelopBranchName()));

        //try to finish
        ReleaseMergeResult result = flow.releaseFinish("1.0").call();

        assertTrue(result.wasSuccessful());

        //we should be on develop branch
        assertEquals(flow.getDevelopBranchName(), git.getRepository().getBranch());
View Full Code Here
256
257
258
259
260
261
262
263
264
265
266
        //make sure develop doesn't have our commits yet
        assertFalse(GitHelper.isMergedInto(git, commit, flow.getDevelopBranchName()));
        assertFalse(GitHelper.isMergedInto(git, commit2, flow.getDevelopBranchName()));

        //try to finish
        ReleaseMergeResult result = flow.releaseFinish("1.0").setSquash(true).call();

        assertTrue(result.wasSuccessful());

        //we should be on develop branch
        assertEquals(flow.getDevelopBranchName(), git.getRepository().getBranch());
View Full Code Here
310
311
312
313
314
315
316
317
318
319
320
        File junkFile = new File(remoteGit.getRepository().getWorkTree(), "junk.txt");
        FileUtils.writeStringToFile(junkFile, "I am junk");
        remoteGit.add().addFilepattern(junkFile.getName()).call();
        remoteGit.commit().setMessage("adding junk file").call();

        ReleaseMergeResult result = flow.releaseFinish("1.0").setFetch(true).call();

        assertTrue(result.wasSuccessful());

    }
View Full Code Here
337
338
339
340
341
342
343
344
345
346
347
        File junkFile = new File(remoteGit.getRepository().getWorkTree(), "junk.txt");
        FileUtils.writeStringToFile(junkFile, "I am junk");
        remoteGit.add().addFilepattern(junkFile.getName()).call();
        remoteGit.commit().setMessage("adding junk file").call();

        ReleaseMergeResult result = flow.releaseFinish("1.0").setFetch(true).call();

        assertTrue(result.wasSuccessful());

    }
   
View Full Code Here
380
381
382
383
384
385
386
387
388
389
390
        File junkFile = new File(flow.git().getRepository().getWorkTree(), "junk.txt");
        FileUtils.writeStringToFile(junkFile, "I am junk");
        flow.git().add().addFilepattern(junkFile.getName()).call();
        RevCommit localcommit = flow.git().commit().setMessage("adding junk file").call();

        ReleaseMergeResult result = flow.releaseFinish("1.0").setPush(true).call();
       
        assertTrue(result.wasSuccessful());
       
        assertTrue(GitHelper.isMergedInto(remoteGit, localcommit, flow.getMasterBranchName()));
        assertTrue(GitHelper.isMergedInto(remoteGit, localcommit, flow.getDevelopBranchName()));
View Full Code Here
TOP
Copyright © 2018 www.massapi.com. All rights reserved.
All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.