Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ruby 2.4 support in travis #205

Merged
merged 4 commits into from
May 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ rvm:
- 2.1.6
- 2.2.4
- 2.3.1
- 2.4.1

2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gemspec
gem 'bump'
gem 'rake'
gem 'rspec'
gem 'activerecord'
gem 'activerecord', "~>4.2.8"
gem 'ruby-progressbar'
gem 'rspec-rerun'
gem 'rspec-legacy_formatters'
Expand Down
74 changes: 35 additions & 39 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,60 +6,56 @@ PATH
GEM
remote: https://rubygems.org/
specs:
activemodel (4.2.1)
activesupport (= 4.2.1)
activemodel (4.2.8)
activesupport (= 4.2.8)
builder (~> 3.1)
activerecord (4.2.1)
activemodel (= 4.2.1)
activesupport (= 4.2.1)
activerecord (4.2.8)
activemodel (= 4.2.8)
activesupport (= 4.2.8)
arel (~> 6.0)
activesupport (4.2.1)
activesupport (4.2.8)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.0)
builder (3.2.2)
bump (0.5.2)
diff-lcs (1.2.5)
i18n (0.7.0)
json (1.8.2)
json (1.8.2-java)
minitest (5.6.1)
mysql2 (0.3.18)
rake (10.4.2)
rspec (3.2.0)
rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.2.0)
rspec-core (3.2.3)
rspec-support (~> 3.2.0)
rspec-expectations (3.2.1)
arel (6.0.4)
builder (3.2.3)
bump (0.5.3)
diff-lcs (1.3)
i18n (0.8.1)
minitest (5.10.1)
mysql2 (0.4.6)
rake (12.0.0)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
rspec-mocks (~> 3.6.0)
rspec-core (3.6.0)
rspec-support (~> 3.6.0)
rspec-expectations (3.6.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-legacy_formatters (1.0.0)
rspec-core (>= 3.0.0.beta2)
rspec-support (>= 3.0.0.beta2)
rspec-mocks (3.2.1)
rspec-support (~> 3.6.0)
rspec-legacy_formatters (1.0.1)
rspec (~> 3.0)
rspec-mocks (3.6.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-rerun (0.3.0)
rspec
rspec-support (3.2.2)
ruby-progressbar (1.7.5)
sqlite3 (1.3.11)
thread_safe (0.3.5)
thread_safe (0.3.5-java)
tzinfo (1.2.2)
rspec-support (~> 3.6.0)
rspec-rerun (1.1.0)
rspec (~> 3.0)
rspec-support (3.6.0)
ruby-progressbar (1.8.1)
sqlite3 (1.3.13)
thread_safe (0.3.6)
thread_safe (0.3.6-java)
tzinfo (1.2.3)
thread_safe (~> 0.1)

PLATFORMS
java
ruby

DEPENDENCIES
activerecord
activerecord (~> 4.2.8)
bump
mysql2
parallel!
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ require 'bundler/setup'
require 'bundler/gem_tasks'
require 'bump/tasks'
require "rspec/core/rake_task"
require "rspec-rerun"
require 'rspec-rerun/tasks'

task :default => "rspec-rerun:spec"
6 changes: 5 additions & 1 deletion spec/cases/each_with_ar_sqlite.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
STDOUT.sync = true
in_worker_type = "in_#{ENV.fetch('WORKER_TYPE')}".to_sym

temp = Tempfile.new("db")

ActiveRecord::Schema.verbose = false
ActiveRecord::Base.establish_connection(
:adapter => "sqlite3",
:database => Tempfile.new("db").path
:database => temp.path
)

class User < ActiveRecord::Base
Expand All @@ -34,3 +36,5 @@ class User < ActiveRecord::Base

puts "Parent: #{User.first.name}"

temp.close
temp.unlink