Skip to content

Commit

Permalink
Fix tests for Postgis adapter
Browse files Browse the repository at this point in the history
  • Loading branch information
mlarraz committed Feb 9, 2021
1 parent 870abec commit 523259b
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 17 deletions.
3 changes: 1 addition & 2 deletions gemfiles/activerecord_5.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ source "https://rubygems.org"
gemspec path: "../"

gem "activerecord", "~> 5.2.0"

# gem "mysql2", "~> 0.4.10", platform: :ruby
gem "activerecord-postgis-adapter", "~> 5.0"
3 changes: 1 addition & 2 deletions gemfiles/activerecord_6.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ source "https://rubygems.org"
gemspec path: "../"

gem "activerecord", "~> 6.0.0"

# gem "mysql2", "~> 0.4.10", platform: :ruby
gem "activerecord-postgis-adapter", "~> 6.0"
3 changes: 1 addition & 2 deletions gemfiles/activerecord_6.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ source "https://rubygems.org"
gemspec path: "../"

gem "activerecord", "~> 6.1.0"

# gem "mysql2", "~> 0.4.10", platform: :ruby
gem "activerecord-postgis-adapter", "~> 6.0"
1 change: 0 additions & 1 deletion makara.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,5 @@ Gem::Specification.new do |gem|
gem.add_development_dependency "pry-byebug"
gem.add_development_dependency "mysql2"
gem.add_development_dependency "pg"
gem.add_development_dependency "rgeo"
end
end
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
# RGeo doesn't play well with JRuby and to avoid complicated test setup
# we're only testing ActiveRecord version ~> 4.2
# RGeo doesn't play well with JRuby

require 'active_record'

# TODO: test this in AR 5+ ?
if RUBY_ENGINE == 'ruby' &&
ActiveRecord::VERSION::MAJOR == 4 &&
ActiveRecord::VERSION::MINOR >= 2

if RUBY_ENGINE == 'ruby'
require 'spec_helper'
require 'rgeo'
require 'activerecord-postgis-adapter'
Expand Down
3 changes: 0 additions & 3 deletions spec/support/postgis_database.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
test:
adapter: 'makara_postgis'
database: 'makara_test'
username: 'root'
password: ''

timeout: 5000

makara:
Expand Down

0 comments on commit 523259b

Please sign in to comment.