Branch: refs/heads/master
Home: https://github.com/jenkinsci/pretested-integration-plugin
Commit: a48f690943cb79034717e495706c6428c7e710e4
https://github.com/jenkinsci/pretested-integration-plugin/commit/a48f690943cb79034717e495706c6428c7e710e4
Author: Bue Petersen <b...@praqma.net>
Date: 2015-07-07 (Tue, 07 Jul 2015)
Changed paths:
M pom.xml
M
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/AccumulatedCommitStrategy.java
M
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GitBridge.java
R
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/CommitMessagesWithDoubleQuotes.java
A
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/CommitMessagesWithSpecialChars.java
M
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/CustomIntegrationBranch.java
M
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/StaticGitRepositoryTestBase.java
M
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/TestUtilsFactory.java
A src/test/resources/JENKINS-28640.md
A src/test/resources/JENKINS-28640.zip
A src/test/resources/commitMessagesWithDoubleQuotesSingleQuotesMade.md
A
src/test/resources/commitMessagesWithDoubleQuotesSingleQuotesMade_linux-repo_description.log
A src/test/resources/commitMessagesWithDoubleQuotesSingleQuotesMade_linux.sh
A
src/test/resources/commitMessagesWithDoubleQuotesSingleQuotesMade_linux.zip
A
src/test/resources/commitMessagesWithDoubleQuotesSingleQuotesMade_windows-repo_description.log
A
src/test/resources/commitMessagesWithDoubleQuotesSingleQuotesMade_windows.bat
A
src/test/resources/commitMessagesWithDoubleQuotesSingleQuotesMade_windows.zip
Log Message:
-----------
JENKINS-28640: Quotation marks in commit msg:
Only related to the accumulated strategy.
Temporary fix for the bug with quotation marks in the commit message
leading to merge failure because of not properly escaped and formatted
command line arguments.
Fix is temporary replacing " (quotation marks) with ' (plings).
The squashed strategy is not affected, as the git command automatically
generated the commit message, where as the plugin creates a look-a-like
squash message, slightly modified, is using accumulated strategy.
Other improvements:
- fixed hard-coded dependency on the maven-hpi-plugin in the pom file,
new version works now
- cleaned few tests from wrong comments, and not clearly formatted error
messages if the tests failed
- renamed test suite for commit message prolems related to quotation
marks to special chars test suite
- shared a useful method from one test suite through test utils class
that can pretty print console output from the job to use for
verification in the tests.
Commit: 349570612582f04199683850676cad203b4d8fb9
https://github.com/jenkinsci/pretested-integration-plugin/commit/349570612582f04199683850676cad203b4d8fb9
Author: Bue Petersen <b...@praqma.net>
Date: 2015-07-07 (Tue, 07 Jul 2015)
Changed paths:
R
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/CommitMessagesWithSpecialChars.java
A
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/CommitMessagesWithSpecialCharsIT.java
R
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/CustomIntegrationBranch.java
A
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/CustomIntegrationBranchIT.java
R
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/DoNotAllowMasterBranchAsReadyBranch.java
A
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/DoNotAllowMasterBranchAsReadyBranchIT.java
R
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/UseAuthorOfLastCommit.java
A
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/UseAuthorOfLastCommitIT.java
Log Message:
-----------
JENKINS-28640: Quotation marks - enabled tests:
Not all tests have automatically been executed before.
Fixing the filenames to include all tests.
Commit: 9b4e052022bb618a4d85c7852a5ac76d5391d89e
https://github.com/jenkinsci/pretested-integration-plugin/commit/9b4e052022bb618a4d85c7852a5ac76d5391d89e
Author: Bue Petersen <b...@praqma.net>
Date: 2015-07-12 (Sun, 12 Jul 2015)
Changed paths:
M README.md
M
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/AccumulatedCommitStrategy.java
M
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GetAllCommitsFromBranchCallback.java
M
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/SquashCommitStrategy.java
M
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/BuildResultValidator.java
M
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/CommitMessagesWithSpecialCharsIT.java
M
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/CustomIntegrationBranchIT.java
M
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/StaticGitRepositoryTestBase.java
M
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/TestUtilsFactory.java
Log Message:
-----------
JENKINS-29369 Fix locale dependent accumulated msg
The accumulated commit message is now using english locale when
formatting date and time. The commit message is generated by the plugin
and formatted to look like the squash commit message except for the
header line.
Tests have been improved to include detailed commit message asserts and
extend to include few more tests for squashed also.
Each test now verifies that the formatting of dates are correct for the
tests regarding special charecters and custom integration branch (those
were the newer tests we added so the follow a better design).
Other improvements and refactoring:
- removed un-used code in squash commit strategy
- removed debug print of squash commit strategy to build console
- add debug printing of exception during integration to the build
console
- fixed minor bug in test utils regarding printing console which is null
- test base class for static git repos extended to print out cleaning
repos and temp files
Compare:
https://github.com/jenkinsci/pretested-integration-plugin/compare/cbd24a9b1b9a...9b4e052022bb
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
