1
0
Fork 0
Commit Graph

1526 Commits

Author SHA1 Message Date
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Jan Steemann 2533affb02 fixed crash 2016-04-19 15:38:30 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
2016-04-19 07:44:00 +02:00
Alan Plum 051a153252
@arangodb/foxx -> @arangodb/foxx/legacy 2016-04-18 18:01:08 +02:00
Alan Plum c55eeac990
Fix FM nightly test 2016-04-18 18:01:07 +02:00
Alan Plum 9cf8d347ad
More SyntheticResponse tests 2016-04-18 18:00:38 +02:00
Alan Plum 21a1720d86
Add SyntheticResponse tests 2016-04-18 18:00:37 +02:00
Alan Plum 18ff55b7dd
Add SyntheticRequest tests 2016-04-18 18:00:37 +02:00
Alan Plum 2993b73c25
More SyntheticRequest tests 2016-04-18 18:00:37 +02:00
Alan Plum 4ef87a2aef
Add shell-foxx-response-spec.js 2016-04-18 18:00:37 +02:00
Alan Plum 2da95acee2
Add shell-foxx-request-spec.js 2016-04-18 18:00:36 +02:00
Alan Plum ca6bb83a84
More tests 2016-04-18 18:00:35 +02:00
Alan Plum 5b4b3852ad
Better default 200 response 2016-04-18 18:00:34 +02:00
Alan Plum a31bf33892
Basic swagger tests 2016-04-18 18:00:33 +02:00
Alan Plum fddc35df67
mv shell-foxx-router-spec to shell tests 2016-04-18 18:00:32 +02:00
Alan Plum 8d2cc4041d
Implement request/response body handling 2016-04-18 18:00:29 +02:00
Alan Plum a5ffbcf736
Add stub tests for swagger 2016-04-18 18:00:29 +02:00
Alan Plum a00ac0d96f
Swaggerify route params 2016-04-18 18:00:26 +02:00
Alan Plum 04f59fcdb4
shell-foxx-router-spec to mocha 2016-04-18 18:00:26 +02:00
Alan Plum ff0bf1a182
Add basic swagger generator stub 2016-04-18 18:00:26 +02:00
Alan Plum 314d19d20d
Extract router tree 2016-04-18 18:00:24 +02:00
Alan Plum aa4b41763e
Yakshaving
Naming things is hard.
2016-04-18 18:00:22 +02:00
Alan Plum 322c9c41b8
Lint shell-foxx-router-spec.js 2016-04-18 18:00:22 +02:00
Alan Plum 4b0fd593ce
Implement rudimentary route handling 2016-04-18 18:00:22 +02:00
Alan Plum 8230d73406
More versatile route lookup 2016-04-18 18:00:21 +02:00
Alan Plum 6e6a9a3918
Add more tests & fix middleware resolution 2016-04-18 18:00:21 +02:00
Alan Plum e78e6476ab
Implement routing logic for router 2016-04-18 18:00:20 +02:00
Alan Plum 54fb1a73d8
foxx -> foxx/legacy 2016-04-18 18:00:19 +02:00
Alan Plum 5161c63670
Remove magical Foxx comments 2016-04-18 18:00:18 +02:00
Alan Plum eacf570a39
applicationContext -> module.context 2016-04-18 18:00:17 +02:00
Jan Steemann e14fd29339 fixed cluster test 2016-04-18 17:04:03 +02:00
Jan Steemann a3ad9ba3a3 fixed issue #1805 2016-04-18 15:09:42 +02:00
jsteemann 30ec73e596 AQL bugfixes and tests, CHANGELOG updates 2016-04-17 20:57:13 +02:00
jsteemann 2294a4287c added tests 2016-04-17 11:31:45 +02:00
jsteemann 1ca9606bbc added tests 2016-04-17 11:21:07 +02:00
jsteemann 43f040b3c5 added test cases 2016-04-17 11:04:46 +02:00
Frank Celler e298ac9881 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-15 21:05:52 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
jsteemann 18f54c2dde Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-15 17:21:35 +02:00
jsteemann ecd7de16cb added optimizer rule "inline-subqueries" 2016-04-15 17:21:22 +02:00
Jan Steemann 65e6aed49f jslint 2016-04-15 12:40:14 +02:00
Frank Celler 8254bd4bd6 WIP 2016-04-14 21:32:12 -07:00
Max Neunhoeffer e68a60f81f Remove a test that is no longer needed. 2016-04-15 00:39:55 +02:00
Max Neunhoeffer 429e59108b Improve situation with tests. 2016-04-15 00:13:37 +02:00
Jan Steemann 576fcab12b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-13 16:29:26 +02:00
Jan Steemann a0fde1b7b2 allow array values in attribute name bind parameters 2016-04-13 16:29:09 +02:00
Michael Hackstein 1352e3d682 Fixed JSLINT 2016-04-13 15:57:49 +02:00
Michael Hackstein b043b103e0 Optimized IN in AQL pattern Matcher properly. Also added some tests for it 2016-04-13 14:49:21 +02:00
Jan Steemann 9163236f2b renamed optimizer rule "merge-traversal-filter" into "optimize-traversals" 2016-04-12 14:51:15 +02:00
Simran Brucherseifer 5905465c26 Add unit tests for TO_BOOL() and unary not with a whole document 2016-04-09 01:55:00 +02:00