merge

Merge branch 'develop'

Author: Aries Yuwono

README.md

@@ -14,7 +14,7 @@ from Node.js applications.
 
 ## Status
 
-Release 1.0.4 of the MarkLogic Node.js API
+Release 1.0.5 of the MarkLogic Node.js API
 
 ## Sample
 

etc/test-config-qa-ssl.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MarkLogic Corporation
+ * Copyright 2014-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

etc/test-config-qa.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MarkLogic Corporation
+ * Copyright 2014-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,12 @@ var restWriterPassword = 'x';
 var restEvaluatorUser     = 'rest-evaluator';
 var restEvaluatorPassword = 'x';
 
+var restTemporalUser     = 'rest-temporal-writer';
+var restTemporalPassword = 'x';
+
+var configAdminUser     = 'admin';
+var configAdminPassword = 'admin';
+
 var testServerName = 'node-client-api-rest-server';
 
 // For SSL without client cert, use rejectUnauthorized: false
@@ -68,13 +74,27 @@ module.exports = {
       password: restEvaluatorPassword,
       authType: restAuthType
     },
+    restTemporalConnection: {
+      host:     testHost,
+      port:     restPort,
+      user:     restTemporalUser,
+      password: restTemporalPassword,
+      authType: restAuthType
+    },
     manageAdminConnection: {
         host:     testHost,
         port:     managePort,
         user:     restAdminUser,
         password: restAdminPassword,
         authType: manageAuthType
     },
+    configAdminConnection: {
+        host:     testHost,
+        port:     restPort,
+        user:     configAdminUser,
+        password: configAdminPassword,
+        authType: restAuthType
+    },
     restSslConnection: {
         host:     testHost,
         port:     restPort,

etc/test-config.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MarkLogic Corporation
+ * Copyright 2014-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,9 @@ var restWriterPassword = 'x';
 var restEvaluatorUser     = 'rest-evaluator';
 var restEvaluatorPassword = 'x';
 
+var restTemporalUser     = 'rest-temporal-writer';
+var restTemporalPassword = 'x';
+
 var testServerName = 'unittest-nodeapi';
 
 // For SSL without client cert, use rejectUnauthorized: false
@@ -69,6 +72,13 @@ module.exports = {
       password: restEvaluatorPassword,
       authType: restAuthType
     },
+    restTemporalConnection: {
+      host:     testHost,
+      port:     restPort,
+      user:     restTemporalUser,
+      password: restTemporalPassword,
+      authType: restAuthType
+    },
     manageAdminConnection: {
         host:     testHost,
         port:     managePort,

etc/test-lib.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MarkLogic Corporation
+ * Copyright 2014-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

etc/test-setup-prompt.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MarkLogic Corporation
+ * Copyright 2014-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

etc/test-setup-qa.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MarkLogic Corporation
+ * Copyright 2014-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

etc/test-setup-users.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MarkLogic Corporation
+ * Copyright 2014-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,6 +75,33 @@ function setupUsers(manager, done) {
       }
       }).result();      
   }).
+  then(function(response) {
+    return manager.get({
+      endpoint: '/manage/v2/roles/'+encodeURIComponent('rest-temporal-writer')
+      }).result();
+  }).
+  then(function(response) {
+    if (response.statusCode < 400) {
+      return this;
+    }
+    return manager.post({
+      endpoint: '/manage/v2/roles',
+      body: {
+        'role-name': 'rest-temporal-writer',
+        description: 'REST writer with temporal privileges',
+        role: [
+          'rest-writer'
+        ],
+        privilege: [
+          {
+            'privilege-name': 'temporal-statement-set-system-time',
+            action: 'http://marklogic.com/xdmp/privileges/temporal-statement-set-system-time',
+            kind: 'execute'
+          }
+        ]
+      }
+      }).result();      
+  }).
   then(function(response) {
     return manager.get({
       endpoint: '/manage/v2/users'
@@ -112,6 +139,13 @@ function setupUsers(manager, done) {
       description: 'rest-writer user with evaluate privileges',
       password:    testconfig.restEvaluatorConnection.password
       };
+    userName = testconfig.restTemporalConnection.user;
+    requiredUsers[userName]  = {
+      role:        'rest-temporal-writer',
+      'user-name': userName,
+      description: 'rest-writer user with temporal privileges',
+      password:    testconfig.restTemporalConnection.password
+      };
 
     response.data['user-default-list']['list-items']['list-item'].
     forEach(function(user) {

etc/test-setup.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MarkLogic Corporation
+ * Copyright 2014-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

etc/test-teardown-qa.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MarkLogic Corporation
+ * Copyright 2014-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.