Merge #112 'Remove support for Ruby v1.9.3'. Update History.md.

cucumber · Jul 3, 2016 · 818be3c · 818be3c
2 parents c3b42a1 + 23f0b8d
commit 818be3c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,11 @@
 sudo: false
 
 rvm:
+  - 2.3.0
   - 2.2
   - 2.1
   - 2.0.0
-  - 1.9.3
-  - jruby
+  - jruby-9.0.5.0
 
 # whitelist
 branches:

diff --git a/HISTORY.md b/HISTORY.md
@@ -10,6 +10,10 @@
 * Handle incomplete examples to scenario outlines. ([109](https://github.com/cucumber/cucumber-ruby-core/pull/109) @brasmusson)
 * Add with_filtered_backtrace method to unknown result ([107](https://github.com/cucumber/cucumber-ruby-core/pull/107) @dansscheider)
 
+### Removed Features
+
+* Remove support for Ruby v1.9.3. ([112](https://github.com/cucumber/cucumber-ruby-core/pull/112) @brasmusson)
+
 ## [v1.5.0](https://github.com/cucumber/cucumber-ruby-core/compare/v1.4.0...v1.5.0)
 
 ### New Features

diff --git a/spec/cucumber/core/test/filters/locations_filter_spec.rb b/spec/cucumber/core/test/filters/locations_filter_spec.rb
@@ -365,6 +365,7 @@ def test_case_named(name)
       end
 
       max_duration_ms = 10000
+      max_duration_ms = max_duration_ms * 2.5 if defined?(JRUBY_VERSION)
       it "filters #{num_features * num_scenarios_per_feature} test cases within #{max_duration_ms}ms" do
         filter = Test::LocationsFilter.new(locations)
         Timeout.timeout(max_duration_ms / 1000.0) do