Skip to content

Commit 283506f

Browse files
authored
Merge pull request rails#282 from rails/flavorjones-fix-user-journey-for-rails-71
test: fix user journey tests to support Rails 7.1
2 parents f8ee6a5 + 01f1708 commit 283506f

File tree

2 files changed

+77
-45
lines changed

2 files changed

+77
-45
lines changed

Gemfile.lock

+70-44
Original file line numberDiff line numberDiff line change
@@ -7,106 +7,132 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
actionmailer (7.0.6)
11-
actionpack (= 7.0.6)
12-
actionview (= 7.0.6)
13-
activejob (= 7.0.6)
14-
activesupport (= 7.0.6)
10+
actionmailer (7.1.0)
11+
actionpack (= 7.1.0)
12+
actionview (= 7.1.0)
13+
activejob (= 7.1.0)
14+
activesupport (= 7.1.0)
1515
mail (~> 2.5, >= 2.5.4)
1616
net-imap
1717
net-pop
1818
net-smtp
19-
rails-dom-testing (~> 2.0)
20-
actionpack (7.0.6)
21-
actionview (= 7.0.6)
22-
activesupport (= 7.0.6)
23-
rack (~> 2.0, >= 2.2.4)
19+
rails-dom-testing (~> 2.2)
20+
actionpack (7.1.0)
21+
actionview (= 7.1.0)
22+
activesupport (= 7.1.0)
23+
nokogiri (>= 1.8.5)
24+
rack (>= 2.2.4)
25+
rack-session (>= 1.0.1)
2426
rack-test (>= 0.6.3)
25-
rails-dom-testing (~> 2.0)
26-
rails-html-sanitizer (~> 1.0, >= 1.2.0)
27-
actionview (7.0.6)
28-
activesupport (= 7.0.6)
27+
rails-dom-testing (~> 2.2)
28+
rails-html-sanitizer (~> 1.6)
29+
actionview (7.1.0)
30+
activesupport (= 7.1.0)
2931
builder (~> 3.1)
30-
erubi (~> 1.4)
31-
rails-dom-testing (~> 2.0)
32-
rails-html-sanitizer (~> 1.1, >= 1.2.0)
33-
activejob (7.0.6)
34-
activesupport (= 7.0.6)
32+
erubi (~> 1.11)
33+
rails-dom-testing (~> 2.2)
34+
rails-html-sanitizer (~> 1.6)
35+
activejob (7.1.0)
36+
activesupport (= 7.1.0)
3537
globalid (>= 0.3.6)
36-
activesupport (7.0.6)
38+
activesupport (7.1.0)
39+
base64
40+
bigdecimal
3741
concurrent-ruby (~> 1.0, >= 1.0.2)
42+
connection_pool (>= 2.2.5)
43+
drb
3844
i18n (>= 1.6, < 2)
3945
minitest (>= 5.1)
46+
mutex_m
4047
tzinfo (~> 2.0)
48+
base64 (0.1.1)
49+
bigdecimal (3.1.4)
4150
builder (3.2.4)
4251
concurrent-ruby (1.2.2)
52+
connection_pool (2.4.1)
4353
crass (1.0.6)
4454
date (3.3.3)
4555
debug (1.8.0)
4656
irb (>= 1.5.0)
4757
reline (>= 0.3.1)
58+
drb (2.1.1)
59+
ruby2_keywords
4860
erubi (1.12.0)
49-
globalid (1.1.0)
50-
activesupport (>= 5.0)
61+
globalid (1.2.1)
62+
activesupport (>= 6.1)
5163
i18n (1.14.1)
5264
concurrent-ruby (~> 1.0)
5365
io-console (0.6.0)
54-
irb (1.7.3)
55-
reline (>= 0.3.6)
56-
loofah (2.21.3)
66+
irb (1.8.1)
67+
rdoc
68+
reline (>= 0.3.8)
69+
loofah (2.21.4)
5770
crass (~> 1.0.2)
5871
nokogiri (>= 1.12.0)
5972
mail (2.8.1)
6073
mini_mime (>= 0.1.1)
6174
net-imap
6275
net-pop
6376
net-smtp
64-
method_source (1.0.0)
65-
mini_mime (1.1.2)
66-
mini_portile2 (2.8.2)
67-
minitest (5.18.1)
68-
net-imap (0.3.6)
77+
mini_mime (1.1.5)
78+
mini_portile2 (2.8.4)
79+
minitest (5.20.0)
80+
mutex_m (0.1.2)
81+
net-imap (0.4.1)
6982
date
7083
net-protocol
7184
net-pop (0.1.2)
7285
net-protocol
7386
net-protocol (0.2.1)
7487
timeout
75-
net-smtp (0.3.3)
88+
net-smtp (0.4.0)
7689
net-protocol
77-
nokogiri (1.15.3)
90+
nokogiri (1.15.4)
7891
mini_portile2 (~> 2.8.2)
7992
racc (~> 1.4)
80-
nokogiri (1.15.3-x86_64-darwin)
93+
nokogiri (1.15.4-x86_64-darwin)
8194
racc (~> 1.4)
82-
nokogiri (1.15.3-x86_64-linux)
95+
nokogiri (1.15.4-x86_64-linux)
8396
racc (~> 1.4)
97+
psych (5.1.0)
98+
stringio
8499
racc (1.7.1)
85-
rack (2.2.7)
100+
rack (3.0.8)
101+
rack-session (2.0.0)
102+
rack (>= 3.0.0)
86103
rack-test (2.1.0)
87104
rack (>= 1.3)
88-
rails-dom-testing (2.1.1)
105+
rackup (2.1.0)
106+
rack (>= 3)
107+
webrick (~> 1.8)
108+
rails-dom-testing (2.2.0)
89109
activesupport (>= 5.0.0)
90110
minitest
91111
nokogiri (>= 1.6)
92112
rails-html-sanitizer (1.6.0)
93113
loofah (~> 2.21)
94114
nokogiri (~> 1.14)
95-
railties (7.0.6)
96-
actionpack (= 7.0.6)
97-
activesupport (= 7.0.6)
98-
method_source
115+
railties (7.1.0)
116+
actionpack (= 7.1.0)
117+
activesupport (= 7.1.0)
118+
irb
119+
rackup (>= 1.0.0)
99120
rake (>= 12.2)
100-
thor (~> 1.0)
101-
zeitwerk (~> 2.5)
121+
thor (~> 1.0, >= 1.2.2)
122+
zeitwerk (~> 2.6)
102123
rake (13.0.6)
103-
reline (0.3.6)
124+
rdoc (6.5.0)
125+
psych (>= 4.0.0)
126+
reline (0.3.9)
104127
io-console (~> 0.5)
128+
ruby2_keywords (0.0.5)
129+
stringio (3.0.8)
105130
thor (1.2.2)
106131
timeout (0.4.0)
107132
tzinfo (2.0.6)
108133
concurrent-ruby (~> 1.0)
109-
zeitwerk (2.6.8)
134+
webrick (1.8.1)
135+
zeitwerk (2.6.12)
110136

111137
PLATFORMS
112138
ruby

test/integration/user_journey_test.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,11 @@ bundle install
2323

2424
bin/rails tailwindcss:install
2525

26+
cat <<EOF >> Rakefile
27+
task :still_here do
28+
puts "Rake process did not exit early"
29+
end
30+
EOF
31+
2632
# ensure rake tasks don't exec (#188)
27-
bin/rails tailwindcss:build about | grep "About your application"
33+
bin/rails tailwindcss:build still_here | grep "Rake process did not exit early"

0 commit comments

Comments
 (0)