(MODULES-4418) Add bypass_proxy to chocolateysource #132
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
michaeltlombardi
changed the title
|
Working on the acceptance tests, will remove WIP when they pass. Don't have a new enough version of Chocolatey in the CI artifactory to test, rectifying. |
michaeltlombardi
changed the title
|
Adhoc has passed (after we added a newer version of Chocolatey to artifactory)! |
ThoughtCrhyme
suggested changes
Jan 24, 2019
| @@ -66,6 +99,7 @@ | |||
| assert_match(/bob/, get_xml_value("//sources/source[@id='test']/@user", result.output).to_s, 'User did not match') | |||
| assert_match(/.+/, get_xml_value("//sources/source[@id='test']/@password", result.output).to_s, 'Password was not saved') | |||
| assert_match(/false/, get_xml_value("//sources/source[@id='test']/@disabled", result.output).to_s, 'Disabled did not match') | |||
| assert_match(/true/, get_xml_value("//sources/source[@id='test']/@bypassProxy", result.output).to_s, 'Bypass Proxy did not match') | |||
| end | |||
There was a problem hiding this comment.
The more recent idiom is to use rspec's expect(some_var).to match(/true/) although with all the other assert_matchs continuing in that way is fine.
spec/acceptance/sources_spec.rb
Outdated
| end | ||
| end | ||
|
|
||
| it 'Should apply a manifest to change the priority' do |
There was a problem hiding this comment.
*Should apply manifest to set bypass_proxy to false
| @@ -444,6 +489,26 @@ | |||
| resource.flush | |||
| end | |||
|
|
|||
| it "should set bypass_proxy when present" do | |||
There was a problem hiding this comment.
What's the difference between this test and the one starting at line 596?
There was a problem hiding this comment.
Functionally none, I don't think, this is an artifact of copying the tests over.
Prior to this commit the `chocolateysource` type and provider did not support the option to specify the `--bypass-proxy` flag when managing a source. This option causes Chocolatey to ignore any system proxies and was introduced in Chocolatey `0.10.4`. This commit adds the `bypass_proxy` property to the type and provider of `chocolateysource` to ensure that this property can be configured on versions which support it. This commit also updates the README documentation and CHANGELOG, as well as providing new unit and acceptance tests and updating any unit and acceptance tests which should include the new setting. As new features are added which depend on particular versions of Chocolatey, it may be useful to refactor the tests and provider to manage the addition of such features with less duplicated code, but that is considered out-of-scope for this improvement.
ThoughtCrhyme
approved these changes
Jan 24, 2019
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.
Prior to this commit the
chocolateysourcetype and provider didnot support the option to specify the
--bypass-proxyflag whenmanaging a source. This option causes Chocolatey to ignore any
system proxies and was introduced in Chocolatey
0.10.4.This commit adds the
bypass_proxyproperty to the type andprovider of
chocolateysourceto ensure that this propertycan be configured on versions which support it.
This commit also updates the README documentation and CHANGELOG,
as well as providing new unit and acceptance tests and updating
any unit and acceptance tests which should include the new
setting.
As new features are added which depend on particular versions of
Chocolatey, it may be useful to refactor the tests and provider
to manage the addition of such features with less duplicated
code, but that is considered out-of-scope for this improvement.