Skip to content

Commit

Permalink
Update Gemfiles and remove Travis configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
spohlenz committed Feb 28, 2024
1 parent 53baf82 commit 727838c
Show file tree
Hide file tree
Showing 13 changed files with 62 additions and 114 deletions.
1 change: 0 additions & 1 deletion .rspec
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
--require spec_helper
--format documentation
--color
29 changes: 0 additions & 29 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ source 'https://rubygems.org'
gemspec

group :test do
gem "rspec-rails", "~> 5.0"
gem "rspec-rails"

gem "coveralls", require: false
gem "coveralls_reborn", require: false
gem "capybara"

gem "sqlite3", "~> 1.4"
Expand Down
20 changes: 0 additions & 20 deletions gemfiles/rails-5.0.gemfile

This file was deleted.

20 changes: 0 additions & 20 deletions gemfiles/rails-5.1.gemfile

This file was deleted.

9 changes: 3 additions & 6 deletions gemfiles/rails-5.2.gemfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
source 'https://rubygems.org'

group :test do
gem "rspec-rails", "~> 5.0"
gem "rspec-rails"

gem "coveralls", require: false
gem "capybara"

gem "sqlite3", "~> 1.3.13"
gem "devise"
end

gem "rails", "~> 5.2.0"
gem "sassc-rails"

gem "rake", "~> 12.0"
gem "sassc-rails"
gem "devise"

gem "trestle", github: "TrestleAdmin/trestle"

Expand Down
12 changes: 5 additions & 7 deletions gemfiles/rails-6.0.gemfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
source 'https://rubygems.org'

group :test do
gem "rspec-rails", "~> 5.0"
gem "rspec-rails"

gem "coveralls", require: false
gem "coveralls_reborn", require: false
gem "capybara"

gem "sqlite3", "~> 1.4"
gem "devise"
end

gem "rails", "~> 6.0.0"
gem "sassc-rails"

gem "rake", "~> 12.0"
gem "sassc-rails"
gem "sqlite3", "~> 1.4"
gem "devise"

gem "trestle", github: "TrestleAdmin/trestle"

Expand Down
10 changes: 4 additions & 6 deletions gemfiles/rails-6.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@ source 'https://rubygems.org'
group :test do
gem "rspec-rails", "~> 5.0"

gem "coveralls", require: false
gem "coveralls_reborn", require: false
gem "capybara"

gem "sqlite3", "~> 1.4"
gem "devise"
end

gem "rails", "~> 6.1.0"
gem "sassc-rails"

gem "rake", "~> 12.0"
gem "sqlite3", "~> 1.4"
gem "sassc-rails"
gem "devise"

gem "trestle", github: "TrestleAdmin/trestle"

Expand Down
12 changes: 5 additions & 7 deletions gemfiles/rails-7.0.gemfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
source 'https://rubygems.org'

group :test do
gem "rspec-rails", "~> 5.0"
gem "rspec-rails"

gem "coveralls", require: false
gem "coveralls_reborn", require: false
gem "capybara"

gem "sqlite3", "~> 1.4"
gem "devise"
end

gem "rails", "~> 7.0.0"
gem "sassc-rails"

gem "rake", "~> 12.0"
gem "sqlite3", "~> 1.4"
gem "sassc-rails"
gem "devise"

gem "trestle", github: "TrestleAdmin/trestle"

Expand Down
18 changes: 18 additions & 0 deletions gemfiles/rails-7.1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
source 'https://rubygems.org'

group :test do
gem "rspec-rails"

gem "coveralls_rebortn", require: false
gem "capybara"
end

gem "rails", "~> 7.1.0"

gem "sqlite3", "~> 1.4"
gem "sassc-rails"
gem "devise"

gem "trestle", github: "TrestleAdmin/trestle"

gemspec path: "../"
6 changes: 2 additions & 4 deletions spec/dummy/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,14 @@ module Dummy
class Application < Rails::Application
# Initialize configuration defaults for current Rails version.
case Rails.version.split(".").first(2).join(".")
when '7.1'
config.load_defaults 7.1
when '7.0'
config.load_defaults 7.0
when '6.1'
config.load_defaults 6.1
when '6.0'
config.load_defaults 6.0
when '5.2'
config.load_defaults 5.2
when '5.1'
config.load_defaults 5.1
end

# Settings in config/environments/* take precedence over those specified here.
Expand Down
33 changes: 22 additions & 11 deletions spec/dummy/config/environments/test.rb
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
# The test environment is used exclusively to run your application's
# test suite. You never need to work with it otherwise. Remember that
# your test database is "scratch space" for the test suite and is wiped
# and recreated between test runs. Don't rely on the data there!

Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.

config.cache_classes = false
# The test environment is used exclusively to run your application's
# test suite. You never need to work with it otherwise. Remember that
# your test database is "scratch space" for the test suite and is wiped
# and recreated between test runs. Don't rely on the data there!
config.cache_classes = true

# Do not eager load code on boot. This avoids loading your whole application
# just for the purpose of running a single test. If you are using a tool that
# preloads Rails for running tests, you may have to set it to true.
config.eager_load = false
if ENV["CI"] || ENV["TEST_EAGER_LOAD"]
config.eager_load = true
else
# Do not eager load code on boot. This avoids loading your whole application
# just for the purpose of running a single test. If you are using a tool that
# preloads Rails for running tests, you may have to set it to true.
config.eager_load = false
end

# Configure public file server for tests with Cache-Control for performance.
if config.respond_to?(:public_file_server)
Expand All @@ -30,7 +33,7 @@
config.cache_store = :null_store

# Raise exceptions instead of rendering exception templates.
config.action_dispatch.show_exceptions = true
config.action_dispatch.show_exceptions = :all

# Disable request forgery protection in test environment.
config.action_controller.allow_forgery_protection = false
Expand All @@ -48,6 +51,14 @@
# Print deprecation notices to the stderr.
config.active_support.deprecation = :stderr

# Debug mode disables concatenation and preprocessing of assets.
# This option may cause significant delays in view rendering with a large
# number of complex assets.
unless ENV["CI"]
config.assets.digest = false
config.assets.debug = true
end

# Raises error for missing translations.
# config.action_view.raise_on_missing_translations = true
end
2 changes: 1 addition & 1 deletion trestle-auth.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
spec.add_dependency "bcrypt", "~> 3.1.7"

spec.add_development_dependency "rspec-rails"
spec.add_development_dependency "show_me_the_cookies", "~> 5.0"
spec.add_development_dependency "show_me_the_cookies", "~> 6.0"
spec.add_development_dependency "timecop", "~> 0.9.1"
end

0 comments on commit 727838c

Please sign in to comment.