8000 Merge branch 'devel' of github.com:arangodb/arangodb into devel · lethalbrains/arangodb@9cbf7aa · GitHub
[go: up one dir, main page]
Skip to content

Commit 9cbf7aa

Browse files
author
Andreas Streichardt
committed
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2 parents 016b79f + 28b6172 commit 9cbf7aa

27 files changed

+317
-2494
lines changed

‎Documentation/Books/Users/Administration/Configuration/Arangod.mdpp

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -78,30 +78,6 @@ The default is *false*.
7878
@startDocuBlock keep_alive_timeout
7979

8080

81-
!SUBSECTION Default API compatibility
82-
83-
84-
default API compatibility
85-
`--server.default-api-compatibility`
86-
87-
This option can be used to determine the API compatibility of the ArangoDB
88-
server. It expects an ArangoDB version number as an integer, calculated as
89-
follows:
90-
91-
*10000 \* major + 100 \* minor (example: *10400* for ArangoDB 1.4)*
92-
93-
The value of this option will have an influence on some API return values
94-
when the HTTP client used does not send any compatibility information.
95-
96-
In most cases it will be sufficient to not set this option explicitly but to
97-
keep the default value. However, in case an "old" ArangoDB client is used
98-
that does not send any compatibility information and that cannot handle the
99-
responses of the current version of ArangoDB, it might be reasonable to set
100-
the option to an old version number to improve compatibility with older
101-
clients.
102-
103-
104-
10581
!SUBSECTION Hide Product header
10682

10783

‎Documentation/Books/Users/ReleaseNotes/UpgradingChanges30.mdpp

Lines changed: 262 additions & 89 deletions
Large diffs are not rendered by default.

‎UnitTests/HttpInterface/api-compatibility-spec.rb

Lines changed: 0 additions & 137 deletions
This file was deleted.

‎UnitTests/HttpInterface/api-database-spec.rb

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,28 +67,6 @@
6767
ArangoDB.delete(api + "/#{name}")
6868
end
6969

70-
it "creates a new database, old return code" do
71-
body = "{\"name\" : \"#{name}\" }"
72-
doc = ArangoDB.log_post("#{prefix}-create", api, :body => body, :headers => { "X-Arango-Version" => "1.4" })
73-
74-
doc.code.should eq(200)
75-
doc.headers['content-type'].should eq("application/json; charset=utf-8")
76-
response = doc.parsed_response
77-
response["result"].should eq(true)
78-
response["error"].should eq(false)
79-
end
80-
81-
it "creates a new database, new return code" do
82-
body = "{\"name\" : \"#{name}\" }"
83-
doc = ArangoDB.log_post("#{prefix}-create", api, :body => body, :headers => { "X-Arango-Version" => "1.5" })
84-
85-
doc.code.should eq(201)
86-
doc.headers['content-type'].should eq("application/json; charset=utf-8")
87-
response = doc.parsed_response
88-
response["result"].should eq(true)
89-
response["error"].should eq(false)
90-
end
91-
9270
it "creates a new database" do
9371
body = "{\"name\" : \"#{name}\" }"
9472
doc = ArangoDB.log_post("#{prefix}-create", api, :body => body)

‎UnitTests/HttpInterface/api-document-create-spec.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
it "creating a new document, setting compatibility header" do
160160
cmd = "/_api/document?collection=#{@cn}"
161161
body = "{ \"Hallo\" : \"World\" }"
162-
doc = ArangoDB.log_post("#{prefix}", cmd, :body => body, :headers => { "x-arango-version" => "1.4" })
162+
doc = ArangoDB.log_post("#{prefix}", cmd, :body => body)
163163

164164
doc.code.should eq(201)
165165
doc.headers['content-type'].should eq("application/json; charset=utf-8")
@@ -230,7 +230,7 @@
230230
it "creating a new document complex body, setting compatibility header " do
231231
cmd = "/_api/document?collection=#{@cn}"
232232
body = "{ \"Hallo\" : \"Wo\\\"rld\" }"
233-
doc = ArangoDB.log_post("#{prefix}", cmd, :body => body, :headers => { "x-arango-version" => "1.4" })
233+
doc = ArangoDB.log_post("#{prefix}", cmd, :body => body)
234234

