From fb16a158ff85194a27c2ae96e278b9a2fc6b60de Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 17 Jul 2019 09:59:50 -0700
Subject: [PATCH] Make tests work with typescript@next (#36964)

Which has better narrowing for element access, so some code needs to be
reworded to work with old versions as well as typescript@next.
---
 types/koa-morgan/koa-morgan-tests.ts | 9 +++++----
 types/stripe/stripe-tests.ts         | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/types/koa-morgan/koa-morgan-tests.ts b/types/koa-morgan/koa-morgan-tests.ts
index 8d4936a78a..e17d7da87a 100644
--- a/types/koa-morgan/koa-morgan-tests.ts
+++ b/types/koa-morgan/koa-morgan-tests.ts
@@ -12,11 +12,12 @@ app.use(morgan('tiny'));
 app.use(morgan(':remote-addr :method :url'));
 
 const tokenCallback: morgan.TokenCallbackFn = (req: IncomingMessage, res: ServerResponse): string => {
-    if (req.headers['request-id']) {
-        if (Array.isArray(req.headers['request-id'])) {
-            return (req.headers['request-id'] as string[]).join(';');
+    const rqid = req.headers['request-id'];
+    if (rqid) {
+        if (Array.isArray(rqid)) {
+            return rqid.join(';');
         } else {
-            return req.headers['request-id'] as string;
+            return rqid;
         }
     } else {
         return '-';
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index 2d75dbedab..eae7d9ef6f 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -411,8 +411,8 @@ stripe.customers.create({
     let metadata: Stripe.IOptionsMetadata;
     const num = 123;
     metadata["test"] = str;
-    metadata["test"] = num;
     metadata["test"] === str;
+    metadata["test"] = num;
     metadata["test"] === num;
     metadata.testStr = str;
     metadata.testNum = num;