Merge branch 'dev' into patch-1

Author: muthurathinam

.travis.yml

@@ -1,9 +1,14 @@
 language: node_js
 node_js:
   - "node"
-  - "6"
-  - "6.1"
-  - "6.9"
-  - "7.2"
-  - "5"
-  - "4"
+  - "lts/*"
+  - "10.15.1"
+  - "10.0.0"
+  - "9.11.2"
+  - "9.0.0"
+  - "8.15.0"
+  - "8.0.0"
+  - "7.10.1"
+  - "7.0.0"
+  - "6.16.0"
+  - "6.0.0"

.vscode/launch.json

@@ -7,7 +7,7 @@
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Run node samples",
+			"name": "Run Node samples",
 			"program": "${workspaceRoot}/samples/node/main.js",
 			"cwd": "${workspaceRoot}",
 			"outFiles": [],
@@ -16,9 +16,9 @@
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Run core tests",
+			"name": "Run Content tests",
 			"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
-			"args": ["${workspaceRoot}/lib/spec/core/*.js"],
+			"args": ["${workspaceRoot}/lib/spec/content/*.js"],
 			"cwd": "${workspaceRoot}",
 			"preLaunchTask": "Run Compile",
 			"outFiles": [],
@@ -27,9 +27,9 @@
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Run workload tests",
+			"name": "Run Core tests",
 			"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
-			"args": ["${workspaceRoot}/spec/development/workload/*.js"],
+			"args": ["${workspaceRoot}/lib/spec/core/*.js"],
 			"cwd": "${workspaceRoot}",
 			"preLaunchTask": "Run Compile",
 			"outFiles": [],
@@ -38,7 +38,7 @@
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Run middleware tests",
+			"name": "Run Middleware tests",
 			"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
 			"args": ["${workspaceRoot}/lib/spec/middleware/*.js"],
 			"cwd": "${workspaceRoot}",
@@ -49,9 +49,20 @@
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Run Content tests",
+			"name": "Run Tasks tests",
 			"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
-			"args": ["${workspaceRoot}/lib/spec/content/*.js"],
+			"args": ["${workspaceRoot}/lib/spec/tasks/*.js"],
+			"cwd": "${workspaceRoot}",
+			"preLaunchTask": "Run Compile",
+			"outFiles": [],
+			"internalConsoleOptions": "openOnSessionStart"
+		},
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Run Workload tests",
+			"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
+			"args": ["${workspaceRoot}/spec/development/workload/*.js"],
 			"cwd": "${workspaceRoot}",
 			"preLaunchTask": "Run Compile",
 			"outFiles": [],

README.md

@@ -22,24 +22,18 @@ import `@microsoft/microsoft-graph-client` into your module.
 import { Client } from "@microsoft/microsoft-graph-client";
 ```
 
-In case your environment have support for or have polyfill for [Fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API) [[support](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API#Browser_compatibility)] and [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) [[support](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise#Browser_compatibility)], import `./node_modules/@microsoft/microsoft-graph-client/lib/src/core/index` into your module which doesn't have polyfills for these.
-
-```typescript
-import { Client } from "./node_modules/@microsoft/microsoft-graph-client/lib/src/core/index";
-```
-
 ### Via Script Tag
 
-Include `lib/graph-js-sdk-core.js` in your page.
+Include `lib/graph-js-sdk-web.js` in your page.
 
 ```HTML
-<script type="text/javascript" src="graph-js-sdk-core.js"></script>
+<script type="text/javascript" src="graph-js-sdk-web.js"></script>
 ```
 
-In case your browser doesn't have support for [Fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API) [[support](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API#Browser_compatibility)] and [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) [[support](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise#Browser_compatibility)], you can polyfill them and include as above or you can use `lib/graph-js-sdk-web.js` which includes polyfills.
+Incase if your application ships with [es6-promise](https://www.npmjs.com/package/es6-promise) and [isomorphic-fetch](https://www.npmjs.com/package/isomorphic-fetch) just use `lib/graph-js-sdk-core.js`
 
 ```HTML
-<script type="text/javascript" src="graph-js-sdk-web.js"></script>
+<script type="text/javascript" src="graph-js-sdk-core.js"></script>
 ```
 
 ## Getting started

docs/tasks/PageIterator.md

@@ -47,8 +47,10 @@ async function customSize() {
 		pageIterator.iterate();
 
 		// Resuming will do start from where it left off and iterate for next 1000 entities.
-		// Resume is likely to be called in any user interaction requiring to load more data.
-		pageIterator.resume();
+		// Check and resume is likely to be called in any user interaction requiring to load more data.
+		if (!pageIterator.isComplete()) {
+			pageIterator.resume();
+		}
 	} catch (e) {
 		throw e;
 	}