Skip to content

Commit 5fa7049

Browse files
committed
Use ActiveRecord::FixtureSet.signed_global_id defined by the globalid gem
Also make explicit that actiontext depends on the globalid gem.
1 parent d133cc4 commit 5fa7049

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

Gemfile.lock

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ PATH
5555
activerecord (= 7.0.0.alpha2)
5656
activestorage (= 7.0.0.alpha2)
5757
activesupport (= 7.0.0.alpha2)
58+
globalid (>= 0.6.0)
5859
nokogiri (>= 1.8.5)
5960
actionview (7.0.0.alpha2)
6061
activesupport (= 7.0.0.alpha2)
@@ -244,7 +245,7 @@ GEM
244245
fugit (1.5.0)
245246
et-orbi (~> 1.1, >= 1.1.8)
246247
raabro (~> 1.4)
247-
globalid (0.5.2)
248+
globalid (0.6.0)
248249
activesupport (>= 5.0)
249250
google-apis-core (0.3.0)
250251
addressable (~> 2.5, >= 2.5.1)
@@ -285,7 +286,7 @@ GEM
285286
hiredis (0.6.3)
286287
http_parser.rb (0.6.0)
287288
httpclient (2.8.3)
288-
i18n (1.8.10)
289+
i18n (1.8.11)
289290
concurrent-ruby (~> 1.0)
290291
image_processing (1.12.1)
291292
mini_magick (>= 4.9.5, < 5)
@@ -312,11 +313,11 @@ GEM
312313
nokogiri (>= 1.5.9)
313314
mail (2.7.1)
314315
mini_mime (>= 0.1.1)
315-
marcel (1.0.1)
316+
marcel (1.0.2)
316317
memoist (0.16.2)
317318
method_source (1.0.0)
318319
mini_magick (4.11.0)
319-
mini_mime (1.1.0)
320+
mini_mime (1.1.2)
320321
mini_portile2 (2.5.3)
321322
minitest (5.14.4)
322323
minitest-bisect (1.5.1)
@@ -337,7 +338,7 @@ GEM
337338
ruby2_keywords (~> 0.0.1)
338339
net-http-persistent (4.0.1)
339340
connection_pool (~> 2.2)
340-
nio4r (2.5.7)
341+
nio4r (2.5.8)
341342
nokogiri (1.11.7)
342343
mini_portile2 (~> 2.5.0)
343344
racc (~> 1.4)
@@ -520,7 +521,7 @@ GEM
520521
websocket-extensions (0.1.5)
521522
xpath (3.2.0)
522523
nokogiri (~> 1.8)
523-
zeitwerk (2.5.0)
524+
zeitwerk (2.5.1)
524525

525526
PLATFORMS
526527
ruby

actiontext/actiontext.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@ Gem::Specification.new do |s|
3838
s.add_dependency "actionpack", version
3939

4040
s.add_dependency "nokogiri", ">= 1.8.5"
41+
s.add_dependency "globalid", ">= 0.6.0"
4142
end

activerecord/lib/active_record/fixtures.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -585,14 +585,6 @@ def identify(label, column_type = :integer)
585585
end
586586
end
587587

588-
def signed_global_id(fixture_set_name, label, column_type: :integer, **options)
589-
identifier = identify(label, column_type)
590-
model_name = default_fixture_model_name(fixture_set_name)
591-
uri = URI::GID.build([GlobalID.app, model_name, identifier, {}])
592-
593-
SignedGlobalID.new(uri, **options)
594-
end
595-
596588
# Superclass for the evaluation contexts used by ERB fixtures.
597589
def context_class
598590
@context_class ||= Class.new

0 commit comments

Comments
 (0)