Skip to content

Commit 8c89366

Browse files
comandeop
authored andcommitted
MONGOID-5118 Add 5.0 configurations to evergreen (#5021)
Co-authored-by: Oleg Pudeyev <[email protected]>
1 parent eb443d2 commit 8c89366

File tree

9 files changed

+129
-211
lines changed

9 files changed

+129
-211
lines changed

.evergreen/config.yml

Lines changed: 111 additions & 203 deletions
Large diffs are not rendered by default.

gemfiles/driver_oldstable.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.13-stable'
3+
gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.14-stable'
44

55
gem 'actionpack'
66

gemfiles/driver_oldstable_jruby.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source "https://rubygems.org"
33
# Due to https://github.com/jruby/jruby/issues/5292 /
44
# https://github.com/bundler/bundler/issues/6678 we cannot test unreleased
55
# bson with JRuby, just test the driver then
6-
gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.13-stable'
6+
gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.14-stable'
77

88
gem 'actionpack'
99
# https://github.com/jruby/jruby/issues/6573

gemfiles/driver_stable.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.14-stable'
3+
gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.15-stable'
44

55
gem 'actionpack'
66

gemfiles/driver_stable_jruby.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source "https://rubygems.org"
33
# Due to https://github.com/jruby/jruby/issues/5292 /
44
# https://github.com/bundler/bundler/issues/6678 we cannot test unreleased
55
# bson with JRuby, just test the driver then
6-
gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.14-stable'
6+
gem 'mongo', git: "https://github.com/mongodb/mongo-ruby-driver", branch: '2.15-stable'
77

88
gem 'actionpack'
99
# https://github.com/jruby/jruby/issues/6573

spec/mongoid/clients/factory_spec.rb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,15 @@
6666
expect(client).to be_a(Mongo::Client)
6767
end
6868

69-
it 'does not produce driver warnings' do
70-
Mongo::Logger.logger.should_not receive(:warn)
71-
client
69+
context 'not JRuby' do
70+
# Run this test on JRuby when driver 2.16.0 is released -
71+
# see RUBY-2771.
72+
fails_on_jruby
73+
74+
it 'does not produce driver warnings' do
75+
Mongo::Logger.logger.should_not receive(:warn)
76+
client
77+
end
7278
end
7379

7480
let(:cluster_addresses) do

spec/mongoid/clients/options_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@
124124
end
125125

126126
it 'disconnects the new cluster when the block exits' do
127+
skip 'https://jira.mongodb.org/browse/MONGOID-5130'
128+
127129
expect(connections_before).to eq(connections_after)
128130
end
129131
end

spec/mongoid/contextual/geo_near_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
end
6060

6161
it "is nil except for 4.0 sharded when it is 0" do
62-
expect(geo_near.average_distance).to be expected_value
62+
expect(geo_near.average_distance).to eq expected_value
6363
end
6464
end
6565
end

spec/mongoid/persistable/updatable_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@
458458
describe "##{method}" do
459459

460460
context "when saving with a hash field with invalid keys" do
461+
max_server_version '4.9'
461462

462463
let(:person) do
463464
Person.create
@@ -494,6 +495,7 @@
494495
end
495496

496497
context "when the document has been destroyed" do
498+
max_server_version '4.9'
497499

498500
let(:person) do
499501
Person.create

0 commit comments

Comments
 (0)