diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c763a1c..05665d82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,20 @@ Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CONTRIBUTING.md) on how to contribute to Cucumber. -## [master](https://github.com/cucumber/cucumber-rails/compare/v1.8.0...master) (Not yet released) +## [master](https://github.com/cucumber/cucumber-rails/compare/v2.0.0...master) (Not yet released) + +### New Features + + * + +### Changed + + * + +### Fixed + + * + +## [v2.0.0](https://github.com/cucumber/cucumber-rails/compare/v1.8.0...v2.0.0) (Not yet released) ### New Features @@ -10,13 +24,11 @@ Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CO ### Changed + * **Breaking change:** `web_steps` have been completely removed from cucumber-rails + ([#437](https://github.com/cucumber/cucumber-rails/pull/437) [luke-hill]) + * Altered some branching logic in tests designed to cater for old ruby/rails versions ([#433](https://github.com/cucumber/cucumber-rails/pull/433) [luke-hill]) - * `aruba` is now included as a core-dependency; not a test-dependency - -### Fixed - - * ## [v1.8.0](https://github.com/cucumber/cucumber-rails/compare/v1.7.0..v1.8.0) (2019-08-06) diff --git a/cucumber-rails.gemspec b/cucumber-rails.gemspec index d0021f7c..43428927 100644 --- a/cucumber-rails.gemspec +++ b/cucumber-rails.gemspec @@ -4,7 +4,7 @@ $LOAD_PATH.unshift File.expand_path('lib', __dir__) Gem::Specification.new do |s| s.name = 'cucumber-rails' - s.version = '1.8.0' + s.version = '2.0.0' s.authors = ['Aslak Hellesøy', 'Dennis Blöte', 'Rob Holland'] s.description = 'Cucumber Generator and Runtime for Rails' s.summary = "#{s.name}-#{s.version}" @@ -13,7 +13,6 @@ Gem::Specification.new do |s| s.license = 'MIT' - s.add_runtime_dependency('aruba', '~> 0.14.4') s.add_runtime_dependency('capybara', ['>= 2.12', '< 4']) s.add_runtime_dependency('cucumber', ['>= 3.0.2', '< 4']) s.add_runtime_dependency('mime-types', ['>= 2.0', '< 4']) @@ -22,6 +21,7 @@ Gem::Specification.new do |s| # Main development dependencies s.add_development_dependency('ammeter', '>= 1.1.4') + s.add_development_dependency('aruba', '~> 0.14.4') s.add_development_dependency('appraisal', '~> 2.2') s.add_development_dependency('bundler', '>= 1.17') s.add_development_dependency('rails', ['>= 4.2', '< 7']) diff --git a/lib/cucumber/rails.rb b/lib/cucumber/rails.rb index 219ff84f..23649b5a 100644 --- a/lib/cucumber/rails.rb +++ b/lib/cucumber/rails.rb @@ -29,7 +29,6 @@ require 'cucumber/rails/hooks' require 'cucumber/rails/capybara' require 'cucumber/rails/database' - require 'aruba/cucumber' MultiTest.disable_autorun else