Skip to content

Commit 8823f98

Browse files
authored
[CI] Update travis.yml download url and matrix (elastic#801)
* [CI] Update url to download elasticsearch in travis yml * [CI] Include ruby 2.5.1 in travis matrix * [CI] Update test to account for #to_ary called on objects recursively via #flatten in ruby < 2.3 * [CI] Further updates to travis matrix for latest versions in each series * [CI] Remove extra line for debugging
1 parent e1fc0e6 commit 8823f98

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.travis.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,28 @@ branches:
2020

2121
matrix:
2222
include:
23-
- rvm: 2.2.6
23+
- rvm: 2.2.10
2424
jdk: oraclejdk8
2525
env: TEST_SUITE=unit
2626

27-
- rvm: 2.3.3
27+
- rvm: 2.3.7
28+
jdk: oraclejdk8
29+
env: TEST_SUITE=unit
30+
31+
- rvm: 2.5.1
2832
jdk: oraclejdk8
2933
env: TEST_SUITE=unit
3034

3135
- rvm: 2.3.3
3236
jdk: oraclejdk8
33-
env: TEST_SUITE=integration QUIET=y SERVER=start TEST_CLUSTER_LOGS=/tmp/log TEST_CLUSTER_COMMAND=/tmp/elasticsearch-6.0.0-alpha1-SNAPSHOT/bin/elasticsearch
37+
env: TEST_SUITE=integration QUIET=y SERVER=start TEST_CLUSTER_LOGS=/tmp/log TEST_CLUSTER_COMMAND=/tmp/elasticsearch-6.3.0/bin/elasticsearch
3438

3539
before_install:
3640
- gem update --system --no-rdoc --no-ri
3741
- gem --version
3842
- gem install bundler -v 1.14.3 --no-rdoc --no-ri
3943
- bundle version
40-
- curl -sS https://snapshots.elastic.co/downloads/elasticsearch/elasticsearch-6.0.0-alpha1-SNAPSHOT.tar.gz | tar xz -C /tmp
44+
- curl -sS https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.3.0.tar.gz | tar xz -C /tmp
4145

4246
install:
4347
- bundle install

elasticsearch-model/test/unit/multimodel_test.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ class Elasticsearch::Model::MultimodelTest < Test::Unit::TestCase
44

55
context "Multimodel class" do
66
setup do
7-
title = stub('Foo', index_name: 'foo_index', document_type: 'foo')
8-
series = stub('Bar', index_name: 'bar_index', document_type: 'bar')
7+
title = stub('Foo', index_name: 'foo_index', document_type: 'foo', to_ary: nil)
8+
series = stub('Bar', index_name: 'bar_index', document_type: 'bar', to_ary: nil)
99
@multimodel = Elasticsearch::Model::Multimodel.new(title, series)
1010
end
1111

0 commit comments

Comments
 (0)