From 275ab65da8878fbbc4cdbc62ae0ccb6ae6f0f426 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 26 Nov 2019 09:00:35 -0800
Subject: [PATCH] meteor: inline test module augmentations (#40667)

This makes the test file structure more similar to other DT tests.
---
 types/meteor/test/globals/meteor-tests.ts |  9 ++++++++-
 types/meteor/test/meteor-tests.ts         | 11 ++++++++++-
 types/meteor/test/userAugment.d.ts        | 15 ---------------
 types/meteor/tsconfig.json                |  1 -
 4 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 types/meteor/test/userAugment.d.ts

diff --git a/types/meteor/test/globals/meteor-tests.ts b/types/meteor/test/globals/meteor-tests.ts
index d05f88b44b..bf0bff5e64 100644
--- a/types/meteor/test/globals/meteor-tests.ts
+++ b/types/meteor/test/globals/meteor-tests.ts
@@ -11,6 +11,13 @@
 
 /*********************************** Begin setup for tests ******************************/
 
+declare namespace Meteor {
+    interface User {
+        // One of the tests assigns a new property to the user so it has to be typed
+        dexterity?: number;
+    }
+}
+
 // Avoid conflicts between `meteor-tests.ts` and `globals/meteor-tests.ts`.
 namespace MeteorTests {
 
@@ -866,4 +873,4 @@ Meteor.absoluteUrl('/sub', {rootUrl: 'http://wonderful.com'});
 Meteor.absoluteUrl.defaultOptions = {
   rootUrl: 'http://123.com',
   secure: false
-};
\ No newline at end of file
+};
diff --git a/types/meteor/test/meteor-tests.ts b/types/meteor/test/meteor-tests.ts
index cb898dd3c4..589e36c04c 100644
--- a/types/meteor/test/meteor-tests.ts
+++ b/types/meteor/test/meteor-tests.ts
@@ -23,6 +23,15 @@ import { Accounts } from "meteor/accounts-base";
 import { BrowserPolicy } from "meteor/browser-policy-common";
 import { DDPRateLimiter } from "meteor/ddp-rate-limiter";
 
+declare module 'meteor/meteor' {
+    namespace Meteor {
+        interface User {
+            // One of the tests assigns a new property to the user so it has to be typed
+            dexterity?: number;
+        }
+    }
+}
+
 // Avoid conflicts between `meteor-tests.ts` and `globals/meteor-tests.ts`.
 namespace MeteorTests {
 
@@ -878,4 +887,4 @@ Meteor.absoluteUrl('/sub', {rootUrl: 'http://wonderful.com'});
 Meteor.absoluteUrl.defaultOptions = {
   rootUrl: 'http://123.com',
   secure: false
-};
\ No newline at end of file
+};
diff --git a/types/meteor/test/userAugment.d.ts b/types/meteor/test/userAugment.d.ts
deleted file mode 100644
index 1385ca4aee..0000000000
--- a/types/meteor/test/userAugment.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-declare module 'meteor/meteor' {
-    module Meteor {
-        interface User {
-            // One of the tests assigns a new property to the user so it has to be typed
-            dexterity?: number;
-        }
-    }
-}
-
-declare module Meteor {
-    interface User {
-        // One of the tests assigns a new property to the user so it has to be typed
-        dexterity?: number;
-    }
-}
diff --git a/types/meteor/tsconfig.json b/types/meteor/tsconfig.json
index 08c6d3f1e6..42295d06e1 100644
--- a/types/meteor/tsconfig.json
+++ b/types/meteor/tsconfig.json
@@ -62,7 +62,6 @@
         "index.d.ts",
         "test/meteor-tests.ts",
         "test/globals/meteor-tests.ts",
-        "test/userAugment.d.ts",
         "test/meteor-tests-module-only.ts",
         "test/server-render.tsx",
         "react-meteor-data.d.ts",