Broken client API and server default was wrong (arangodb#3748)

m0ppers · jsteemann · commit ce537af092f7 · 2017-11-21T17:19:14.000+01:00
diff --git a/js/client/modules/@arangodb/arango-database.js b/js/client/modules/@arangodb/arango-database.js
@@ -356,6 +356,11 @@ ArangoDatabase.prototype._create = function (name, properties, type, options) {
       }
     });
   }
+
+  if (typeof type === 'object') {
+    options = type;
+    type = undefined;
+  }
   
   let urlAddons = [];
   if (typeof options === "object" && options !== null) {
diff --git a/js/common/tests/shell/shell-cluster-collection.js b/js/common/tests/shell/shell-cluster-collection.js
@@ -374,8 +374,7 @@ function ClusterCollectionSuite () {
 /// @brief test create
 ////////////////////////////////////////////////////////////////////////////////
 
-    testCreateInsufficientDBServers : function () {
-
+    testCreateInsufficientDBServersDefault : function () {
       try {
         db._create("bigreplication", {replicationFactor: 8});
         fail();
@@ -386,6 +385,32 @@ function ClusterCollectionSuite () {
       db._drop('bigreplication');
     },
 
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test create
+////////////////////////////////////////////////////////////////////////////////
+
+    testCreateInsufficientDBServersIgnoreReplicationFactor : function () {
+      // should not throw (just a warning)
+      db._create("bigreplication", {replicationFactor: 8}, {enforceReplicationFactor: false});
+      db._drop('bigreplication');
+    },
+
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test create
+////////////////////////////////////////////////////////////////////////////////
+
+    testCreateInsufficientDBServersEnforceReplicationFactor : function () {
+      try {
+        db._create("bigreplication", {replicationFactor: 8}, {enforceReplicationFactor: true});
+        fail();
+      }
+      catch (err) {
+        assertEqual(ERRORS.ERROR_CLUSTER_INSUFFICIENT_DBSERVERS.code, err.errorNum);
+      }
+      db._drop('bigreplication');
+    },
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test creation / deleting of documents with replication set
 ////////////////////////////////////////////////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,11 @@ ArangoDatabase.prototype._create = function (name, properties, type, options) {`
`356`	`356`	`}`
`357`	`357`	`});`
`358`	`358`	`}`
	`359`	`+`
	`360`	`+ if (typeof type === 'object') {`
	`361`	`+ options = type;`
	`362`	`+ type = undefined;`
	`363`	`+ }`
`359`	`364`
`360`	`365`	`let urlAddons = [];`
`361`	`366`	`if (typeof options === "object" && options !== null) {`