betterup / devise-doorkeeper

Integrate Doorkeeper OAuth2 tokens into Devise applications
MIT License
74 stars 20 forks source link

New version of rspec-rails (6.1.0) produced dependency conflicts #105

Closed depfu[bot] closed 7 months ago

depfu[bot] commented 10 months ago

We've tried to upgrade a dependency and got errors running Bundler. It looks like there is a version conflict between two or more dependencies. Depfu doesn't try to solve these, as this would mean to update more than one dependency at a time.

Please take a look at the exact failure to figure out if this is something you need to work on.

The bundler error message was:

Bundler could not find compatible versions for gem "activesupport":
  In Gemfile:
    travis (~> 1.10) was resolved to 1.11.1, which depends on
      gh (~> 0.13) was resolved to 0.18.0, which depends on
        activesupport (~> 5.0)

    rspec-rails (~> 6.1) was resolved to 6.1.0, which depends on
      activesupport (>= 6.1)

Bundler could not find compatible versions for gem "faraday":
  In Gemfile:
    travis (~> 1.10) was resolved to 1.11.1, which depends on
      gh (~> 0.13) was resolved to 0.15.1, which depends on
        faraday (~> 0.8)

    travis (~> 1.10) was resolved to 1.11.1, which depends on
      faraday (~> 1.0)

What changed?

✳️ rspec-rails (~> 5.0 → ~> 6.1) · Repo · Changelog

Release Notes

6.1.0 (from changelog)

Full Changelog

Enhancements:

  • Support for Rails 7.1
  • Minor tweak to generated rails_helper.rb to use Rails.root.join. (@masato-bkn, Ryo Nakamura, #2640, #2678)
  • Add RSpec::Rails::Configuration.fixture_paths configuration to support the matching change to ActiveRecord::TestFixtures, previous singular form is deprecated and will be removed in Rails 7.2. (Juan Gueçaimburu, #2673)
  • Add send_email matcher to match emails rather than specific jobs. (Andrei Kaleshka, #2670)
  • When using render in view specs, :locals will now be merged into the default implicit template, allowing render locals: {...} style calls. (Jon Rowe, #2686)
  • Add support for Rails.config.action_mailer.preview_paths on Rails 7.1/ (Jon Rowe, #2706)

Does any of this look wrong? Please let us know.

Commits

See the full diff on Github. The new version differs by more commits than we can show here.


Depfu Status

Depfu will automatically keep this PR conflict-free, as long as you don't add any commits to this branch yourself. You can also trigger a rebase manually by commenting with @depfu rebase.

All Depfu comment commands
@​depfu rebase
Rebases against your default branch and redoes this update
@​depfu recreate
Recreates this PR, overwriting any edits that you've made to it
@​depfu merge
Merges this PR once your tests are passing and conflicts are resolved
@​depfu cancel merge
Cancels automatic merging of this PR
@​depfu close
Closes this PR and deletes the branch
@​depfu reopen
Restores the branch and reopens this PR (if it's closed)
@​depfu pause
Ignores all future updates for this dependency and closes this PR
@​depfu pause [minor|major]
Ignores all future minor/major updates for this dependency and closes this PR
@​depfu resume
Future versions of this dependency will create PRs again (leaves this PR as is)
depfu[bot] commented 7 months ago

Closed in favor of #109.