Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(PDK-1384) Updates to be compatible with latest Cri #731

Merged
merged 2 commits into from
Aug 23, 2019

Conversation

scotje
Copy link
Contributor

@scotje scotje commented Aug 20, 2019

No description provided.

@scotje
Copy link
Contributor Author

scotje commented Aug 20, 2019

There are still a bunch of places where we call hash_including but the tests aren't failing, so I'm not sure if we need to update them? They may be testing cases where options are being explicitly passed.

@scotje scotje requested a review from a team August 20, 2019 01:55
@scotje scotje added this to the August 2019 milestone Aug 20, 2019
@coveralls
Copy link

coveralls commented Aug 20, 2019

Coverage Status

Coverage remained the same at 92.072% when pulling d8de456 on scotje:1384_cri_upgrade into 70d19e0 on puppetlabs:master.

denisdefreyne and others added 2 commits August 20, 2019 12:52
This PR introduces #hash_with_defaults_including, which is similar to RSpec's
built-in #hash_including, but does not require the keys of `expected` to be
present in `actual` -- what matters is that for all keys in `expected`, the
value in `actual` and `expected` is the same.

    hash = Hash.new { |hash, key| 9000 }
    moo(hash)

This passes:

    expect(something)
      .to receive(:moo)
      .with(hash_with_defaults_including(stuff: 9000))

This does not pass:

    expect(something)
      .to receive(:moo)
      .with(hash_including(stuff: 9000))
@scotje
Copy link
Contributor Author

scotje commented Aug 20, 2019

Tweaked Gemfile and some of the test expectations to hopefully be compatible with both old and new Cri back to Ruby 2.1.9.

@glennsarti
Copy link
Contributor

Hrmm odd error in appveyor there.

+puppet-syntax: C:/Ruby24-x64/lib/ruby/gems/2.4.0/gems/bundler-2.0.2/lib/bundler/spec_set.rb:87:in `block in materialize': Could not find i18n-0.9.5 in any of the sources (Bundler::GemNotFound)

It's in the build install so ... 🤷‍♂️

@scotje
Copy link
Contributor Author

scotje commented Aug 21, 2019

Yeah, I was trying to repro that in my VM yesterday, going to just re-kick the Appveyor build and see what happens....

@scotje
Copy link
Contributor Author

scotje commented Aug 21, 2019

Well it's happy now. 🤷‍♂

@scotje
Copy link
Contributor Author

scotje commented Aug 22, 2019

Ping @puppetlabs/pdk for review now that this is passing.

@glennsarti glennsarti merged commit b00c515 into puppetlabs:master Aug 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants