From f4ba6476638314e63a168a24f33938985ce07bec Mon Sep 17 00:00:00 2001
From: RTLcoil <oleg@rtl.co.il>
Date: Sun, 13 Oct 2019 17:04:41 +0200
Subject: [PATCH 1/2] Added Transformation test for font antialiasing and
 hinting

---
 test/TransformationTest.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/test/TransformationTest.js b/test/TransformationTest.js
index a9b1104..58ea749 100644
--- a/test/TransformationTest.js
+++ b/test/TransformationTest.js
@@ -58,4 +58,31 @@ describe("Transformation", () => {
 
     expect(image.props().src).to.equal('http://res.cloudinary.com/demo/image/upload/c_scale,w_200/sample');
   });
+  it("should accept font antialiasing and hinting in overlay object or overlay text", function() {
+    let image = shallow(<Image publicId="sample" cloudName="demo" />);
+
+    const transformOverlayObject = (
+      <Transformation
+        overlay={{
+          text: "Hello World, Nice to meet you?",
+          font_family: "Arial",
+          font_size: 18,
+          font_antialiasing: "best",
+          font_hinting: "medium",
+        }}
+      />
+    );
+    image.setProps({ children: [transformOverlayObject] });
+    expect(image.props().src).to.equal(
+      "http://res.cloudinary.com/demo/image/upload/l_text:Arial_18_antialias_best_hinting_medium:Hello%20World%252C%20Nice%20to%20meet%20you%3F/sample"
+    );
+
+    const transformOverlayString = (
+      <Transformation overlay="text:arial_20_antialiasing_best_hinting_medium:Cloudinary%20features" />
+    );
+    image.setProps({ children: [transformOverlayString] });
+    expect(image.props().src).to.equal(
+      "http://res.cloudinary.com/demo/image/upload/l_text:arial_20_antialiasing_best_hinting_medium:Cloudinary%20features/sample"
+    );
+  });
 });

From d12f21aac011228a186b8e817ce2015cbf5ce71a Mon Sep 17 00:00:00 2001
From: maoznir <nir.maoz@cloudinary.com>
Date: Sun, 23 Feb 2020 15:37:46 +0200
Subject: [PATCH 2/2] Merge branch 'master' into fix/dependency-update

# Conflicts:
#	samples/photo_album/package.json
---
 test/TransformationTest.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/TransformationTest.js b/test/TransformationTest.js
index 58ea749..26aae61 100644
--- a/test/TransformationTest.js
+++ b/test/TransformationTest.js
@@ -78,11 +78,11 @@ describe("Transformation", () => {
     );
 
     const transformOverlayString = (
-      <Transformation overlay="text:arial_20_antialiasing_best_hinting_medium:Cloudinary%20features" />
+      <Transformation overlay="text:arial_20_antialias_best_hinting_medium:Cloudinary%20features" />
     );
     image.setProps({ children: [transformOverlayString] });
     expect(image.props().src).to.equal(
-      "http://res.cloudinary.com/demo/image/upload/l_text:arial_20_antialiasing_best_hinting_medium:Cloudinary%20features/sample"
+      "http://res.cloudinary.com/demo/image/upload/l_text:arial_20_antialias_best_hinting_medium:Cloudinary%20features/sample"
     );
   });
 });