Added option to set specific revision when using Subversion as SCM #1546
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Deploy config example: |
Add unit test for feature change (untested)
|
All the tests failed, could you please try again? |
|
Sorry for the many commits, I haven't had time yet to set up local testing. |
|
Existing test cases now pass. I naively tried to add a new test case by copying and modifying it in the same file, but I guess I am missing something. Could you point me in the right direction? marcovtwout@14a0a86 |
| context.expects(:execute).with(:svn, :update, '--username someuser', '--password somepassword', '--revision 12345') | ||
| context.expects(:fetch).twice.with(:svn_username).returns('someuser') | ||
| context.expects(:fetch).twice.with(:svn_password).returns('somepassword') | ||
| context.expects(:fetch).once.with(:svn_revision).returns('12345') |
There was a problem hiding this comment.
I think this should be context.expects(:fetch).twice.
… based on the Travis build which is showing the failing test:
Failures:
1) Capistrano::Svn::DefaultStrategy#update_specific_revision should run svn update and update to a specific revision
Failure/Error: subject.update
Mocha::ExpectationError:
unexpected invocation: #<#<Class:0x00000003740b78>:0x3740b28>.fetch(:svn_revision)
unsatisfied expectations:
- expected exactly once, invoked twice: #<#<Class:0x00000003740b78>:0x3740b28>.fetch(:svn_revision)
- expected exactly once, not yet invoked: #<#<Class:0x00000003740b78>:0x3740b28>.execute(:svn, :update, '--username someuser', '--password somepassword', '--revision 12345')
satisfied expectations:
- expected exactly twice, invoked twice: #<#<Class:0x00000003740b78>:0x3740b28>.fetch(:svn_password)
- expected exactly twice, invoked twice: #<#<Class:0x00000003740b78>:0x3740b28>.fetch(:svn_username)
# ./lib/capistrano/scm.rb:51:in `fetch'
# ./lib/capistrano/svn.rb:12:in `svn'
# ./lib/capistrano/svn.rb:32:in `update'
# ./spec/lib/capistrano/svn_spec.rb:77:in `block (3 levels) in <module:Capistrano>'
Updated copyright to 2016
Add unit test for feature change (untested)
|
Anything left to do before this can be merged? |
|
I'll double check. Thanks for the ping. |
|
@marcovtwout Can you add a CHANGELOG entry for this and then squash all the commits down to a single commit? Then I can merge it. Thanks |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.