Merge branch 'master' into v4.0.0-branch

Author: dpopp07

README.md

@@ -58,7 +58,7 @@ npm install watson-developer-cloud
 
 ## Usage
 
-The [examples][examples] folder has basic and advanced examples. The examples within each service assume that you already have [service credentials](#getting-credentials). 
+The [examples][examples] folder has basic and advanced examples. The examples within each service assume that you already have [service credentials](#getting-credentials).
 
 Credentials are checked for in the following order:
 
@@ -70,7 +70,7 @@ Credentials are checked for in the following order:
 
 3. IBM-Cloud-supplied credentials (via the `VCAP_SERVICES` JSON-encoded environment property)
 
-If you run your app in IBM Cloud, the SDK gets credentials from the [`VCAP_SERVICES`][vcap_services] environment variable. 
+If you run your app in IBM Cloud, the SDK gets credentials from the [`VCAP_SERVICES`][vcap_services] environment variable.
 
 ### Client-side usage
 
@@ -219,7 +219,18 @@ discovery.listEnvironments((err, res) => {
     console.log(JSON.stringify(res, null, 2));
   }
 });
+```
+
+### Setting the service URL
+
+You can set the service URL by calling the setServiceUrl() method.
 
+```javascript
+const discovery = new DiscoveryV1({
+  version: '<version-date>'
+});
+
+discovery.setServiceUrl('https://gateway-wdc.watsonplatform.net/discovery/api');
 ```
 
 ### Sending request headers
@@ -239,7 +250,7 @@ assistant.message({
   headers: {
     'Custom-Header': 'custom',
     'Accept-Language': 'custom'
-  
+
   }
 },  function(err, result, response) {
   if (err)
@@ -817,7 +828,7 @@ $ npm test
 
 Running a specific test:
 ```sh
-$ mocha -g '<test name>'
+$ jest '<path to test>'
 ```
 
 ## Open source @ IBM

lib/base_service.ts

@@ -176,6 +176,16 @@ export class BaseService {
     this._options.rejectUnauthorized = !options.disable_ssl_verification;
   }
 
+  /**
+   * Set the URL of the service instance.
+   *
+   * @param {string} url - The url of the service instance
+   * @returns {void}
+   */
+  public setServiceUrl(url: string) {
+    this._options.url = stripTrailingSlash(url);
+  }
+
   /**
    * Retrieve this service's credentials - useful for passing to the authorization service
    *
@@ -252,7 +262,7 @@ export class BaseService {
 
   /**
    * Wrapper around `sendRequest` that determines whether or not IAM tokens
-   * are being used to authenticate the request. If so, the token is 
+   * are being used to authenticate the request. If so, the token is
    * retrieved by the token manager.
    *
    * @param {Object} parameters - service request options passed in by user

test/unit/baseService.test.js

@@ -90,6 +90,14 @@ describe('BaseService', function() {
     expect(actual).toEqual(expected);
   });
 
+  it('should allow URL to be changed after service init', function() {
+    const instance = new TestService({ username: 'user', password: 'pass' });
+    const expected = 'https://gateway-wdc.watsonplatform.net/test/api';
+    instance.setServiceUrl(expected);
+    const actual = instance.getCredentials()['url'];
+    expect(actual).toEqual(expected);
+  });
+
   it('should return credentials and url from the environment', function() {
     process.env.TEST_USERNAME = 'env_user';
     process.env.TEST_PASSWORD = 'env_pass';