Skip to content

Commit 45464bf

Browse files
hsbthsbt
committed
Removed minitest/mock from test_gem_package_tar_writer.rb
1 parent 6e20283 commit 45464bf

File tree

1 file changed

+66
-92
lines changed

1 file changed

+66
-92
lines changed

‎test/rubygems/test_gem_package_tar_writer.rb

Lines changed: 66 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# frozen_string_literal: true
22
require 'rubygems/package/tar_test_case'
33
require 'rubygems/package/tar_writer'
4-
require 'minitest/mock'
54

65
class TestGemPackageTarWriter < Gem::Package::TarTestCase
76
def setup
@@ -28,90 +27,80 @@ def teardown
2827
end
2928

3029
def test_add_file
31-
Time.stub :now, Time.at(1458518157) do
32-
@tar_writer.add_file 'x', 0644 do |f|
33-
f.write 'a' * 10
34-
end
30+
@tar_writer.add_file 'x', 0644 do |f|
31+
f.write 'a' * 10
32+
end
3533

36-
assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
34+
assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
3735
@io.string[0, 512])
38-
end
3936
assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
4037
assert_equal 1024, @io.pos
4138
end
4239

4340
def test_add_file_source_date_epoch
4441
ENV["SOURCE_DATE_EPOCH"] = "123456789"
45-
Time.stub :now, Time.at(1458518157) do
46-
@tar_writer.mkdir 'foo', 0644
42+
@tar_writer.mkdir 'foo', 0644
4743

48-
assert_headers_equal tar_dir_header('foo', '', 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
49-
@io.string[0, 512]
50-
end
44+
assert_headers_equal tar_dir_header('foo', '', 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
45+
@io.string[0, 512]
5146
end
5247

5348
def test_add_symlink
54-
Time.stub :now, Time.at(1458518157) do
55-
@tar_writer.add_symlink 'x', 'y', 0644
49+
@tar_writer.add_symlink 'x', 'y', 0644
5650

57-
assert_headers_equal(tar_symlink_header('x', '', 0644, Time.now, 'y'),
51+
assert_headers_equal(tar_symlink_header('x', '', 0644, Time.now, 'y'),
5852
@io.string[0, 512])
59-
end
6053
assert_equal 512, @io.pos
6154
end
6255

6356
def test_add_symlink_source_date_epoch
6457
ENV["SOURCE_DATE_EPOCH"] = "123456789"
65-
Time.stub :now, Time.at(1458518157) do
66-
@tar_writer.add_symlink 'x', 'y', 0644
58+
@tar_writer.add_symlink 'x', 'y', 0644
6759

68-
assert_headers_equal(tar_symlink_header('x', '', 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc, 'y'),
60+
assert_headers_equal(tar_symlink_header('x', '', 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc, 'y'),
6961
@io.string[0, 512])
70-
end
7162
end
7263

7364
def test_add_file_digest
7465
digest_algorithms = Digest::SHA1.new, Digest::SHA512.new
7566

76-
Time.stub :now, Time.at(1458518157) do
77-
digests = @tar_writer.add_file_digest 'x', 0644, digest_algorithms do |io|
78-
io.write 'a' * 10
79-
end
67+
digests = @tar_writer.add_file_digest 'x', 0644, digest_algorithms do |io|
68+
io.write 'a' * 10
69+
end
8070

81-
assert_equal '3495ff69d34671d1e15b33a63c1379fdedd3a32a',
82-
digests['SHA1'].hexdigest
83-
assert_equal '4714870aff6c97ca09d135834fdb58a6389a50c1' \
84-
'1fef8ec4afef466fb60a23ac6b7a9c92658f14df' \
85-
'4993d6b40a4e4d8424196afc347e97640d68de61' \
86-
'e1cf14b0',
87-
digests['SHA512'].hexdigest
71+
assert_equal '3495ff69d34671d1e15b33a63c1379fdedd3a32a',
72+
digests['SHA1'].hexdigest
73+
assert_equal '4714870aff6c97ca09d135834fdb58a6389a50c1' \
74+
'1fef8ec4afef466fb60a23ac6b7a9c92658f14df' \
75+
'4993d6b40a4e4d8424196afc347e97640d68de61' \
76+
'e1cf14b0',
77+
digests['SHA512'].hexdigest
8878

89-
assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
79+
assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
9080
@io.string[0, 512])
91-
end
81+
9282
assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
9383
assert_equal 1024, @io.pos
9484
end
9585

9686
def test_add_file_digest_multiple
9787
digest_algorithms = [Digest::SHA1.new, Digest::SHA512.new]
9888

99-
Time.stub :now, Time.at(1458518157) do
100-
digests = @tar_writer.add_file_digest 'x', 0644, digest_algorithms do |io|
101-
io.write 'a' * 10
102-
end
89+
digests = @tar_writer.add_file_digest 'x', 0644, digest_algorithms do |io|
90+
io.write 'a' * 10
91+
end
10392

104-
assert_equal '3495ff69d34671d1e15b33a63c1379fdedd3a32a',
105-
digests['SHA1'].hexdigest
106-
assert_equal '4714870aff6c97ca09d135834fdb58a6389a50c1' \
107-
'1fef8ec4afef466fb60a23ac6b7a9c92658f14df' \
108-
'4993d6b40a4e4d8424196afc347e97640d68de61' \
109-
'e1cf14b0',
110-
digests['SHA512'].hexdigest
93+
assert_equal '3495ff69d34671d1e15b33a63c1379fdedd3a32a',
94+
digests['SHA1'].hexdigest
95+
assert_equal '4714870aff6c97ca09d135834fdb58a6389a50c1' \
96+
'1fef8ec4afef466fb60a23ac6b7a9c92658f14df' \
97+
'4993d6b40a4e4d8424196afc347e97640d68de61' \
98+
'e1cf14b0',
99+
digests['SHA512'].hexdigest
100+
101+
assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
102+
@io.string[0, 512])
111103

112-
assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
113-
@io.string[0, 512])
114-
end
115104
assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
116105
assert_equal 1024, @io.pos
117106
end
@@ -121,81 +110,70 @@ def test_add_file_signer
121110

122111
signer = Gem::Security::Signer.new PRIVATE_KEY, [PUBLIC_CERT]
123112

124-
Time.stub :now, Time.at(1458518157) do
125-
@tar_writer.add_file_signed 'x', 0644, signer do |io|
126-
io.write 'a' * 10
127-
end
113+
@tar_writer.add_file_signed 'x', 0644, signer do |io|
114+
io.write 'a' * 10
115+
end
128116

129-
assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
130-
@io.string[0, 512])
117+
assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
118+
@io.string[0, 512])
131119

