File tree 4 files changed +18
-3
lines changed
4 files changed +18
-3
lines changed Original file line number Diff line number Diff line change @@ -36,15 +36,29 @@ jobs:
36
36
fail-fast : false
37
37
matrix :
38
38
include :
39
- # Edge Rails (?) builds >= 2.7
39
+ # Edge Rails (?) builds >= 3.1
40
40
- ruby : 3.2
41
41
env :
42
42
RAILS_VERSION : ' main'
43
43
- ruby : 3.1
44
44
env :
45
45
RAILS_VERSION : ' main'
46
46
47
+ # Rails 7.2 builds >= 3.1
48
+ - ruby : 3.3
49
+ env :
50
+ RAILS_VERSION : ' ~> 7.2.0'
51
+ - ruby : 3.2
52
+ env :
53
+ RAILS_VERSION : ' ~> 7.2.0'
54
+ - ruby : 3.1
55
+ env :
56
+ RAILS_VERSION : ' ~> 7.2.0'
57
+
47
58
# Rails 7.1 builds >= 2.7
59
+ - ruby : 3.3
60
+ env :
61
+ RAILS_VERSION : ' ~> 7.1.0'
48
62
- ruby : 3.2
49
63
env :
50
64
RAILS_VERSION : ' ~> 7.1.0'
Original file line number Diff line number Diff line change 67
67
68
68
copy_file capybara_backport_path , 'spec/support/capybara.rb'
69
69
70
- if Rails ::VERSION ::STRING > '7'
70
+ if Rails ::VERSION ::STRING > '7' && Rails :: VERSION :: STRING < '7.2'
71
71
create_file 'app/assets/config/manifest.js' do
72
72
"//= link application.css"
73
73
end
Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ exit(0) if ENV['NO_ACTION_MAILER']
69
69
if ENV [ 'DEFAULT_URL' ]
70
70
puts ActionMailer ::Base . default_url_options [ :host ]
71
71
elsif defined? ( ::ActionMailer ::Preview )
72
- if Rails ::VERSION ::STRING . start_with? ( ' 7.1' )
72
+ if Rails ::VERSION ::STRING . to_f >= 7.1
73
73
puts Rails . application . config . action_mailer . preview_paths
74
74
else
75
75
puts Rails . application . config . action_mailer . preview_path
Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ def with_clean_env
28
28
expect ( `bundle exec #{ script } 2>&1` )
29
29
. to match ( /uninitialized constant RSpec::Support/ )
30
30
. or match ( /undefined method `require_rspec_core' for RSpec::Support:Module/ )
31
+ . or match ( /undefined method `require_rspec_core' for module RSpec::Support/ )
31
32
32
33
expect ( $?. exitstatus ) . to eq ( 1 )
33
34
end
You can’t perform that action at this time.
0 commit comments