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

Appraisal & Combustion; Rails 3, 6, & 7 Compat fixes #105

Merged
merged 51 commits into from
Apr 25, 2024
Merged
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
9b4524a
🧑‍💻 Default to No DEBUG=true
pboling Apr 24, 2024
a441d1c
👷 Setup Appraisal
pboling Apr 24, 2024
775d8f0
👷 Attempt to use custom RuboCop version
pboling Apr 24, 2024
98022ce
👷 Unspecify rubygems version for old Ruby + Rails combos
pboling Apr 24, 2024
8fe74b2
👷 Remove rubygems version for old Ruby + Rails combos
pboling Apr 24, 2024
812f187
👷 Specify old bundler version for old Ruby + Rails combos
pboling Apr 24, 2024
bcba087
👷 Experimental true for finicky bundler/rubygems combos
pboling Apr 24, 2024
1c39a85
🚨 Lint lock
pboling Apr 24, 2024
d7a996d
👷 RAILS_VERSION
pboling Apr 25, 2024
7024e25
👷 RAILS_MAJOR_MINOR
pboling Apr 25, 2024
a50d040
👷 Ancient Rails Support
pboling Apr 25, 2024
da4dc0e
👷 Fix names
pboling Apr 25, 2024
aec83d4
💚 Fix test
pboling Apr 25, 2024
9ba65ac
💚 Fix test
pboling Apr 25, 2024
abffda5
💚 Fix tests
pboling Apr 25, 2024
03f369c
💚 Fix env variables
pboling Apr 25, 2024
e6e9ee8
💚 Fix env variables
pboling Apr 25, 2024
97227c5
💚 Fix rdoc version
pboling Apr 25, 2024
bd55953
💚 Allow JSON Version for Rails 4 support
pboling Apr 25, 2024
81b4ed3
💚 consolidate on matrix.rails
pboling Apr 25, 2024
252582f
✨ Combustion Test Rails App
pboling Apr 25, 2024
80436b2
✨ Combustion Testing
pboling Apr 25, 2024
90e5fb2
👷 Combustion Testing
pboling Apr 25, 2024
d01844b
💚 Fix dependency version pins
pboling Apr 25, 2024
6245fbc
💚 Fix code coverage
pboling Apr 25, 2024
869455f
🔨 Regenerate Appraisals
pboling Apr 25, 2024
60350bf
➖ Min branch cov = 72%
pboling Apr 25, 2024
11b04bc
🔧 Fix path to gemspec
pboling Apr 25, 2024
8fb9c91
➖ rspec-rails
pboling Apr 25, 2024
8925274
➖ actionpack
pboling Apr 25, 2024
de55a08
✅ Add back Rails 3.0-, 3.1, 3.2
pboling Apr 25, 2024
58f4329
📌 rake v10 for ancient Appraisals
pboling Apr 25, 2024
535f862
📌 tzinfo v1 for ancient Rails
pboling Apr 25, 2024
8ce2ba0
📌 delivery_method :test for Rails 3
pboling Apr 25, 2024
cfe23bf
📌 undefined method `unparsed_value' for #<Mail::OptionalField> on Rai…
pboling Apr 25, 2024
8e79c63
📌 branch coverage @ 71%
pboling Apr 25, 2024
9b7c64a
📌 undefined method `unparsed_value' for #<Mail::OptionalField> on Rai…
pboling Apr 25, 2024
34a9110
💚 Fix test on Rails 3
pboling Apr 25, 2024
20bb3fa
💚 Fix typo
pboling Apr 25, 2024
7074380
🚨 Lint lock
pboling Apr 25, 2024
636adab
👷 Turn off experimental CI flags
pboling Apr 25, 2024
c8b1006
👷 prefer block_is_expected
pboling Apr 25, 2024
3f42d56
🔥 Remove bogus comment
pboling Apr 25, 2024
a167e45
🔥 Remove bogus comments
pboling Apr 25, 2024
cbd28fe
📝 Improve documentation
pboling Apr 25, 2024
5d18028
🚨 Disable RSpec/ExampleLength
pboling Apr 25, 2024
8f81cd4
📝 Documentation
pboling Apr 25, 2024
842e47a
🔧 89% coverage
pboling Apr 25, 2024
35bc9ee
🔖 Prepare release v2.0.6
pboling Apr 25, 2024
b2f8166
🚨 Lint lock
pboling Apr 25, 2024
134b8aa
📝 Improved documentation
pboling Apr 25, 2024
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
Prev Previous commit
Next Next commit
💚 consolidate on matrix.rails
pboling committed Apr 25, 2024
commit 81b4ed348aef8d75b8ce9ff283b6e2f696fed163
10 changes: 1 addition & 9 deletions .github/workflows/ancient.yml
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ jobs:
# rspec-rails uses RAILS_VERSION internally
RAILS_VERSION: "~> ${{ matrix.rails }}"
# Our spec suite (not runtime code) uses RAILS_MAJOR_MINOR internally
RAILS_MAJOR_MINOR: ${{ matrix.env.RAILS_MAJOR_MINOR }}
RAILS_MAJOR_MINOR: ${{ matrix.rails }}
strategy:
fail-fast: false
matrix:
@@ -41,32 +41,24 @@ jobs:
bundler: '1.17.3'
gemfile: vanilla
rails: "4.2"
env:
RAILS_MAJOR_MINOR: "4.2"
- ruby: "2.3"
experimental: true
appraisal: "rails-4-2"
rubygems: "3.3.27"
bundler: '1.17.3'
gemfile: vanilla
rails: "4.2"
env:
RAILS_MAJOR_MINOR: "4.2"
- ruby: "2.3"
experimental: true
appraisal: "rails-4-1"
bundler: '1.17.3'
gemfile: vanilla
rails: "4.1"
env:
RAILS_MAJOR_MINOR: "4.1"
- ruby: "2.3"
appraisal: "rails-4-0"
bundler: '1.17.3'
gemfile: vanilla
rails: "4.0"
env:
RAILS_MAJOR_MINOR: "4.0"
runs-on: ubuntu-20.04
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
steps:
44 changes: 1 addition & 43 deletions .github/workflows/legacy.yml
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ jobs:
# rspec-rails uses RAILS_VERSION internally
RAILS_VERSION: "~> ${{ matrix.rails }}"
# Our spec suite (not runtime code) uses RAILS_MAJOR_MINOR internally
RAILS_MAJOR_MINOR: ${{ matrix.env.RAILS_MAJOR_MINOR }}
RAILS_MAJOR_MINOR: ${{ matrix.rails }}
strategy:
fail-fast: false
matrix:
@@ -40,168 +40,126 @@ jobs:
bundler: none
gemfile: vanilla
rails: "7.1"
env:
RAILS_MAJOR_MINOR: "7.1"
- ruby: "3.0"
appraisal: "rails-7-0"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "7.0"
env:
RAILS_MAJOR_MINOR: "7.0"
- ruby: "3.0"
appraisal: "rails-6-1"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "6.1"
env:
RAILS_MAJOR_MINOR: "6.1"
- ruby: "2.7"
appraisal: "rails-7-1"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "7.1"
env:
RAILS_MAJOR_MINOR: "7.1"
- ruby: "2.7"
appraisal: "rails-7-0"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "7.0"
env:
RAILS_MAJOR_MINOR: "7.0"
- ruby: "2.7"
appraisal: "rails-6-1"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "6.1"
env:
RAILS_MAJOR_MINOR: "6.1"
- ruby: "2.7"
appraisal: "rails-6-0"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "6.0"
env:
RAILS_MAJOR_MINOR: "6.0"
- ruby: "2.7"
appraisal: "rails-5-2"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "5.2"
env:
RAILS_MAJOR_MINOR: "5.2"
- ruby: "2.6"
appraisal: "rails-6-1"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "6.1"
env:
RAILS_MAJOR_MINOR: "6.1"
- ruby: "2.6"
appraisal: "rails-6-0"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "6.0"
env:
RAILS_MAJOR_MINOR: "6.0"
- ruby: "2.6"
appraisal: "rails-5-2"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "5.2"
env:
RAILS_MAJOR_MINOR: "5.2"
- ruby: "2.5"
appraisal: "rails-6-1"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "6.1"
env:
RAILS_MAJOR_MINOR: "6.1"
- ruby: "2.5"
appraisal: "rails-6-0"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "6.0"
env:
RAILS_MAJOR_MINOR: "6.0"
- ruby: "2.5"
appraisal: "rails-5-2"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "5.2"
env:
RAILS_MAJOR_MINOR: "5.2"
- ruby: "2.5"
appraisal: "rails-5-1"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "5.1"
env:
RAILS_MAJOR_MINOR: "5.1"
- ruby: "2.4"
appraisal: "rails-5-2"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "5.2"
env:
RAILS_MAJOR_MINOR: "5.2"
- ruby: "2.4"
appraisal: "rails-5-1"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "5.1"
env:
RAILS_MAJOR_MINOR: "5.1"
- ruby: "2.4"
appraisal: "rails-5-0"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "5.0"
env:
RAILS_MAJOR_MINOR: "5.0"
- ruby: "2.3"
appraisal: "rails-5-2"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "5.2"
env:
RAILS_MAJOR_MINOR: "5.2"
- ruby: "2.3"
appraisal: "rails-5-1"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "5.1"
env:
RAILS_MAJOR_MINOR: "5.1"
- ruby: "2.3"
appraisal: "rails-5-0"
rubygems: "3.3.27"
bundler: none
gemfile: vanilla
rails: "5.0"
env:
RAILS_MAJOR_MINOR: "5.0"
runs-on: ubuntu-20.04
continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
steps:
18 changes: 1 addition & 17 deletions .github/workflows/supported.yml
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ jobs:
# rspec-rails uses RAILS_VERSION internally
RAILS_VERSION: "~> ${{ matrix.rails }}"
# Our spec suite (not runtime code) uses RAILS_MAJOR_MINOR internally
RAILS_MAJOR_MINOR: ${{ matrix.env.RAILS_MAJOR_MINOR }}
RAILS_MAJOR_MINOR: ${{ matrix.rails }}
runs-on: ubuntu-latest
strategy:
matrix:
@@ -46,65 +46,49 @@ jobs:
bundler: latest
gemfile: vanilla
rails: "7.1"
env:
RAILS_MAJOR_MINOR: "7.1"
- ruby: "3.3"
appraisal: "rails-7-0"
rubygems: latest
bundler: latest
gemfile: vanilla
rails: "7.0"
env:
RAILS_MAJOR_MINOR: "7.0"
- ruby: "3.2"
appraisal: "rails-7-1"
rubygems: latest
bundler: latest
gemfile: vanilla
rails: "7.1"
env:
RAILS_MAJOR_MINOR: "7.1"
- ruby: "3.2"
appraisal: "rails-7-0"
rubygems: latest
bundler: latest
gemfile: vanilla
rails: "7.0"
env:
RAILS_MAJOR_MINOR: "7.0"
#- '3.1' - Rails 7.1 on Ruby 3.1 tests are run by coverage.yml
- ruby: "3.1"
appraisal: "rails-7-0"
rubygems: latest
bundler: latest
gemfile: vanilla
rails: "7.0"
env:
RAILS_MAJOR_MINOR: "7.0"
- ruby: "3.1"
appraisal: "rails-6-1"
rubygems: latest
bundler: latest
gemfile: vanilla
rails: "6.1"
env:
RAILS_MAJOR_MINOR: "6.1"
- ruby: "truffleruby"
appraisal: "rails-7-1"
rubygems: latest
bundler: latest
gemfile: vanilla
rails: "7.1"
env:
RAILS_MAJOR_MINOR: "7.1"
- ruby: "jruby"
appraisal: "rails-7-1"
rubygems: latest
bundler: latest
gemfile: vanilla
rails: "7.1"
env:
RAILS_MAJOR_MINOR: "7.1"
steps:
- name: Checkout
uses: actions/checkout@v4

Unchanged files with check annotations Beta

config.to_prepare do |app|
# For the reasoning behind the difference between v5 and v6 engines,
# - see: https://github.com/rails/rails/issues/36546#issuecomment-850888284
Rails.application.config.action_mailer.register_interceptor(SanitizeEmail::Bleach)

Check warning on line 12 in lib/sanitize_email/engine_v6.rb

Codecov / codecov/patch

lib/sanitize_email/engine_v6.rb#L12

Added line #L12 was not covered by tests
end
end
end