Add support for box_download_ca_cert #274
Merged
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
typo and gnarled unless logic
…r234 Signed-off-by: Seth Thomas <[email protected]>
drrk
reviewed
Jan 6, 2017
| it "sets :box_download_ca_cert to a custom value" do | ||
| config[:box_download_ca_cert] = "cacert.pem" | ||
|
|
||
| expect(driver[:box_download_ca_cert]).to eq("cacert.pem") |
There was a problem hiding this comment.
Confused about this test, I would have expected '/kroot/cacert.pem'
There was a problem hiding this comment.
probably because the path does not get resolved with kitchen_root until the render_template method.
mwrock
requested changes
Jan 6, 2017
| it "sets :box_download_ca_cert to a custom value" do | ||
| config[:box_download_ca_cert] = "cacert.pem" | ||
|
|
||
| expect(driver[:box_download_ca_cert]).to eq("cacert.pem") |
There was a problem hiding this comment.
probably because the path does not get resolved with kitchen_root until the render_template method.
| @@ -326,6 +328,9 @@ def load_needed_dependencies! | |||
| # @raise [ActionFailed] if the Vagrantfile template was not found | |||
| # @api private | |||
| def render_template | |||
| config[:box_download_ca_cert] = File.expand_path( | |||
| config[:box_download_ca_cert], config[:kitchen_root]) unless | |||
| config[:box_download_ca_cert].nil? | |||
There was a problem hiding this comment.
I'd move this to finalize_config which I believe will mean you can more easily test this (see comment below)
Signed-off-by: Seth Thomas <[email protected]>
|
Moved the code around as suggested and the tests now seem like they are working right, lemme know if it needs any more work! |
mwrock
approved these changes
Jan 7, 2017
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.
Closes #234