Bug 520761 - [tests] Port the search and tasks tests - search tests

eclipse · Sep 12, 2017 · 716cf2f · 716cf2f
1 parent f7faa37
commit 716cf2f
Show file tree

Hide file tree

Showing 3 changed files with 475 additions and 2 deletions.
diff --git a/modules/orionode/lib/search.js b/modules/orionode/lib/search.js
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 IBM Corporation and others.
+ * Copyright (c) 2015, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials are made 
  * available under the terms of the Eclipse Public License v1.0 
  * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
@@ -142,7 +142,7 @@ module.exports = function(options) {
 		var file = fileUtil.getFile(req, loc);
 
 		if (file) {
-			file.fileRoot = api.join(req.contextPath, "file", file.workspaceId);
+			file.fileRoot = api.join(typeof req.contextPath === 'string' ? req.contextPath : '', "file", file.workspaceId);
 			searchOpts.searchScope = [file];
 		} else {
 			var store = fileUtil.getMetastore(req);