235235
doc.code.should eq(201)
236236
doc.headers['content-type'].should eq("application/json; charset=utf-8")
@@ -314,7 +314,7 @@
314314
it "creating a new umlaut document, setting compatibility header" do
315315
cmd = "/_api/document?collection=#{@cn}"
316316
body = "{ \"Hallo\" : \"öäüÖÄÜßあ寿司\" }"
317-
doc = ArangoDB.log_post("#{prefix}-umlaut", cmd, :body => body, :headers => { "x-arango-version" => "1.4" })
317+
doc = ArangoDB.log_post("#{prefix}-umlaut", cmd, :body => body)
318318

319319
doc.code.should eq(201)
320320
doc.headers['content-type'].should eq("application/json; charset=utf-8")
@@ -404,7 +404,7 @@
404404
it "creating a new not normalized umlaut document, setting compatibility header" do
405405
cmd = "/_api/document?collection=#{@cn}"
406406
body = "{ \"Hallo\" : \"Grüß Gott.\" }"
407-
doc = ArangoDB.log_post("#{prefix}-umlaut", cmd, :body => body, :headers => { "x-arango-version" => "1.4" })
407+
doc = ArangoDB.log_post("#{prefix}-umlaut", cmd, :body => body)
408408

409409
doc.code.should eq(201)
410410
doc.headers['content-type'].should eq("application/json; charset=utf-8")
@@ -487,7 +487,7 @@
487487

488488
cmd = "/_api/document?collection=#{@cn}"
489489
body = "{ \"some stuff\" : \"goes here\", \"_key\" : \"#{@key}\" }"
490-
doc = ArangoDB.log_post("#{prefix}-existing-id", cmd, :body => body, :headers => { "x-arango-version" => "1.4" })
490+
doc = ArangoDB.log_post("#{prefix}-existing-id", cmd, :body => body)
491491

492492
doc.code.should eq(201)
493493
doc.headers['content-type'].should eq("application/json; charset=utf-8")
@@ -585,7 +585,7 @@
585585
it "creating a new document, setting compatibility header" do
586586
cmd = "/_api/document?collection=#{@cn}"
587587
body = "{ \"Hallo\" : \"World\" }"
588-
doc = ArangoDB.log_post("#{prefix}-accept", cmd, :body => body, :headers => { "x-arango-version" => "1.4" })
588+
doc = ArangoDB.log_post("#{prefix}-accept", cmd, :body => body)
589589

590590
doc.code.should eq(202)
591591
doc.headers['content-type'].should eq("application/json; charset=utf-8")
@@ -649,7 +649,7 @@
649649
it "creating a new document, waitForSync URL param = false, setting compatibility header" do
650650
cmd = "/_api/document?collection=#{@cn}&waitForSync=false"
651651
body = "{ \"Hallo\" : \"World\" }"
652-
doc = ArangoDB.log_post("#{prefix}-accept-sync-false", cmd, :body => body, :headers => { "x-arango-version" => "1.4" })
652+
doc = ArangoDB.log_post("#{prefix}-accept-sync-false", cmd, :body => body)
653653

654654
doc.code.should eq(202)
655655
doc.headers['content-type'].should eq("application/json; charset=utf-8")
@@ -713,7 +713,7 @@
713713
it "creating a new document, waitForSync URL param = true, setting compatibility header" do
714714
cmd = "/_api/document?collection=#{@cn}&waitForSync=true"
715715
body = "{ \"Hallo\" : \"World\" }"
716-
doc = ArangoDB.log_post("#{prefix}-accept-sync-true", cmd, :body => body, :headers => { "x-arango-version" => "1.4" })
716+
doc = ArangoDB.log_post("#{prefix}-accept-sync-true", cmd, :body => body)
717717

718718
doc.code.should eq(201)
719719
doc.headers['content-type'].should eq("application/json; charset=utf-8")
@@ -792,7 +792,7 @@
792792
it "creating a new document, setting compatibility header" do
793793
cmd = "/_api/document?collection=#{@cn}"
794794
body = "{ \"Hallo\" : \"World\" }"
795-
doc = ArangoDB.log_post("#{prefix}-named-collection", cmd, :body => body, :headers => { "x-arango-version" => "1.4" })
795+
doc = ArangoDB.log_post("#{prefix}-named-collection", cmd, :body => body)
796796

797797
doc.code.should eq(201)
798798
doc.headers['content-type'].should eq("application/json; charset=utf-8")

0 commit comments

Comments
 (0)
0