From: Kunal Marwaha <marwahaha@berkeley.edu>
Date: Wed, 13 May 2020 04:29:49 +0000 (-0700)
Subject: Re-enable ka tests
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aee9be62d8dec7b5105a79911223bd491b1f9cb2;p=thirdparty%2Fmoment.git

Re-enable ka tests
---

diff --git a/src/test/helpers/common-locale.js b/src/test/helpers/common-locale.js
index 0c117a8b8..aab29620d 100644
--- a/src/test/helpers/common-locale.js
+++ b/src/test/helpers/common-locale.js
@@ -110,14 +110,8 @@ export function defineCommonLocaleTests(locale, options) {
             var r;
             r = moment(m.format(format), format);
             assert.equal(r.month(), m.month(), 'month ' + i + ' fmt ' + format);
-            if (locale !== 'ka') {
-                r = moment(m.format(format).toLocaleUpperCase(), format);
-                assert.equal(
-                    r.month(),
-                    m.month(),
-                    'month ' + i + ' fmt ' + format + ' upper'
-                );
-            }
+            r = moment(m.format(format).toLocaleUpperCase(), format);
+            assert.equal(r.month(), m.month(), 'month ' + i + ' fmt ' + format + ' upper');
             r = moment(m.format(format).toLocaleLowerCase(), format);
             assert.equal(
                 r.month(),
@@ -126,19 +120,9 @@ export function defineCommonLocaleTests(locale, options) {
             );
 
             r = moment(m.format(format), format, true);
-            assert.equal(
-                r.month(),
-                m.month(),
-                'month ' + i + ' fmt ' + format + ' strict'
-            );
-            if (locale !== 'ka') {
-                r = moment(m.format(format).toLocaleUpperCase(), format, true);
-                assert.equal(
-                    r.month(),
-                    m.month(),
-                    'month ' + i + ' fmt ' + format + ' upper strict'
-                );
-            }
+            assert.equal(r.month(), m.month(), 'month ' + i + ' fmt ' + format + ' strict');
+            r = moment(m.format(format).toLocaleUpperCase(), format, true);
+            assert.equal(r.month(), m.month(), 'month ' + i + ' fmt ' + format + ' upper strict');
             r = moment(m.format(format).toLocaleLowerCase(), format, true);
             assert.equal(
                 r.month(),
@@ -185,22 +169,14 @@ export function defineCommonLocaleTests(locale, options) {
                     m.toISOString();
             r = moment(m.format(format), format);
             assert.equal(r.weekday(), m.weekday(), baseMsg);
-            if (locale !== 'ka') {
-                r = moment(m.format(format).toLocaleUpperCase(), format);
-                assert.equal(r.weekday(), m.weekday(), baseMsg + ' upper');
-            }
+            r = moment(m.format(format).toLocaleUpperCase(), format);
+            assert.equal(r.weekday(), m.weekday(), baseMsg + ' upper');
             r = moment(m.format(format).toLocaleLowerCase(), format);
             assert.equal(r.weekday(), m.weekday(), baseMsg + ' lower');
             r = moment(m.format(format), format, true);
             assert.equal(r.weekday(), m.weekday(), baseMsg + ' strict');
-            if (locale !== 'ka') {
-                r = moment(m.format(format).toLocaleUpperCase(), format, true);
-                assert.equal(
-                    r.weekday(),
-                    m.weekday(),
-                    baseMsg + ' upper strict'
-                );
-            }
+            r = moment(m.format(format).toLocaleUpperCase(), format, true);
+            assert.equal(r.weekday(), m.weekday(), baseMsg + ' upper strict');
             r = moment(m.format(format).toLocaleLowerCase(), format, true);
             assert.equal(r.weekday(), m.weekday(), baseMsg + ' lower strict');
         }
diff --git a/src/test/locale/ka.js b/src/test/locale/ka.js
index 0aeb3244a..e6fc9a93f 100644
--- a/src/test/locale/ka.js
+++ b/src/test/locale/ka.js
@@ -25,9 +25,8 @@ test('parse', function (assert) {
         equalTest(tests[i][1], 'MMMM', i);
         equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
         equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
-        // the last two are broken until https://github.com/nodejs/node/issues/22518 is fixed
-        // equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
-        // equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+        equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
     }
 });