From 5a48fd80cd5c2a016985f02450cd11401bb929db Mon Sep 17 00:00:00 2001
From: kisantia <31145923+kisantia@users.noreply.github.com>
Date: Fri, 10 May 2019 12:03:26 -0700
Subject: [PATCH] Fix #4460: Add dacfx wizard to server and database folder
 context menus (#4989)

* add dacfx wizard to server and database folder context  menus

* update object explorer test
---
 extensions/dacpac/package.json                         | 10 ++++++++++
 .../integration-tests/src/objectExplorer.test.ts       |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/extensions/dacpac/package.json b/extensions/dacpac/package.json
index 6c044d5a6e..7c09131859 100644
--- a/extensions/dacpac/package.json
+++ b/extensions/dacpac/package.json
@@ -37,6 +37,16 @@
 					"command": "dacFx.start",
 					"when": "connectionProvider == MSSQL && nodeType && nodeType == Database",
 					"group": "export"
+				},
+				{
+					"command": "dacFx.start",
+					"when": "connectionProvider == MSSQL && nodeType && nodeType == Server",
+					"group": "export"
+				},
+				{
+					"command": "dacFx.start",
+					"when": "connectionProvider == MSSQL && nodeType && nodeType == Folder && nodeLabel == 'Databases'",
+					"group": "export"
 				}
 			]
 		}
diff --git a/extensions/integration-tests/src/objectExplorer.test.ts b/extensions/integration-tests/src/objectExplorer.test.ts
index ee8d89c695..f64cacf50c 100644
--- a/extensions/integration-tests/src/objectExplorer.test.ts
+++ b/extensions/integration-tests/src/objectExplorer.test.ts
@@ -45,9 +45,9 @@ if (context.RunTest) {
 			let expectedActions;
 
 			if (process.platform === 'win32') {
-				expectedActions = ['Manage', 'New Query', 'Disconnect', 'Delete Connection', 'Refresh', 'New Notebook', 'Launch Profiler', 'Properties'];
+				expectedActions = ['Manage', 'New Query', 'Disconnect', 'Delete Connection', 'Refresh', 'New Notebook', 'Data-tier Application wizard', 'Launch Profiler', 'Properties'];
 			} else {
-				expectedActions = ['Manage', 'New Query', 'Disconnect', 'Delete Connection', 'Refresh', 'New Notebook', 'Launch Profiler'];
+				expectedActions = ['Manage', 'New Query', 'Disconnect', 'Delete Connection', 'Refresh', 'New Notebook', 'Data-tier Application wizard', 'Launch Profiler'];
 			}
 
 			const expectedString = expectedActions.join(',');