@angular/core 8.0.3 → 8.1.0-beta.0

package/bundles/core-testing.umd.js

@@ -1,5 +1,5 @@
 /**
- * @license Angular v8.0.3
+ * @license Angular v8.1.0-beta.0
  * (c) 2010-2019 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -1104,7 +1104,15 @@
      * Use of this source code is governed by an MIT-style license that can be
      * found in the LICENSE file at https://angular.io/license
      */
-    var TESTING_MODULE = 'TestingModule';
+    var TestingModuleOverride;
+    (function (TestingModuleOverride) {
+        TestingModuleOverride[TestingModuleOverride["DECLARATION"] = 0] = "DECLARATION";
+        TestingModuleOverride[TestingModuleOverride["OVERRIDE_TEMPLATE"] = 1] = "OVERRIDE_TEMPLATE";
+    })(TestingModuleOverride || (TestingModuleOverride = {}));
+    function isTestingModuleOverride(value) {
+        return value === TestingModuleOverride.DECLARATION ||
+            value === TestingModuleOverride.OVERRIDE_TEMPLATE;
+    }
     var R3TestBedCompiler = /** @class */ (function () {
         function R3TestBedCompiler(platform, additionalModuleTypes) {
             this.platform = platform;
@@ -1157,7 +1165,7 @@
             var _a, _b, _c, _d;
             // Enqueue any compilation tasks for the directly declared component.
             if (moduleDef.declarations !== undefined) {
-                this.queueTypeArray(moduleDef.declarations, TESTING_MODULE);
+                this.queueTypeArray(moduleDef.declarations, TestingModuleOverride.DECLARATION);
                 (_a = this.declarations).push.apply(_a, __spread(moduleDef.declarations));
             }
             // Enqueue any compilation tasks for imported modules.
@@ -1235,7 +1243,7 @@
                 this.existingComponentStyles.set(type, def.styles);
             }
             // Set the component's scope to be the testing module.
-            this.componentToModuleScope.set(type, TESTING_MODULE);
+            this.componentToModuleScope.set(type, TestingModuleOverride.OVERRIDE_TEMPLATE);
         };
         R3TestBedCompiler.prototype.compileComponents = function () {
             return __awaiter(this, void 0, void 0, function () {
@@ -1277,6 +1285,9 @@
             this.componentToModuleScope.clear();
             var parentInjector = this.platform.injector;
             this.testModuleRef = new core.ɵRender3NgModuleRef(this.testModuleType, parentInjector);
+            // Set the locale ID, it can be overridden for the tests
+            var localeId = this.testModuleRef.injector.get(core.LOCALE_ID, core.ɵDEFAULT_LOCALE_ID);
+            core.ɵsetLocaleId(localeId);
             // ApplicationInitStatus.runInitializers() is marked @internal to core.
             // Cast it to any before accessing it.
             this.testModuleRef.injector.get(core.ApplicationInitStatus).runInitializers();
@@ -1357,7 +1368,7 @@
             var moduleToScope = new Map();
             var getScopeOfModule = function (moduleType) {
                 if (!moduleToScope.has(moduleType)) {
-                    var realType = moduleType === TESTING_MODULE ? _this.testModuleType : moduleType;
+                    var realType = isTestingModuleOverride(moduleType) ? _this.testModuleType : moduleType;
                     moduleToScope.set(moduleType, core.ɵtransitiveScopesFor(realType));
                 }
                 return moduleToScope.get(moduleType);
@@ -1460,9 +1471,22 @@
                 }
                 this.seenComponents.add(type);
                 // Keep track of the module which declares this component, so later the component's scope
-                // can be set correctly. Only record this the first time, because it might be overridden by
-                // overrideTemplateUsingTestingModule.
-                if (!this.componentToModuleScope.has(type)) {
+                // can be set correctly. If the component has already been recorded here, then one of several
+                // cases is true:
+                // * the module containing the component was imported multiple times (common).
+                // * the component is declared in multiple modules (which is an error).
+                // * the component was in 'declarations' of the testing module, and also in an imported module
+                //   in which case the module scope will be TestingModuleOverride.DECLARATION.
+                // * overrideTemplateUsingTestingModule was called for the component in which case the module
+                //   scope will be TestingModuleOverride.OVERRIDE_TEMPLATE.
+                //
+                // If the component was previously in the testing module's 'declarations' (meaning the
+                // current value is TestingModuleOverride.DECLARATION), then `moduleType` is the component's
+                // real module, which was imported. This pattern is understood to mean that the component
+                // should use its original scope, but that the testing module should also contain the
+                // component in its scope.
+                if (!this.componentToModuleScope.has(type) ||
+                    this.componentToModuleScope.get(type) === TestingModuleOverride.DECLARATION) {
                     this.componentToModuleScope.set(type, moduleType);
                 }
                 return;
@@ -1574,6 +1598,8 @@
             this.initialNgDefs.clear();
             this.moduleProvidersOverridden.clear();
             this.restoreComponentResolutionQueue();
+            // Restore the locale ID to the default value, this shouldn't be necessary but we never know
+            core.ɵsetLocaleId(core.ɵDEFAULT_LOCALE_ID);
         };
         R3TestBedCompiler.prototype.compileTestModule = function () {
             var _this = this;
@@ -1597,7 +1623,7 @@
                 imports: imports,
                 schemas: this.schemas,
                 providers: providers,
-            });
+            }, /* allowDuplicateDeclarationsInRoot */ true);
             // clang-format on
             this.applyProviderOverridesToModule(this.testModuleType);
         };