Merge pull request #532 from hoanhtien/FixImportWizardTests

Fix import wizard tests.
microsoft · Oct 14, 2015 · b801b60 · b801b60
2 parents 36eca2f + ea7a590
commit b801b60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Nodejs/Product/Nodejs/Project/ImportWizard/ImportSettings.cs b/Nodejs/Product/Nodejs/Project/ImportWizard/ImportSettings.cs
@@ -214,8 +214,9 @@ public Task<string> CreateRequestedProjectAsync() {
                     using (var writer = GetDefaultWriter(projectPath)) {
                         WriteProjectXml(writer, projectPath, sourcePath, filters, startupFile, excludeNodeModules, out projectGuid);
                     }
-                    // Log telemetry
-                    NodejsPackage.Instance.TelemetryLogger.ReportEvent(TelemetryEvents.ProjectImported, TelemetryProperties.ProjectGuid, projectGuid.ToString("B"));
+                    if (NodejsPackage.Instance != null) {
+                        NodejsPackage.Instance.TelemetryLogger.ReportEvent(TelemetryEvents.ProjectImported, TelemetryProperties.ProjectGuid, projectGuid.ToString("B"));
+                    }
                     success = true;
                     return projectPath;
                 } finally {

diff --git a/Nodejs/Tests/Core/ImportWizardTests.cs b/Nodejs/Tests/Core/ImportWizardTests.cs
@@ -303,7 +303,7 @@ public void ImportWizardTypeScript() {
             AssertUtil.ContainsExactly(proj.Descendants(proj.GetName("TypeScriptCompile")).Select(x => x.Attribute("Include").Value),
                 "server.ts");
 
-            Assert.AreEqual("server.js", proj.Descendant("StartupFile").Value);
+            Assert.AreEqual("server.ts", proj.Descendant("StartupFile").Value);
         }
 
         /// <summary>