Skip to content

Commit

Permalink
Merge branch 'jesperronn-patch-1'
Browse files Browse the repository at this point in the history
When I rely on a dependency for a major feature
I want its latest version to be supported
So that I don't miss major changes in its API
  • Loading branch information
gonzalo-bulnes committed Jun 12, 2019
2 parents e416a06 + 2c9c583 commit 829a5b4
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased] - 2017-12-21

### Added

- Support for Capybara 2 and 3 - @jesperronn

### Fixed

- Remove `Gemfile.lock` - mostly to acknowledge that it is only used in development and is not really necessary.
Expand Down Expand Up @@ -117,4 +121,3 @@ The original implementation of the Rake task was shared in this [gist][gist].
## Inspiration

Thanks to @nTraum for pointing me at http://keepachangelog.com and to @olivierlacan for writing it in the first place!

2 changes: 1 addition & 1 deletion doc/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Intended API
============

This document is intended to allow discussing the Bathysphere API before it is implemented.
This document is intended to allow discussing the Dredd::Rack API before it is implemented.

Its contents will be moved to the gem [README][readme] when the corresponding features are implemented.

Expand Down
2 changes: 1 addition & 1 deletion dredd-rack.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
gem.files = Dir["{doc,lib}/**/*", "CHANGELOG.md", "Gemfile", "LICENSE", "Rakefile", "README.md"]
gem.test_files = Dir["spec/**/*"]

gem.add_dependency "capybara", "~> 2.4"
gem.add_dependency "capybara", ">= 2.4", "< 4"
gem.add_dependency "rake", ">= 10.4", "< 13"
gem.add_dependency "rainbow", "~> 2.0"

Expand Down
3 changes: 3 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
require 'bundler/setup'

Bundler.setup

require 'dredd/rack'

Dir["./spec/support/**/*.rb"].sort.each { |f| require f; puts f }

Capybara.server = :webrick

# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
RSpec.configure do |config|
# make sure the deprecated RSpec 2 syntax is not used
Expand Down

0 comments on commit 829a5b4

Please sign in to comment.