132-
assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
120+
assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
133121

134-
digest = signer.digest_algorithm.new
135-
digest.update 'a' * 10
122+
digest = signer.digest_algorithm.new
123+
digest.update 'a' * 10
136124

137-
signature = signer.sign digest.digest
125+
signature = signer.sign digest.digest
138126

139-
assert_headers_equal(tar_file_header('x.sig', '', 0444, signature.length,
140-
Time.now),
141-
@io.string[1024, 512])
142-
assert_equal "#{signature}#{"\0" * (512 - signature.length)}",
143-
@io.string[1536, 512]
127+
assert_headers_equal(tar_file_header('x.sig', '', 0444, signature.length,
128+
Time.now),
129+
@io.string[1024, 512])
130+
assert_equal "#{signature}#{"\0" * (512 - signature.length)}",
131+
@io.string[1536, 512]
144132

145-
assert_equal 2048, @io.pos
146-
end
133+
assert_equal 2048, @io.pos
147134
end
148135

149136
def test_add_file_signer_empty
150137
signer = Gem::Security::Signer.new nil, nil
151138

152-
Time.stub :now, Time.at(1458518157) do
153-
154-
@tar_writer.add_file_signed 'x', 0644, signer do |io|
155-
io.write 'a' * 10
156-
end
139+
@tar_writer.add_file_signed 'x', 0644, signer do |io|
140+
io.write 'a' * 10
141+
end
157142

158-
assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
143+
assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
159144
@io.string[0, 512])
160-
end
161145
assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
162146

163147
assert_equal 1024, @io.pos
164148
end
165149

166150
def test_add_file_simple
167-
Time.stub :now, Time.at(1458518157) do
168151
@tar_writer.add_file_simple 'x', 0644, 10 do |io|
169152
io.write "a" * 10
170153
end
171154

172155
assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
173156
@io.string[0, 512])
174-
end
175157

176158
assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
177159
assert_equal 1024, @io.pos
178160
end
179161

180162
def test_add_file_simple_source_date_epoch
181163
ENV["SOURCE_DATE_EPOCH"] = "123456789"
182-
Time.stub :now, Time.at(1458518157) do
183-
@tar_writer.add_file_simple 'x', 0644, 10 do |io|
184-
io.write "a" * 10
185-
end
164+
@tar_writer.add_file_simple 'x', 0644, 10 do |io|
165+
io.write "a" * 10
166+
end
186167

187-
assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
168+
assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
188169
@io.string[0, 512])
189-
end
190170
end
191171

192172
def test_add_file_simple_padding
193-
Time.stub :now, Time.at(1458518157) do
194173
@tar_writer.add_file_simple 'x', 0, 100
195174

196175
assert_headers_equal tar_file_header('x', '', 0, 100, Time.now),
197176
@io.string[0, 512]
198-
end
199177

200178
assert_equal "\0" * 512, @io.string[512, 512]
201179
end
@@ -248,24 +226,20 @@ def test_close
248226
end
249227

250228
def test_mkdir
251-
Time.stub :now, Time.at(1458518157) do
252-
@tar_writer.mkdir 'foo', 0644
229+
@tar_writer.mkdir 'foo', 0644
253230

254-
assert_headers_equal tar_dir_header('foo', '', 0644, Time.now),
255-
@io.string[0, 512]
231+
assert_headers_equal tar_dir_header('foo', '', 0644, Time.now),
232+
@io.string[0, 512]
256233

257-
assert_equal 512, @io.pos
258-
end
234+
assert_equal 512, @io.pos
259235
end
260236

261237
def test_mkdir_source_date_epoch
262238
ENV["SOURCE_DATE_EPOCH"] = "123456789"
263-
Time.stub :now, Time.at(1458518157) do
264-
@tar_writer.mkdir 'foo', 0644
239+
@tar_writer.mkdir 'foo', 0644
265240

266-
assert_headers_equal tar_dir_header('foo', '', 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
267-
@io.string[0, 512]
268-
end
241+
assert_headers_equal tar_dir_header('foo', '', 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
242+
@io.string[0, 512]
269243
end
270244

271245
def test_split_name

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy