make eager loading single translation work

lib/mobility/backends/action_text.rb

@@ -28,6 +28,12 @@ class ActionText < ActiveRecord::KeyValue
  # override to return record instead of value
  def read(locale, **options)
  return super if self.options[:plain]
+
+ if model.association_cached?("rich_text_#{attribute}")
+ eager_loaded = model.public_send("rich_text_#{attribute}")
+ return eager_loaded if eager_loaded.locale == locale.to_s
+ end
+
  translation_for(locale, **options)
  end
 

test_app/test/mobility_action_text_test.rb

@@ -100,11 +100,15 @@ class ActionTextTest < ActiveSupport::TestCase
 
  assert_no_queries do
  assert_equal 'Hello world!', post.content.to_plain_text
-
- skip('FIXME: this should execute no queries')
  end
  end
 
+ test 'correct translation is returned if single translation for different locale was eager loaded' do
+ post = assert_queries(2) { Mobility.with_locale(:en) { Post.with_rich_text_content.last } }
+
+ assert_equal 'Bonjour le monde !', Mobility.with_locale(:fr) { post.content }.to_plain_text
+ end
+
  test 'post content is eager loaded with all rich text' do
  post = assert_queries(2) { Post.with_all_rich_text.last }
 
@@ -113,6 +117,12 @@ class ActionTextTest < ActiveSupport::TestCase
  end
  end
 
+ test 'correct translation is returned if all translations for different locale were eager loaded' do
+ post = assert_queries(2) { Mobility.with_locale(:en) { Post.with_all_rich_text.last } }
+
+ assert_equal 'Bonjour le monde !', Mobility.with_locale(:fr) { post.content }.to_plain_text
+ end
+
  test 'post non_i18n_content is eager loaded with all rich text' do
  post = assert_queries(2) { Post.with_all_rich_text.last }