Skip to content

Commit

Permalink
Rails 6 & Ruby 2.7 update & Remove useless browser testing gems
Browse files Browse the repository at this point in the history
  • Loading branch information
ArnoHolo committed Mar 17, 2020
1 parent cdb1910 commit 675032b
Show file tree
Hide file tree
Showing 9 changed files with 168 additions and 139 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ orbs:

defaults: &defaults
docker:
- image: circleci/ruby:2.6.5-browsers
- image: circleci/ruby:2.7.0-browsers
- image: circleci/postgres:11.5
environment:
POSTGRES_USER: moss_back_test
Expand Down
18 changes: 15 additions & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ AllCops:
- "tmp/**/*"
- "db/schema.rb"

Metrics/LineLength:
Layout/LineLength:
Max: 120

# TODO: Enable this
Metrics/BlockLength:
Exclude:
- "**/*_spec.rb"
Enabled: false

Style/Documentation:
Enabled: false
Expand All @@ -31,3 +31,15 @@ RSpec/ExampleLength:

RSpec/NestedGroups:
Max: 4

# New rules to opt-in after v0.80
# Cf: https://docs.rubocop.org/en/latest/versioning/

Style/HashEachMethods:
Enabled: true

Style/HashTransformKeys:
Enabled: true

Style/HashTransformValues:
Enabled: true
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.6.5
ruby-2.7.0
17 changes: 5 additions & 12 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.6.5'
ruby '2.7.0'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.3'
gem 'rails', '~> 6.0.2', '>= 6.0.2.1'
# Use postgresql as the database for Active Record
gem 'pg'
# Use Puma as the app server
gem 'puma', '~> 3.12'
gem 'puma', '~> 4.1'

# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'mini_racer', platforms: :ruby
Expand All @@ -22,7 +22,7 @@ gem 'jbuilder', '~> 2.5'
# gem 'redis', '~> 4.0'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false
gem 'bootsnap', '>= 1.4.2', require: false

gem 'rack-cors'

Expand All @@ -42,23 +42,16 @@ group :development, :test do
end

group :development do
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'rubocop', require: false
gem 'rubocop-rspec', require: false
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'web-console', '>= 3.3.0'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

group :test do
gem 'shoulda-matchers'
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15'
gem 'selenium-webdriver'
# Easy installation and use of chromedriver to run system tests with Chrome
gem 'chromedriver-helper'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
Expand Down
Loading

0 comments on commit 675032b

Please sign in to comment.