Examples of hotfixFinish()

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

101
102
103
104
105
106
107
108
109
110
111
        //create a new file
        File junkFile = new File(git.getRepository().getWorkTree(), "junk.txt");
        FileUtils.writeStringToFile(junkFile, "I am junk");

        //try to finish
        flow.hotfixFinish("1.0").call();
    }

    @Test(expected = DirtyWorkingTreeException.class)
    public void finishHotfixUnCommittedFile() throws Exception
    {
View Full Code Here

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

119
120
121
122
123
124
125
126
127
128
129
        File junkFile = new File(git.getRepository().getWorkTree(), "junk.txt");
        FileUtils.writeStringToFile(junkFile, "I am junk");
        git.add().addFilepattern(junkFile.getName()).call();

        //try to finish
        flow.hotfixFinish("1.0").call();
    }

    @Test
    public void finishHotfixWithNewCommit() throws Exception
    {
View Full Code Here

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

141
142
143
144
145
146
147
148
149
150
151
        //make sure develop doesn't report our commit yet
        assertFalse(GitHelper.isMergedInto(git, commit, flow.getDevelopBranchName()));

        //try to finish
        flow.hotfixFinish("1.0").call();

        //we should be on develop branch
        assertEquals(flow.getDevelopBranchName(), git.getRepository().getBranch());

        //release branch should be gone
View Full Code Here

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

185
186
187
188
189
190
191
192
193
194
195
        //make sure release doesn't report our commit yet
        assertFalse(GitHelper.isMergedInto(git, commit, releaseName));

        //try to finish
        flow.hotfixFinish("1.0.1").call();

        //we should be on develop branch
        assertEquals(flow.getDevelopBranchName(), git.getRepository().getBranch());

        //hotfix branch should be gone
View Full Code Here

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

216
217
218
219
220
221
222
223
224
225
226
        flow.hotfixStart("1.0").call();

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

        flow.hotfixFinish("1.0").setKeepBranch(true).call();

        //we should be on develop branch
        assertEquals(flow.getDevelopBranchName(), git.getRepository().getBranch());

        //release branch should still exist
View Full Code Here

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

252
253
254
255
256
257
258
259
260
261
262
        //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
        flow.hotfixFinish("1.0").call();

        //we should be on develop branch
        assertEquals(flow.getDevelopBranchName(), git.getRepository().getBranch());

        //release branch should be gone
View Full Code Here

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

291
292
293
294
295
296
297
298
299
300
301
        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();

        flow.hotfixFinish("1.0").setFetch(true).call();

    }

    @Test(expected = BranchOutOfDateException.class)
    public void finishHotfixMasterBehindRemoteWithFetch() throws Exception
View Full Code Here

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

316
317
318
319
320
321
322
323
324
325
326
        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();

        flow.hotfixFinish("1.0").setFetch(true).call();

    }

    @Test
    public void finishHotfixMasterIsTagged() throws Exception
View Full Code Here

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

342
343
344
345
346
347
348
349
350
351
352
        File junkFile = new File(git.getRepository().getWorkTree(), "junk.txt");
        FileUtils.writeStringToFile(junkFile, "I am junk");
        git.add().addFilepattern(junkFile.getName()).call();
        git.commit().setMessage("committing junk file").call();

        flow.hotfixFinish("1.0").setNoTag( false ).call();

        //we should be on develop branch
        assertEquals(flow.getDevelopBranchName(), git.getRepository().getBranch());

        // There should be a tag reference
View Full Code Here

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

63
64
65
66
67
68
69
70
71
72
73
        flow.git().add().addFilepattern(junkFile.getName()).call();
        RevCommit localcommit = flow.git().commit().setMessage("adding junk file").call();

        HotfixFinishExtensionForTests extension = new HotfixFinishExtensionForTests();

        ReleaseMergeResult result = flow.hotfixFinish("1.0").setFetch(true).setPush(true).setExtension(extension).call();

        assertTrue(result.wasSuccessful());

        assertTrue("before was not called", extension.wasCalled(BaseExtensionForTests.BEFORE));
        assertTrue("beforeFetch was not called", extension.wasCalled(BaseExtensionForTests.BEFORE_FETCH));
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.