Skip to content

Commit

Permalink
get tests working again maybe
Browse files Browse the repository at this point in the history
  • Loading branch information
pcai committed Sep 28, 2024
1 parent b848978 commit dea958c
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 6 deletions.
22 changes: 22 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/ruby
{
"name": "Ruby",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/ruby:1-3.3-bullseye"

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "ruby --version",

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
- '2.7.2'
- '3.0.0'
- '3.1.2'
- '3.2'
- '3.3'
- 'head'
gemfile:
- gemfiles/rails_5_1.gemfile
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source 'https://rubygems.org'
gemspec

group :development, :test do
gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
gem "sqlite3", '~> 1.4', :platform => [:ruby, :mswin, :mingw]
gem "activerecord-jdbcsqlite3-adapter", '~> 1.3.13', :platform => :jruby
gem "test-unit", "~> 3.0"
end
8 changes: 6 additions & 2 deletions derailed_benchmarks.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,19 @@ Gem::Specification.new do |gem|
gem.add_dependency "rack", ">= 1"
gem.add_dependency "rake", "> 10", "< 14"
gem.add_dependency "thor", ">= 0.19", "< 2"
gem.add_dependency "ruby-statistics", ">= 2.1"
gem.add_dependency "ruby-statistics", ">= 4.0"
gem.add_dependency "mini_histogram", ">= 0.3.0"
gem.add_dependency "dead_end", ">= 0"
gem.add_dependency "rack-test", ">= 0"
gem.add_dependency "base64", ">= 0"
gem.add_dependency "mutex_m", ">= 0"
gem.add_dependency "bigdecimal", ">= 0"
gem.add_dependency "drb", ">= 0"

gem.add_development_dependency "appraisal"
gem.add_development_dependency "webrick", ">= 0"
gem.add_development_dependency "capybara", "~> 2"
gem.add_development_dependency "m"
gem.add_development_dependency "rails", "> 3", "<= 7"
gem.add_development_dependency "rails", "> 3", "< 7.1"
gem.add_development_dependency "devise", "> 3", "< 6"
end
2 changes: 1 addition & 1 deletion gemfiles/rails_6_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem "net-imap", require: false
gem "net-pop", require: false

group :development, :test do
gem "sqlite3", platform: [:ruby, :mswin, :mingw]
gem "sqlite3", '~> 1.4', platform: [:ruby, :mswin, :mingw]
gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", platform: :jruby
gem "test-unit", "~> 3.0"
end
Expand Down
2 changes: 1 addition & 1 deletion lib/derailed_benchmarks/stats_from_dir.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

require 'bigdecimal'
require 'statistics'
require 'ruby-statistics'
require 'stringio'
require 'mini_histogram'
require 'mini_histogram/plot'
Expand Down
2 changes: 1 addition & 1 deletion test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

# https://github.com/plataformatec/devise/blob/master/test/orm/active_record.rb
migrate_path = File.expand_path("../rails_app/db/migrate", __FILE__)
if Rails.version >= "6.0"
if Rails.version >= "6.0" && Rails.version < "7.0"
ActiveRecord::MigrationContext.new(migrate_path, ActiveRecord::SchemaMigration).migrate
elsif Rails.version.start_with? "5.2"
ActiveRecord::MigrationContext.new(migrate_path).migrate
Expand Down

0 comments on commit dea958c

Please sign in to comment.