Swap encoded image width and height if angle is 90 or 270 degrees

2 files changed, 15 insertions, 2 deletions

diff --git a/activestorage/test/analyzer/image_analyzer_test.rb b/activestorage/test/analyzer/image_analyzer_test.rb
index 0d9f24c5c1..f04ed63c3c 100644
--- a/activestorage/test/analyzer/image_analyzer_test.rb
+++ b/activestorage/test/analyzer/image_analyzer_test.rb
@@ -8,7 +8,15 @@ require "active_storage/analyzer/image_analyzer"
 class ActiveStorage::Analyzer::ImageAnalyzerTest < ActiveSupport::TestCase
   test "analyzing a JPEG image" do
     blob = create_file_blob(filename: "racecar.jpg", content_type: "image/jpeg")
-    metadata = blob.tap(&:analyze).metadata
+    metadata = extract_metadata_from(blob)
+
+    assert_equal 4104, metadata[:width]
+    assert_equal 2736, metadata[:height]
+  end
+
+  test "analyzing a rotated JPEG image" do
+    blob = create_file_blob(filename: "racecar_rotated.jpg", content_type: "image/jpeg")
+    metadata = extract_metadata_from(blob)
 
     assert_equal 4104, metadata[:width]
     assert_equal 2736, metadata[:height]
@@ -16,9 +24,14 @@ class ActiveStorage::Analyzer::ImageAnalyzerTest < ActiveSupport::TestCase
 
   test "analyzing an SVG image without an XML declaration" do
     blob = create_file_blob(filename: "icon.svg", content_type: "image/svg+xml")
-    metadata = blob.tap(&:analyze).metadata
+    metadata = extract_metadata_from(blob)
 
     assert_equal 792, metadata[:width]
     assert_equal 584, metadata[:height]
   end
+
+  private
+    def extract_metadata_from(blob)
+      blob.tap(&:analyze).metadata
+    end
 end
diff --git a/activestorage/test/fixtures/files/racecar_rotated.jpg b/activestorage/test/fixtures/files/racecar_rotated.jpg
new file mode 100644
index 0000000000..89e6d54f98
--- /dev/null
+++ b/activestorage/test/fixtures/files/racecar_rotated.jpg