Skip to content

Various improvements to the spec_helper#505

Merged
bastelfreak merged 6 commits intovoxpupuli:masterfrom
ekohl:fix-mock_with
Oct 13, 2018
Merged

Various improvements to the spec_helper#505
bastelfreak merged 6 commits intovoxpupuli:masterfrom
ekohl:fix-mock_with

Conversation

@ekohl
Copy link
Copy Markdown
Member

@ekohl ekohl commented Oct 6, 2018

Otherwise it won't be used

@@ -1,3 +1,8 @@
<%- if @configs['mock_with'] -%>
RSpec.configure do |c|
c.mock_with <%= @configs['mock_with'] %>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this block is now duplicate. We probably can remove the other one. This need to be tested within one module

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just verified this on puppet-mongodb (in my local branch) that the later one is indeed redundant and it must be done here at the top.

@ekohl ekohl changed the title Set up mock_with before including puppetlabs_spec_helper Various improvements to the spec_helper Oct 6, 2018
@ekohl
Copy link
Copy Markdown
Member Author

ekohl commented Oct 6, 2018

Updated to include various updates. See the individual commits for details.

@bastelfreak
Copy link
Copy Markdown
Member

can you please run this against one module and link the PR to this one?

ekohl added 3 commits October 13, 2018 13:43
Since rspec-puppet-facts 1.1.0 puppetversion is set. The facter version
is set since 1.8.0.

The concat_basedir fact isn't used since puppetlabs-concat 2.0.
This recommended in the current rspec-puppet README and ensures that the
report covers all parallel spec workers.
@ekohl
Copy link
Copy Markdown
Member Author

ekohl commented Oct 13, 2018

@ekohl
Copy link
Copy Markdown
Member Author

ekohl commented Oct 13, 2018

voxpupuli/puppet-nginx#1264 as well

@bastelfreak bastelfreak merged commit 7536500 into voxpupuli:master Oct 13, 2018
@ekohl ekohl deleted the fix-mock_with branch October 13, 2018 13:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants